Produced by Araxis Merge on 5/25/2018 9:21:41 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\ZIP\DSM-cif\Direct Implementation\java\assembly\stock\src\scripts\james3 | pop3server.conf | Tue May 22 13:23:22 2018 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\ZIP\DSM-cif\Direct Implementation\java\assembly\stock\src\scripts\james3 | pop3server.conf | Wed May 23 16:18:31 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 158 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | <?xml vers ion="1.0"? > | |
| 2 | <!-- | |
| 3 | Licensed to the Ap ache Softw are Founda tion (ASF) under one | |
| 4 | or more contributo r license agreements . See the NOTICE fi le | |
| 5 | distribu ted with t his work f or additio nal inform ation | |
| 6 | regardin g copyrigh t ownershi p. The AS F licenses this file | |
| 7 | to you u nder the A pache Lice nse, Versi on 2.0 (th e | |
| 8 | "License "); you ma y not use this file except in compliance | |
| 9 | with the License. You may o btain a co py of the License at | |
| 10 | ||
| 11 | http:/ /www.apach e.org/lice nses/LICEN SE-2.0 | |
| 12 | ||
| 13 | Unless r equired by applicabl e law or a greed to i n writing, | |
| 14 | software distribut ed under t he License is distri buted on a n | |
| 15 | "AS IS" BASIS, WIT HOUT WARRA NTIES OR C ONDITIONS OF ANY | |
| 16 | KIND, ei ther expre ss or impl ied. See the Licens e for the | |
| 17 | specific language governing permission s and limi tations | |
| 18 | under th e License. | |
| 19 | --> | |
| 20 | ||
| 21 | <!-- | |
| 22 | This te mplate fil e can be u sed as exa mple for J ames Serve r configur ation | |
| 23 | DO NOT USE IT AS SUCH AND A DAPT IT TO YOUR NEED S | |
| 24 | --> | |
| 25 | ||
| 26 | <!-- See h ttp://jame s.apache.o rg/server/ 3/config.h tml for us age --> | |
| 27 | ||
| 28 | <pop3serve rs> | |
| 29 | ||
| 30 | <! -- The POP 3 server i s enabled by default --> | |
| 31 | <! -- Disabli ng blocks will stop them from listening, --> | |
| 32 | <! -- but doe s not free as many r esources a s removing them woul d --> | |
| 33 | <p op3server enabled="t rue"> | |
| 34 | ||
| 35 | <jmxName> pop3server </jmxName> | |
| 36 | ||
| 37 | <!-- Conf igure this to bind t o a specif ic inetadd ress --> | |
| 38 | <!-- port 995 is th e well-kno wn/IANA rs egistered port for P OP3S ie o ver SSL/TL S --> | |
| 39 | <!-- port 110 is th e well-kno wn/IANA re gistered p ort for St andard POP 3 --> | |
| 40 | <bind>0.0 .0.0:110</ bind> | |
| 41 | <connecti onBacklog> 200</conne ctionBackl og> | |
| 42 | ||
| 43 | <!-- Set to true to support S TARTTLS or SSL for t he Socket. | |
| 44 | To use this y ou need to copy sunj ce_provide r.jar to / path/james /lib direc tory. | |
| 45 | --> | |
| 46 | <tls sock etTLS="fal se" startT LS="true"> | |
| 47 | <!-- To create a new keys tore execu te: | |
| 48 | keytool - genkey -al ias james -keyalg RS A -keystor e /path/to /james/con f/keystore | |
| 49 | --> | |
| 50 | <keys tore>file: //conf/cak eystore.jk s</keystor e> | |
| 51 | <secret> REDACTED </secret> | |
| 52 | <prov ider>org.b ouncycastl e.jce.prov ider.Bounc yCastlePro vider</pro vider> | |
| 53 | </tls> | |
| 54 | ||
| 55 | <!- - This is the name u sed by the server to identify itself in the POP3 - -> | |
| 56 | <!- - protocol . If auto detect is TRUE, the server wil l discover its --> | |
| 57 | <!- - own host name and use that i n the prot ocol. If discovery fails, --> | |
| 58 | <!- - the valu e of 'loca lhost' is used. If autodetect is FALSE, James --> | |
| 59 | <!- - will use the speci fied value . --> | |
| 60 | <!- - | |
| 61 | <he lloName au todetect=" true">myMa ilServer</ helloName> | |
| 62 | -- > | |
| 63 | <!- - connecti on timeout in seccon ds --> | |
| 64 | <co nnectionti meout>1200 </connecti ontimeout> | |
| 65 | ||
| 66 | <!- - Set the maximum si multaneous incoming connection s for this service - -> | |
| 67 | <co nnectionLi mit>0</con nectionLim it> | |
| 68 | ||
| 69 | <!- - Set the maximum si multaneous incoming connection s per IP f or this se rvice --> | |
| 70 | <co nnectionLi mitPerIP>0 </connecti onLimitPer IP> | |
| 71 | ||
| 72 | <ha ndlerchain > | |
| 73 | <!-- This loads the core Comm andHandler s. Only re move this if you rea lly --> | |
| 74 | <!-- know what you are doing --> | |
| 75 | <handler class="org .apache.ja mes.pop3se rver.core. CoreCmdHan dlerLoader "/> | |
| 76 | </h andlerchai n> | |
| 77 | ||
| 78 | </ pop3server > | |
| 79 | ||
| 80 | </pop3serv ers> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.