mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-22 15:12:38 +00:00
25384: ALF-5352 - user usages
- re-apply r19862 (ALF-713 fix) that was lost (probably due to merge conflict)
25440: Merged DEV/TEMPORARY to V3.4-BUG-FIX
25232: ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8)
25371: ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8)
- All VARCHAR fields quadrupled for DB2 relative to MySQL to support UTF-8 character sets
- ‘varchar-field-sizes-quadruple-increasing.sql’ introduced by patch
- Minor conflict anticipated on AlfrescoSchemaUpdate-2.1-A--to--2.2-ACL.sql; ensure larger column size is kept.
- Schema number now at 4201.
25444: Fix ALF-6689: WQS: Incorrect work of email field on contact page
Fix ALF-7058: WQS: Blog article page of custom type gives an error
25447: Fix ALF-5198: WQS: Error while Name field filled with more than 70 characters or special characters
25506: ALF-6281: Actions for folder do not work (Quickr connector plug-in)
25534: ALF-646: Alfresco Logo isn't displayed in SPP Open window
25590: Merged DEV/TEMPORARY to V3.4-BUG-FIX
25582: ALF-6282: Incorrect behavior of Propertiesa
- Add "Created", "Modified" and "Label" tags to document/folder entries in AlfrescoAtomBasedFeedServiceImpl.createEntry()
25595: Merged DEV/TEMPORARY to V3.4-BUG-FIX
25592:ALF-7194: Saving a Excel file with CIFS reset permissions.
- Copy value of "Inherit Parent Space Permissions" flag to the new node in ContentDiskDriver.cloneNode() method.
25635: Merged DEV/TEMPORARY to V3.4-BUG-FIX
25574: ALF-6288: Action 'Send Link' is not worked
25616: ALF-6288: Action 'Send Link' is not worked
- AlfrescoQuickrPathHelper.getNodePath() method was modified to return full node path, e.g. "/Company Home/Sites/TestSite/documentLibrary/test.odt".
- AlfrescoQuickrPathHelper.removeSlashesAndRoot(String value) method was renamed to AlfrescoQuickrPathHelper.resolveNodePath(String path, boolean isRelative).
25638: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with feedback from Gary)
25376: ALF-684: Ftp requests to the IPv6 resolved hostname are failing
The ftp.ipv6.enabled property was removed, and a ServerSocket is opened without InetAddress parameter. It allows Java to determine if a IPv6 is used and bind "::" any local address to the server socket. It allows to connect to the Alfresco FTP using both IPv4 and IPv6 addresses regardless to server OS.
25639: ALF-5115: Removed circular dependency from non-continuous builds
- No need to use -f continuous.xml anymore when building enterprise or community
- Added assemble-command-extras stub to community build.xml, overridden by enterprise build.xml and called by continuous.xml
25699: MERGE DEV to V3.4-BUG-FIX
ALF-5745 : AVMTemplateNode d:date properties are wrong.
25770: Investigation tests for ALF-6904: Wrong behaviour when overriding a constraint in content model
25774: Fixed ALF-7193: XAM Connector: xam.archive.nodePropertiesToWrite must not make properties mandatory
- The property had to be set to null - achievable because it is MLText
- Added full d:mltext expansion
- Added double checks for nulls creeping in
25851: Fixed ALF-7381: OOM when Debug logging on ReferenceCountingReadOnlyIndexReaderFactory
- Use a WeakHashMap
25853: Merged DEV/TEMPORARY to V3.4-BUG-FIX
25852: ALF-6373: Preview isn't generated for content added by quickr
Added AlfrescoQuickrDocumentHelper.getMimeType(NodeRef fileRef) method that resolves the mime type using the node name.
Set the mime type of nodes created in AlfrescoDocumentServiceImpl and AlfrescoAtomBasedFeedServiceImpl.
25860: Resolve ALF-7286: CMIS UP link for document doesn't contain all parents
25866: Fix for ALF-6312
- moved configuration to the correct file to be picked up by Spring Surf
25870: Merged DEV/TEMPORARY to V3.4-BUG-FIX
25840: ALF-6279: Failed to save properties in Symphony documents.
AlfrescoDocumentServiceImpl.setDocType() method was modified to check for existence of document type in provided ClbDraft object.
25908: Set 3.4.2 revision
25931: Fix for ALF-6565: Explorer UI allows duplication of Replication targets which in effects breaks Alfresco
25987: DOC-238: Sharepoint (VTI) Protocol Configuration Documentation is outdated - have added comments in the properties file to indicate what they do
25994: WQS: Added a little more information to the log message when a 404 is returned
26003: ALF-7663: NPEs when using PermissionService with AVM stores
- added unit tests for regression testing
- no longer an issue
26004: ALF-7662: AVM permissions - access denied exception when trying to create file in a layered directory, when no explicit permissions set (on root dir node)
- test passes on 3.4.2 - updated test to reflect 2.1 state
26011: ALF-6372 Now when the package manager adds items to a package it does not mark the items as modified.
26026: ALF-6350: Add support for Ideographic Space to the Full Text Search -
- added full set of Unicode characters for letters and digits (0x0000 - 0xFFFF)
- added fill set of Unicode whitespace
- class to generate Unicode types -> ranges
- upgraded antlr to 3.3. (required to resolve 3.2 bug)
- fixed Lexer and parser test
- much still depends on the tokeniser ....
26048: Fix for ALF-7507 - Manage Deleted Items - Recover All Icon Missing
26050: Fixed failing tests WorkflowFormProcessorTest and TaskFormProcessorTest.
26068: Resolve ALF-7342 - dynamic Models - unable to add new properties to an aspect if the aspect is a mandatory aspect of another aspect
26082: WQS: Improved debug-level logging to track WQS-to-repo interaction better.
26094: Some formatting
26095: Fixed ALF-7531: alfresco.jgroups.bind_interface is not taken into account
- Added 'bind_interface' property to TCP config
- Value injected into system properties: alfresco.jgroups.bind_interface
26130: Fix for CIFS multitenancy not working. ALF-6816.
Need to search the global share list for admin named pipe shares.
26131: Fix for CIFS cut/paste write-protected error. ALF-1822
26132: Solairs/NFS ReadDir issue, cannot list folder more than once. ALF-5386
Search resume id/cookie value of zero has special meaning for NFS.
26133: Changed FTP return status for MKD command to 257, for RFC compliance. ALF-7501.
26136: Fix for FTP CWD-MKD-CWD sequence failing. ALF-7530
Trim filesystem path to make sure there is no trailing backslash.
26144: Merged V3.4 to V3.4-BUG-FIX
25890: Fix for ALF-5796 - It's impossible to add tag in Japanese language (IE specific)
25891: Fixes: ALF-7363 (updated JA translation)
25894: Fixed Legal and License url in About dialog
25896: ALF-6476 -translation on Transfer Target configuration
25899: First cut of French transfer properties. Mostly English! but has 3 lines of French.
25900: Fix for ALF-6916: More Deployment Reports action causes an error
25901: Fixes: ALF-6847 (Italian Translation)
25902: Fixes: ALF-6861 (incorrectly encoded German character)
25904: Fixes: ALF-6755 (translation quoting error)
25911: Fixes: ALF-6478 - French translation correction
25913: Fixes: ALF-6334 and ALF-6477 (Profile Edit style issues - makes mark up consistent, clears floats to allow for foreign languages being a tad more verbose than English and adjusts padding to help input boxes line up.
25914: Help URL for 3.4 enterprise docs
25915: Updates TinyMCE translation as requested in ALF-6486.
25916: Updated support URL in readme
25917: Fixes: ALF-6482, wrong word order in FR has been corrected.
25919: Fixes: ALF-6655 updated to allow enough space for verbose languages (e.g. FR, ES)
25925: Fix for ALF-6885: alfresco-enterprise-3.4.0.zip package has 2 issues with apply_amps.sh
25936: ALF-6469 - transfer folders internationalized
25941: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
25939: Latest JA update from Translators, received: 2011-02-28
25943: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
25942: Language updates for property string changes and additions between 3.4.0 and 3.4.1
25946: ALF-7191: Generate duplicate _en resource bundles, using location of _fr bundles as a guide for ALL bundles under alfresco and share WEB-INF/classes
25947: ALF-7191: Reverse accidentally committed changes to WebDAV in 25946!
25949: Fixes: ALF-6521 and ALF-6493 (Site discussion's handling of tags with special characters in them)
25950: Fixes: ALF-6489 - encodes the content's name to make it safe for a URL.
25951: Fixes: ALF-6487 Adjusts styling for rename panel
25954: ALF-7191 - Generate _en bundles for all message bundles for Explorer and Share - using known location of message bundles
25956: Allow a bit of leeway with audit timing during delete tests
25957: Fixed ALF-7341: Upload performance degradation when uploading contents to folders with content rules applied.
- Action executions were being recorded by the ActionTrackingService for all actions
- Post-commit updates of the action node was reducing performance
- Added 'trackStatus' to ActionExecuter, ActionDefinition and Action
- Default 'trackStatus' is false; exceptions: 'replicationActionExecutor' and 'commit-transfer'
- Adjusted tests accordingly
- General cleanup around modifications
25964: ALF-5625 - When viewing properties in version history hitting close results in loop
25970: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
25967: Fix ALF-7440: WQS: commons-pool library has been upgraded, but WQS build properties have not been changed accordingly
25971: ALF-7441: Help URLs pointing to new doc system (1 of 2)
25972: ALF-7441: Help URLs pointing to new doc system (2 of 2)
25974: Reverted rev 25964 - as fix is scheduled for 3.4.2
25979: Disabling intermittent failing unit test. ALF-7443 logged.
25980: Merged V3.4-BUG-FIX to V3.4
25978: ALF-7394 - Alfresco Network dashlet, now Alfresco Support information
26014: ALF-7087 - Cannot override webscript files in case of using jboss 5.1GA
26024: ALF-7466 - Links do not appear correctly in the management Console (RM)
26036: ALF-6403: Merged V3.4 to V3.4 (lost revision)
25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additonal background)
26039: Fix intermittent failures in InviteServiceTest.tearDown()
26040: Fix intermittent failures in InviteServiceTest.setUp()
26043: Sync up run-junit-test with junit macros so that it can be used to run unit tests in an enterprise environment (e.g. DB2 / Oracle)
26044: Possibly fix intermittent TransferServiceImplTest failures by using org.alfresco.repo.transaction.RetryingTransactionInterceptor
26052: Do not wait indefinitely for a heartbeat in HeartBeatTest. A broken heartbeat would cause the build to hang forever!
26056: Merged V3.4-TEAM to V3.4
26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
26077: Upped LOGFILSIZ to avoid failures in unit tests with large transactions on DB2
26084: Avoid intermittent test failures in AbstractTestFormRestApi by using retrying transactions
26096: Correction to DB2 drop / create commands
26097: Fixes: ALF-7102, typo in property string.
26100: Merged V3.4-TEAM to V3.4
25985: Another cycle of fixing installer from Win builds. Still waiting for official fix from Bitrock.
26067: Fixes for installer builds on Windows
26102: Attempt to avoid intermittent failures in TaggingServiceImplTest by upping wait time
26109: Another go at executing the db2 creation statements synchronously through db2cmd
26111: ALF-6764 - Copyright year on Share login page out of date
26127: Merged V3.4-TEAM to V3.4
26120: Fix postgres.bki on Win builds
26142: Merged PATCHES/V3.4.0 to V3.4
25999: ALF-7377: Validate and reject partial WebDAV requests sometimes produced by NetDrive
26145: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
26143: Merged PATCHES/V3.4.0 to V3.4
26005: Merged V3.4-BUG-FIX to PATCHES/V3.4.0
26002: ALF-7282 Updated NodeListConverter so that it now implements the method revert(Object, ProcessDefinition)
26153: Fix for CIFS concurrent folder listing returns wrong list of files. ALF-6385.
Synchronize the VirtualCircuit.allocateSearchSlot() method and put a marker object in the allocated slot so it does not get reused before the real search is put into the slot.
26156: Merged /BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/DEV/V3.4-BUG-FIX:
24902: ALF-5985: Users with an apostrophe in their username cannot cancel their own workflow no action button shown
26177: ALF-6686 - DOCLIB - add 'add-default-resource' as enhancement.
26181: Fix for ALF-7179 - NPE on Check in action when define lockable aspect as mandatory.
26182: ALF-3145 - Caller of CopyBehaviorCallback.getCopyProperties should ensure modifiability of properties map
- Copy Service was already done. Merged similar changes to CopyBehaviourCallback.
26185: ALF-7238 - Value for $fieldHtmlId changes after metadata refresh
26196: Fixed ALF-3383: range slider does not honor xs:fractionDigits
26202: ALF-6947: RM LOV Constraint values are not returned in alphabetic order
* RM list of values are now shown in the UI as ordered
* this can be overridden in the constrant definition but isn't exposed in the admin UI
26206: Fixed ALF-6538 "My Tasks Dashlet needs to use Page URL" (code contribution from Jeff Potts)
26211: Fixed ALF-1289 "Search for groups on "Add Group" form works incorrectly"
26213: Fixes ALF-6697: Updates to flash and html uploaders to prevent files named with (Windows) illegal characters from being uploaded
26220: Fixed CopyServicePolicies javadoc
26221: Fixed ALF-4926: Incorrect behavior of update and move rule for the same folder
- Pulled rule-specific code out of FileFolderService
- Added detection for new nodes and renamed nodes in current transaction
- New nodes will only fire inbound properties, renamed nodes won't fire outbound, etc
- Added in coverage tests:
- testCheckThatModifyNameDoesNotTriggerInboundRule
- testCheckThatModifyNameDoesNotTriggerOutboundRule
- testUpdateAndMoveRuleOnSameFolder
- Requires regression tests of ALF-4846 and rule-based test cases
- Inbound, update and outbound have to be respected for all clients
26222: Confirmed 3.4 fix presence for ALF-5001: cm:name uniqueness check can fail if the property is not set
- Unit test the condition
- Checked that code now uses the node UUID as a cm:name substitute
26228: Test fix after rev 25770 for ALF-6904
26232: Fixes ALF-6697: Improved error handling for HTML uploader
26236: Fixes ALF-6697: Re-use forms validation logic
26237: Build fix for lexer tests (character encoding issues on build box + using unfixed antlr test environment for one test)
26244: Merged BRANCHES/DEV/BELARUS/V3.3-2011_01_18 to BRANCHES/DEV/V3.4-BUG-FIX: (with modifications)
25071: ALF-1846: Workflow validation is not perfomed when tasks progression are requested
26259: Fix for ALF-7520: Upgrading from "old permission model" to "new permission model" (DmPermissionsPatch)
- include generic patch to fix up permission inheritance issues
Probable work around for ALF-7453: ACL Propagation issue for large number of users/ACLs
26276: Unit test fix for ALF-4926: Incorrect behavior of update and move rule for the same folder
- Content update trigger now ignores nodes that are created in the same transaction
26277: Fix for ALF-7636, the onLoggedOut function was being called directly rather than an event being triggered, which made it impossible for plugins to use the event.
26278: Fix ALF-7568: Thumbnails should not go into the trash can
- For 3.4: Just the content model setting for cm:thumbnail
- Relates to TEAM rev 25038
26283: If we're not doing action tracking during execution and completion, then don't do the pending step either (ALF-7341)
26284: ALF-5998 - German language pack error in Explorer - Incorrect layout of Manage Task button in My tasks component in alfresco explorer
26285: Hopefully avoid intermittent failures caused by either slow machines (by ensuring locks are held during slow execution), and fixing up the action tracking parts of the test (broken by ALF-7341 changes)
26286: ALF-5889 - Italian translation errors in Explorer and Share - Aspects
26299: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page"
26305: ALF-7264 - Improve error messages when there are no valid email addresses to send an email too (avoids a null pointer, instead gives a helpful one), and also a provisional fix for @localhost email validation (pending a proper fix via VALIDATOR-292)
26308: ALF-6073 - *.docx document is displayed on all views (Document List portlet)
26309: ALF-7532 - Content Rule on RM site (other than Folder) creates 'GUID' folder in Share
Note: Fixed on Team, but along with many other unrelated fixes; hence not merged directly.
26311: Fixed ALF-7162: Bulk import NPE
26317: ALF-5560 - Incorrect behaviour on import.
RM FilePlan now tolerates (but does not render) non-RM content which was causing the original issue.
26318: Fixes ALF-7321: Ensure that WCM and Share groups don't appear as options in Repository web-client start workflow wizard for group and pooled review workflows
26327: Merged V3.4 to V3.4-BUG-FIX
26158: Merged DEV/TEMPORARY to V3.4
26154: ALF-7571: Create Web Project wizard - Step 3
Superfluous “cellpadding” elements were removed. Missing space was added.
26164: ALF-6885: Changed svn:eol-style from native to LF for all .sh scripts
26165: Merged V3.4-TEAM to V3.4
26161: Fix full installer.
26178: Merged DEV/TEMPORARY to V3.4
26172: ALF-7601: 3.4.1 SDK WebServiceSamples multiple problems
Configuration properties for WebServiceSamples was moved to correct place.
Dependency to SDK AlfrescoEmbedded was added to classpath. It is required for FileCopyUtils from Spring which is used in WebServiceSamples.
26190: Reversed 26165 / 26161 - breaks installer building
26192: Convert TaggingServiceImplTest to use retrying transactions!
26194: ALF-7045: AVM upgrade - re-implement AVM "rename duplicates" patch as a DB upgrade script
26195: Update installer overlay files
26197: Final installer updates - built and tested on OSX
26199: Allow relocatable data for postgres - part2
26204: Attempt to avoid intermittent unit test failures in RecordsManagementAuditServiceImplTest by adding some Thread.sleep() calls to allow for asynchronous audit behaviour
26207: Set site notification to false on install (ALF-6181)
26212: Merged DEV to V3.4
26203: ALF-7605 PostgreSQL: Upgrade from 2.1.7 to 3.4.1 is failing - constraint "alf_access_control_entry_acl_id_key" does not exist
1. The statements which are drop constraints, marked as optional
2. The alter statements with new constraint names were added
26245: Added OOo port number configuration
26256: Fixes ALF-7679: Remove webscript-framework-config-custom.xml file
26270: License updates from Ashutosh
26274: Fix intermittent unit test failure with retrying transaction
26275: Possible fix to intermittent test failure.
26295: Reduce scope of retrying transaction, in a hope of fixing TaggingServiceImplTest.testOnStartupJob()
26303: And the prize for the largest number of retrying transactions in a single unit test goes to...
26307: Fixes: ALF-7704: Japanese language option not appearing in dropdown box on log in page.
26314: Another defensive sleep() in RecordsManagementAuditServiceImplTest
26325: Moved defensive sleep() in RecordsManagementAuditServiceImplTest
26329: Resolved merge issue in TaggingServiceImplTest
26332: ALF-7499: DOD5015 PublishUpdatesJob is not resilient to missing nodes
26337: Build fix - Added checks for new "sorted" parameter on ListOfValuesConstraint
26338: ALF-6004 - Verisonable aspect applied to content in Web Quick Start does not result in version information being exposed
26341: ALF-5394 Fixed issue where pooled actors (users not groups) were not working properly.
26352: Removed svn:mergeinfo
26357: ALF-5369: Disposition errors when importing FilePlan which includes custom event
* missing events are now created with the information available
* prevents exception when browsing imported file plan
* TODO make sure sufficient information is stored in the export file so that events missing can be correctly recreated
26358: Found and fixed javascript error/bug when date-picker was used in form w read-only="true"
26360: Fixed ALF-5980 "Language pack errors in Share - Incorrect layout on Manage permissions page"
26362: Fixed ALF-5894 "Italian language pack in Share - Incorrect layout of My Profile dashlet"
26367: MERGE SWIFT to V3.4 BUG-FIX for ALF-5125 word offfice 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership
26001
26081
26208
26216
26261
26315
26339
26370: MERGE DEV To V3.4-BUG FIX
26342 : ALF-5125 - word office 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership
26382: Using predefined statics and neatening
26387: ALF-4101: Blog Archive filter has duplicate dates
26396: Fix for ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
- final part of fix for locking ACL changes (avoid simultaneous changes to the ACEs associated with an ACL)
26397: ALF-7823 - CIFS shuffle looses "mime type" of attachment.
ALF-7670 - MS Word 2003 'Save As' to CIFS in a folder with a rule 'extract common metadata' does NOT extract the metadata
26398: Fixed ALF-6384 "Share - 'Insert Image Library' function in WIKI not working properly in IE8"
26407: Merged V3.4-2010_11_29 to V3.4-BUG-FIX
24159: ALF-413: Incorrect notification is displayed on Manage deleted items page when deleting an item that is already recovered
26412: Fix for ALF-4400: Share Search - Not Finding Document When Search Uses More Than One Tag in the Search Criteria
- added TAG field - UI no longer has to do ugly query build and TAG is part of the default macro
- Fixed unreported AND OR precedence issue and added grouping
26424: Fix for ALF-7795: Greater than (>) operator does not work with untokenised String properties in CMIS Query
- fixed with issues will be resolved in SOLR/SWIFT
- any term starting with { (used to encode locale) will be excluded from the range.
- range queries not supported for urls ....
26449: Fixed ALF-5385 "Unable to edit groups on ts.alfresco.com"
26454: Fix for ALF-7852: Query consuming all heap and receiving an OOM exception
- missing close on TermDocs and TermPositions
26460: ALF-634, ALF-7103 Externalized the JBPM Config location, so it can now be set as a property in repository.properties.
26470: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results
26479: ALF-6533 - GROUP_EVERYONE is a special group, so when looking up the members to send an email, we need to call a different authority service method to get everyone
26484: ALF-7715 - Switch from the old Ant ZipFile to the new Commons Compress one, which supports the new file encoding zip extension
26488: ALF-7192 - Invitation code should support subtypes of Site in addition
26489: ALF-7192 - Update the Browse Bean and Site Aspect policy to support subtypes of Site
26493: ALF-7192 - When handling permissions and roles on sites, allow for sites which are a subtype of the default site type, rather than only supporting SiteModel.TYPE_SITE. (Unit test to follow)
26499: Fixes ALF-6415: Ensure that labels on installer radio buttons doesn't flow outside the window
26511: Merged DEV to V3.4-BUG-FIX
26406: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access
- Unit tests for ALF-7680 and ETHREEOH-535 were added.
26442: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access
- If destination folder for working copy is the same as the parent folder of the source node then working copy should be created even if the user has no permissions to create children in the parent of the source node. The following logic was added for Check Out operation to apply it:
- if the target folder node is the same as the parent folder of the source document then working copy is created using 'System' user
- if the target folder is a different parent, then working copy is created using current user.
26515: Partially fixes ALF-5774: Set correct Japanese date formatting on Repo Web Client summary panels
26529: Fix for ALF-6722 MT: Cancel workflow button isn't available for tenant users
26533: Fixed ALF-6563: Can't properly expose categories or associations on AWE forms
26534: Added correct source files for jbpm-jpdl-3.3.1
26535: Updated disabled testAsynchronousTaskExecutes as part of investigation into ALF-6405
26537: Fixed ALF-7927: Script error on Step 3 of Create Web Project Wizard - IE6/IE7
26540: ALF-7192 - Add unit test for custom site type
26559: Merged DEV to V3.4-BUG-FIX
26547: ALF-7528 : JSF - Edit online with Office 2010 causes the document mimetype to be lost
- PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
26560: Fixes ALF-7931: Ensure checkboxes render correctly in IE6 for forms and replication job
26565: ALF-7232 - remove temporary (unit test) debug from log4j.properties
26566: Add a couple more site service checks for roles
26568: Fixes: ALF-7950 - escaped apostrophe
26576: Fix for: ALF-7996: Error when applying patch.fixAclInheritance
- removed having clause for nasty where clause - hopefully optimised out ....
26580: Fixed ALF-7915 "Cannot delete rules created with check-in perform action."
26591: ALF-7995 - Repo tier web script get dataLists returns rule folder. Also fixed incorrect folder path rendering on non-Site rules page and removed reference to non-existent file.
26598: Add notes on if Transformers can be converted to Tika or not, and if not why
26601: Fixed ALF-7804: XAM: Long paths cause 'org.snia.xam.InvalidArgumentException' when XAM aspect is applied
- Path-generation truncates the first characters to leave only 512 in the path
- Added catch and WARN on failure to write properties to XSet (rather than fail)
- Added log4j config for XAM
26603: Fixes: ALF-868 - IE Bug.
26604: Fixes: ALF-6486 - L10N bug in width of TinyMCE's dropdown lists not accommodating longer phrases in other languages. Width is now fluid
26606: Fixes: ALF-7397 - Removed repeated chars in JA dates that include long names for days of the week.
26611: Upgrade POI and Tika for ALF-7959
26612: Add test file from ALF-7959, tweaked to include the "Quick" text, and with the original user details munged
26613: Fix up unit tests after Tika upgrade for ALF-7959
26618: ALF-7959 - Convert the Outlook MSG text converter to using Tika, which fixes encoding problems
26628: Merged PATCHES/V3.1.2 to V3.4-BUG-FIX
26626: Merged DEV/TEMPORARY to PATCHES/V3.1.2
26400: ALF-607: Rules not firing on subspaces
Execute RuleServiceImpl. getRules(), RuleServiceImpl. getOwningNodeRef(Rule) and RuleServiceImpl. getOwningNodeRef(Action) methods from System User.
26630: Merged HEAD to V3.4-BUG-FIX
26620: Modified to allow for multiple mime-types for Alfresco 3.3+. Related to ALF-4027.
26629: ALF-4027: Kofax Binaries corresponding to 26620
26650: Merged SWIFT to V3.4-BUG-FIX
26093: Workaround to the fact that the Solr classpath has got too large to include on a Windows command line! (32K)
26683: ALF-8045: VersionableAspect now properly resolves the namespaces of the QNames registered with excludedOnUpdateProps
26684: Resolve ALF-7515: CMIS operation getObjectRelationships() is not spec compliant
26689: Change the status code for the CIFS Trans2QueryPath response when the file does not exist.
Possible fix for ALF-6727.
26691: Merged DEV/TEMPORARY to V3.4-BUG-FIX
26681: ALF-1871: FileLink and FolderLink items do not appear in WebDav
Modify PropFindMethod to show file/folder links and return href of original node.
Modify GetMethod to allow browser deal with file/folder links.
26692: Merged DEV/TEMPORARY to V3.4-BUG-FIX
26558: ALF-7910: It's impossible to delete folder with accentuated letter via IMAP from Outlook 2010
Call "AlfrescoImapFolder sourceNode = getFolder(user, oldMailboxName);" before decoding oldMailboxName in ImapServiceImpl.renameMailbox() method.
Update JavaDoc in AlfrescoImapService.
Add testRenameAccentedMailbox() test.
26693: Merged DEV/TEMPORARY to V3.4-BUG-FIX
26544: ALF-7911: Cannot contribute via IMAP if another user with only Consumer permissions has logged in first
Dynamically check readOnly in AlfrescoImapFolder.isReadOnly() method.
26694: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with corrections)
26343: ALF-6945 Failed Kerberos SSO auth returns HTML web page with wrong text/plain MIME type
Setting content-type to text/html added for page used for failed Kerberos and NTLM authentications.
26695: Resolve ALF-7538: CMIS AtomPub: Not possible to retrieve associations defined via an Aspect.
26696: ALF-6132: Correction to handling of optional elements by Pavel
26701: Fixes ALF-8064: Ensure Windows installer respects manual service startup selection
26706: Resolve ALF-7759: MTOM is not enabled for all CMIS Web Services
26713: Resolve ALF-7994: Custom behavior is not triggered when creating content via CMIS
26717: Resolve ALF-6848: CMIS Rest: Properties Filter Parameter incorrectly functioning.
26720: Fix ALF-7977: Webform validation on change is always passing
26726: ALF-7086: Root folder has wrong Allowable Actions
26727: Resolve ALF-6266: Incorrect exception thrown when deleting a non-existing document (web-services binding)
26728: WQS: Performance enhancements. Local max throughput increased from 11 PIs/sec to 24 PIs/sec with 15 concurrent users (CPU utilization dropped from 100% to 70%)
26729: ALF-8045: Fix VersionServiceImplTest
26735: Merged DEV/TEMPORARY to V3.4-BUG-FIX
26725: ALF-3919 : WCM - JSF does not return an appropriate warning when creating content with ' ; ' character
1. The AVMNodeConverter class was modified to allow ';' character usage in web content names.
26736: Merged V3.4 to V3.4-BUG-FIX
26411: Fixes: ALF-7292 and ALF-7289, removes "· " from after Web and before Alfresco.
26413: Fixes: ALF-7765 - ensures naming consistency
26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue
26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed.
26610: Fix for: ALF-8007: Lucene index not coherent or not up to date or we can not rely on it to check that a working copy exist.
26739: ALF-8085 - DMDeploymentTarget uses System.out
26748: ALF-7929: Script error on Web Form Details window - IE6/ IE7
- Fix up to CHK-10095 reviewed by Kev
26749: ALF-7557: Display full paths of categories in Explorer (reviewed by Kev)
26751: ALF-8079: NPE in ContentDiskDriver
26754: Fixes: ALF-2984. parseInt octal bug, so forcing dec.
26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
26760: Merged V3.4-BUG-FIX to V3.4
26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2)
26762: ALF-8028 ResultSet not closed in TransferServiceImpl2
try...finally pattern was added to search operation.
26764: Further fixes to teh patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460
26788: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
- fix type that would have missed a minor error (for unused shared ACLs)
26815: ALF-5500: Support site subtypes in SPP
26863: Merged DEV/TEMPORARY to V3.4-BUG-FIX
26853: ALF-3792: Copy Access Should Be More Restrictive
Checking permissions for “Copy” was added action.
Security settings for FileFolderService.copy operations were made more strict for Alfresco and RM.
26890: Merged HEAD to V3.4-BUG-FIX
26856: Fixed ClientInfo is null in sessionLoggedOn event. JLAN-121.
26867: Fix for wildcard search handling returning dot and dot-dot file entries. ALF-4960.
26868: Fix for wildcard search handling returning dot and dot-dot file entries, repo filesystem. ALF-4960.
26888: CIFS path broken when ß (German sz) char is in folder name. ALF-7186.
26909: AVMRepository: add missing error info - report store name (if not found)
26934: Fixed ALF-6532: Upload new version fails in Share (checkout) when using ContentStoreSelector
- Includes investigative tests from DEV rev 26902
- Fixed safeCopyContent to cater for first-time setting of property where content is already in new store (copy operations)
- Tested XAM use-case as well
26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error.
Trivial fix sanctioned for check-in on 3.4.2 by SteveR.
26997: Undoing accidental check-in of eclipse project files changes.
27045: Change to CIFS session setup exception processing as per ALF-229.
27069: ALF-3871: Global properties now visible through JMX
27108: Merged PATCHES/V3.3.3 to V3.4-BUG-FIX
27107: ALF-8388: Merged PATCHES/V3.3.4 to PATCHES/V3.3.3
26894: ALF-7237: Further diagnostics for maxChecks and maxCheckTime
27110: Merge DEV to V3.4-BUG-FIX
26859 : ALF-6546 - JCR export fails when node has a null property value
27116: ALF-8190 - Minor version labels non-intuitive
now the minor version will start at 0.1 rather than 1.0
27121: Fixed ALF-8307: Audit query template in 3.4.0 should quote key values for application and username
27332: Follow on test corrections from the fix to ALF-8190.
27508: Merge Dev to V3.4-BUG-FIX
27153 : ALF-5496 Commenting on a Space creates an Empty Folder via CIFS
27575: Merged DEV/TEMPORARY to V3.4-BUG-FIX
27070: ALF-4954: when cookies are disabled, Share enters into a loop, Explorer outputs a java.lang.NullPointerException exception, Firefox
1. SSOAuthenticationFilter and login page for Share application was modified to handle lack of cookies in a manner web-client do that.
27586: Ignore default build directory for virtual server
27587: Fix for ALF-8188: Share - Search returns no result when using special characters
- not really a bug .... added implementation to support \u0000 style encoding in the parser but not the impl
27590: Merged DEV to V3.4-BUG-FIX
27147: ALF-7979 : Metadata extracters should log a warning/error when type conversion of field values fails
1. Adding additional logging for type conversion failure during metadata extraction.
- Additionally removed some false TODOs and fixed generics in class
27593: Fix for: ALF-7827: CMIS Contains does not support TEXT, ALL, d:content etc as would be expected
- added to match Alfresco FTS
27595: Fix for: ALF-8073: Property value not stored in Lucene index if stored=true and tokenized=false
- if stored is selected the value will be stored in the plain property entry
27599: Merged V3.3 to V3.4-BUG-FIX
27130: Merged DEV/TEMPORARY to V3.3
27129: ALF-8141: Using the copy/move action causes the Path QName to change to 'copy' or 'move'
MoveActionExecuter:
Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them).
Use FileFolderService for move operation.
CopyActionExecuter:
Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them).
Use CopyService with original assocTypeQName and assocQName(Don't use FileFolderService here because it doesn't respect deep copy flag).
27155: ALF-8141: Fix up unit tests plus RESTful calls to RuleService
27601: Fix up unit tests following merge of ALF-8141
27604: Fix for ALF-7738: Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' "
- query names are now escaped where required
27613: Upgrade Tika and POI for ALF-7978
27618: ALF-1813 Fixed security issue where tasks could be edited by a user who did not have acess tot he task.
27637: Merged DEV/TEMPORARY to V3.4-BUG-FIX
26965: ALF-8258: sharedLockTokens property duplicated many times
Changed LockInfo.sharedLockTokens from LinkedList to HashSet because in RFC "Lock token URIs MUST be unique across all resources for all time.", and therefore sharedLockTokens should contain non-repeatable values.
27662: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript
- also fix REST call (/api/activities/feed/controls) to return JSON
27663: Perf improvement: cache User Feed Controls (for generator job run)
- note: activity feed controls are not currently exposed via Share UI
27668: ALF-8413: Share Feed Generator on Oracle generates NPE (when commenting in repo view)
- fix NPE (note: in general Share does not post activities outside of site context + feed generator is currently based on site members)
27669: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript
- quick test fix for PostgreSQL (follow-on from r27662)
27697: ALF-8581: User activities are displayed twice in My Activities dashlet (in cluster env)
- add cluster job lock service (SLNG-770)
27776: ALF-8581: Reverted changes to FeedGeneratorJob
27806: Merged DEV to V3.4-BUG-FIX
27793: ALF-8351 : JBPM Tables in Oracle missing index on Foreign Keys leading to table Locks
1. Sql script that creates indexes for foreign keys in jbpm tables was implemented.
This script synchronizes jbpm indexes with mysql version.
Merge changes: Changed 4.0 references to 3.4; Incremented schema number.
27808: Fixed ALF-7510: Share - Workflow 'due date' field date validation doesn't work properly
27811: Fixed ALF-6179: WebDAV has problems if username contains spaces
27812: Partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub
27815: Switched to use ?xml instead of ?html in partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub
27825: ALF-8489 Fixed issue by removing inappropriate 'requiredApprovePercent' field.
27852: Fix for ALF-7845 index.recovery.mode=AUTO doesn't rebuild avm index
- applied provided patch
27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only
27860: Fixes: ALF-2199 Errors in CSS files.
27866: Fixes: ALF-1327 - truncation issues in the calendar.
27881: Fixes bug in Chrome introduced with r27866
27898: CIFS on Windows fails to start under certain conditions. ALF-8723
27901: Merged DEV to V3.4-BUG-FIX
27891: ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes.
NFS server cache updating policy handler was implemented:
- NfsServerNodeMonitor.java’ – new policy handler for NFS server;
- NFSServerBean.java’ was modified to configure implemented node monitor with NFS server instance during server start up;
- file-servers.properties’ was expanded with new properties for new node monitor which allows controlling node monitor 'enabled' state;
- file-servers-context.xml’ was expanded with bean configuration for new node monitor and with configuration for NFS server bean to accept newly configured node monitor bean;
- ShareDetailsHash.java’ was modified to externalize hashtable of the cache;
- NFSServer.java’ was modified to externalize its cache for public access
27902: ALF-8744 - Untransalted strings in Recent shapshot
27903: Fixes: ALF-5717 Issues with non i18n/L10N Data List form fields.
27922: Fixes: ALF-8726 by back porting some Team usability fixes. *Do Not Merge*
27923: Fixes: ALF-8429 - Replaces hard coded English tooltip with a pre-existing i18n string.
27929: Fixed ALF-8768: Wrong path in comment for wcm-bootstrap-context.xml
27938: Partial Fix for: ALF-8720: Adds missing spaces.
27940: Merged V3.3 to V3.4-BUG-FIX
27851: Fix for ALF-8476:CLONE -Query consuming all heap and receiving an OOM exception
- actually fixes stack overflow with skipTo when there are lots of deleted docs in an index in a row (<10000 on the default settings)
----
Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX
Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
27942: Merged V3.4 to V3.4-BUG-FIX
26772: Fix for ALF-7843 - Created via SPP all-day event displays incorrectly
26775: Fix for ALF-3374 - Reverting a file in workflow causes a Successful error message
26778: Fix message Failed to find I18N message key: reset_categories for locale: en_US
26781: Fix for ALF-6488 - LangPack FR - [Site's Wiki] Renaming a wiki's page - special chars handling
26783: Fixed ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes.
- De-Hibernate DAO refactor missed implementing 'system.enableTimestampPropagation'
- Set 'system.enableTimestampPropagation=true' in alfresco-global.properties
- Timestamps will be written to immediate parent folder and will therefore not drop out of the filestate cache after 2 min
26785: Services-layer fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another.
UI will have to make changes in the UI layer in order to use new Services methods, thus completing the fix.
This check-in adds support in the SiteService for moving and copying site-contained nodes. New move/copy methods are available in the Java Foundation API and in the JavaScript API which mimic the signatures of those in the NodeService and CopyService respectively. These methods simply delegate to the back-end services and so behaviours should be the same as before if they are used in place of the node and copy service methods. With one exception:
The SiteService wrapper methods detect when the relocated node has been copied/moved between two different Share sites and clears permissions from the relocated node (and its primary descendants) that refer to the previous site.
This has not been implemented using policies/behaviours as we can't bind the behaviour to any particular content class. Nodes of any type could be copied/moved between sites.
26787: Removed erroneous import from StreamContent - incorrect dependency on de.schlichtherle.io.FileOutputStream
26803: Fixes: ALF-8138, adds a i18n property for a ToDo list's attachment title.
26806: Fixed ALF-8154: Shorten the node path as prefix-only path
- Use Path.toPrefixString instead of Path.toString
- Provides improved fix for ALF-7804
26824: Fixed ALF-7012: WCM - Schema error "xs:enumeration full" select button group shows "Please select..."
26832: UI-layer fix component for ALF-8036 and a refactoring of the Services-layer fix component.
Rather than add various facade methods to the SiteService for all the copy & move variants in NodeService, CopyService, FileFolderService etc, I have added a single new method to the SiteService cleanSitePermissions().
This removes all out-of-date site permissions after a node has been moved or copied to a new site.
Also changed the slingshot action webscripts for move-to and copy-to to call this cleanUp method.
26838: Rewording a misleading code comment. Related to ALF-8036 changes.
26847: ALF-6727: File server protocols don't report the read only attribute for folders unless new configuration setting filesystem.setReadOnlyFlagOnFolders is true
- Default is false
- On windows, the read only attribute doesn't mean the folder is read only - it means "this folder has been customized - please fetch a desktop.ini".
- This results in poor performance for non-admin users due to lots of secondary fetches for configuration information.
- See the bug for more details.
26855: ALF-6727: Missing files from last check in
26858: Merged V3.4-TEAM to V3.4
26841: Fix for ALF-1044. (Searching for groups whose names contain regex reserved chars.)
The fix was to add [] as reserved chars to the RegEx SimpleLanguageDef. Thanks AndyH.
26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules
26861: Merged DEV/TEMPORARY to V3.4 (with corrections)
26157: ALF-1544: Server won't start on JBoss: Unable to resolve drag and drop application as a file, class path resource [alfresco/desktop/Alfresco.exe]
DesktopAction uses Resource’s InputStream for drug-n-drop files representation.
26870: ALF-6727: Fix up ContentDiskDriverTest
26898: Fix ALF-8219: Deploying WQS in the same container as Alfresco causes startup to stall
26899: Possible installer build fix
- uncomment project.readmeFile
- set failifexecutionfails="true" on installer build targets so we know if installer building failed!
26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create
- Fix provided by Bitrock
26919: Backing out 3 changes related to ALF-8036 due to uncertainty over fix approach.
I'm reverse-merging revisions 26785, 26832 and 26838 out of this 3.4.2 branch.
The fix version for ALF-8036 has been changed to 3.4.3 and so we don't want an unfinished fix on 3.4.2.
In fact, this fix may be finished, but there is some uncertainty now over the approach to adopt (strip permissions vs. prevert copying of permissions).
This fix will go to Team and 3.4.3 instead.
26932: Fixed a couple of non-unicode French characters that were messing up my scripts and:
Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
26911: Latest updates from translators (based on rev26710)
26944: ALF-3569 - Alfresco repository CIFS driver not setting timestamps.
26952: Finishes the completeness tests & fixes several L10N bugs.
26972: Fixes ALF-8272: Alfresco cannot be started after fresh install
26980: ALF-8287 - All buttons are disabled on Data Lists page.
27039: Merged BRANCHES/DEV/dwebsterV34 to BRANCHES/V3.4:
- Update from Translators (based on r26837).
27059: Merged PATCHES/V3.4.1 to V3.4
26959: ALF-8261: 3.4 JSF performance regression introduced by WebProjectServiceImpl.hasWebProjectsRoot() (ALF-3085)
27020: ALF-8281: CLONE -'Move To' operation for categories, folders and records doesn't work ESCALATION
27061: Merged PATCHES/V3.3.4 to V3.4
27032: ALF-8289: Merged DEV to PATCHES/V3.3.4
27028: ALF-8289: Occasionally, web form complains of missing required fields when the fields are indeed populated
27068: Merged DEV to V3.4
27067: ALF-3774 : Unable to disable listening on port 7500 (JGroups)
1. DummyProtocol was changed to rewrite default configuration.
This changes turn off diagnostic probing for DummyChannel.
27071: Fixed ALF-8363: BadSqlGrammarException during patch.fixAclInheritance on Oracle
- Using '... = true' does not work for Oracle.
- Replaced with parameterClass="boolean" and #trueOrFalse#
- Tested against limited dataset so some condition paths might be missed.
27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings
27088: Fixed ALF-8377: Generic KeywordSearch is not resilient to stale Lucene indexes
- Cleaned up PersonSearchTest
- Added exists check to KeywordSearch
- Rationalized related bean declarations
27113: Fixed ALF-1322 "Creating user with username containing spaces works incorrectly"
27127: ALF-8346 - 'Complete event' button for folders is disabled in IE
27136: Installer string updates from Gloria
27173: Fix for: ALF-7834: CLONE - ACL Propagation issue for large number of users/ACLs
- manually fix up the cache when changing inheritance
27503: Fix for ALF-8345 - Extra icons on the form of adding translation without content(IE specific)
27504: Fix for ALF-6917 - A system error happens when user attempted press toggle 'Version History'
27505: ALF-6215 - French Language pack - It's incorrect layout in Document List component
27509: ALF-8451: Port AVM-rename-dupes.sql to DB2 and SQL Server
27511: ALF-7165: User with contributor role cannot view content
27512: Installer string updates from Gloria
- Corrections to msgid Installer.ReadmeFile.View
27557: case sensitivity issues with terminfo database building from Windows
27563: Merged DEV to V3.4
27558: ALF-8408: Impossible to upload a new file by contributor to subspace when rule is applied to subspaces
Retrieving of rule was surrounded in RunAs(System username) block.
It allows to retrieve rule node and its actions if user has no read permissions to rule node
and to rule's actions.
JUnit test "PermissionsForPropagatedRules_ALF_8408" was added.
27602: Fix for ALF-5625 - When viewing properties in version history hitting close results in loop (V3.4.2)
27622: ALF-5607: Remove bundled postgres data directory on installation abort on Linux
27639: Fix for ALF-6488 - Decode HTML content before creating page url argument for wiki
27647: Fix for ALF-8552
27672: ALF-8553: PatchService didn't recurse on dependents of already applied patches
- Hence patch ordering was wrong on V3.4 upgrade
27684: ALF-8553, ALF-8602: set batchMaxQueryRange on patch.fixNameCrcValues-2 to avoid OOM
27687: Merge DEV to V3.4
27674 : ALF-8453 CIFS Failed to save versionable MS Word content as collaborator
27690: Merged DEV/TEMPORARY to V3.4
27688: ALF-7822 : AVM projects unavailable after upgrade to 3.4.1
script was modified to prevent data corruption
27775: Fixes ALF-8654: Add removed quotes back into .po files
27805: ALF-2935: Properly control RMI port in Bitrock installer
- order repository-properties before shared-properties so that you can specify the port in alfresco-global.properties if you want to
- include a tokenized alfresco-shared.properties in the WCM installation files
27807: Merged V3.4-TEAM to V3.4
27756: ALF-8207 - ALL LANG - Themes are not translated
27840: ALF-8687: No items display for series when opening it from library list
27853: Fixes: ALF-7465 - Removes some of the differences between the Add Event and Remove Event dialogues & reuses existing TagLibrary component to avoid conflicts.
27856: ALF-8687: No items display for series when opening it from library list.
Slight refactor to better match non-RM doclib code.
27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly
27932: Fixes ALF-5519: alfresco-enterprise-wcmqs-3.3.3.zip does not contain awe.war
- Added awe.war to WQS zip file
27944: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
26766: Merged V3.4-BUG-FIX to V3.4
26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
26760: Merged V3.4-BUG-FIX to V3.4
26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2)
26762: ALF-8028 ResultSet not closed in TransferServiceImpl2
try...finally pattern was added to search operation.
26764: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460
26831: Merged V3.4-BUG-FIX to V3.4
26788: Further fixes to the patch for: ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
- fix type that would have missed a minor error (for unused shared ACLs)
27016: Merged V3.4-BUG-FIX to V3.4
26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error
Trivial fix sanctioned for check-in on 3.4.2 by SteveR
26997: Undoing accidental check-in of eclipse project files changes
27859: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2096 lines
74 KiB
Java
2096 lines
74 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.filesys.config;
|
|
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
import java.net.InetAddress;
|
|
import java.net.InetSocketAddress;
|
|
import java.net.NetworkInterface;
|
|
import java.net.Socket;
|
|
import java.net.SocketException;
|
|
import java.net.UnknownHostException;
|
|
import java.nio.charset.Charset;
|
|
import java.nio.charset.IllegalCharsetNameException;
|
|
import java.nio.charset.UnsupportedCharsetException;
|
|
import java.util.EnumSet;
|
|
import java.util.Enumeration;
|
|
import java.util.List;
|
|
import java.util.StringTokenizer;
|
|
|
|
import org.springframework.extensions.config.element.GenericConfigElement;
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.alfresco.filesys.AbstractServerConfigurationBean;
|
|
import org.alfresco.filesys.alfresco.ExtendedDiskInterface;
|
|
import org.alfresco.filesys.avm.AVMContext;
|
|
import org.alfresco.filesys.avm.AVMDiskDriver;
|
|
import org.alfresco.filesys.config.acl.AccessControlListBean;
|
|
import org.alfresco.filesys.repo.ContentContext;
|
|
import org.alfresco.jlan.ftp.FTPAuthenticator;
|
|
import org.alfresco.jlan.ftp.FTPConfigSection;
|
|
import org.alfresco.jlan.ftp.FTPPath;
|
|
import org.alfresco.jlan.ftp.InvalidPathException;
|
|
import org.alfresco.jlan.netbios.NetBIOSSession;
|
|
import org.alfresco.jlan.netbios.RFCNetBIOSProtocol;
|
|
import org.alfresco.jlan.netbios.win32.Win32NetBIOS;
|
|
import org.alfresco.jlan.oncrpc.RpcAuthenticator;
|
|
import org.alfresco.jlan.oncrpc.nfs.NFSConfigSection;
|
|
import org.alfresco.jlan.server.auth.ICifsAuthenticator;
|
|
import org.alfresco.jlan.server.auth.acl.AccessControlList;
|
|
import org.alfresco.jlan.server.auth.passthru.DomainMapping;
|
|
import org.alfresco.jlan.server.auth.passthru.RangeDomainMapping;
|
|
import org.alfresco.jlan.server.auth.passthru.SubnetDomainMapping;
|
|
import org.alfresco.jlan.server.config.CoreServerConfigSection;
|
|
import org.alfresco.jlan.server.config.InvalidConfigurationException;
|
|
import org.alfresco.jlan.server.config.SecurityConfigSection;
|
|
import org.alfresco.jlan.server.core.DeviceContext;
|
|
import org.alfresco.jlan.server.core.DeviceContextException;
|
|
import org.alfresco.jlan.server.core.ShareMapper;
|
|
import org.alfresco.jlan.server.core.ShareType;
|
|
import org.alfresco.jlan.server.filesys.DiskDeviceContext;
|
|
import org.alfresco.jlan.server.filesys.DiskSharedDevice;
|
|
import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
|
|
import org.alfresco.jlan.server.thread.ThreadRequestPool;
|
|
import org.alfresco.jlan.smb.server.CIFSConfigSection;
|
|
import org.alfresco.jlan.util.IPAddress;
|
|
import org.alfresco.jlan.util.MemorySize;
|
|
import org.alfresco.jlan.util.Platform;
|
|
import org.alfresco.jlan.util.StringList;
|
|
import org.alfresco.jlan.util.X64;
|
|
import org.alfresco.repo.management.subsystems.ActivateableBean;
|
|
|
|
/**
|
|
* Alfresco File Server Configuration Bean Class
|
|
*
|
|
* @author gkspencer
|
|
* @author dward
|
|
*/
|
|
public class ServerConfigurationBean extends AbstractServerConfigurationBean
|
|
{
|
|
|
|
private CIFSConfigBean cifsConfigBean;
|
|
private FTPConfigBean ftpConfigBean;
|
|
private NFSConfigBean nfsConfigBean;
|
|
private List<DeviceContext> filesystemContexts;
|
|
private boolean avmAllStores;
|
|
private SecurityConfigBean securityConfigBean;
|
|
private CoreServerConfigBean coreServerConfigBean;
|
|
|
|
/**
|
|
* Default constructor
|
|
*/
|
|
public ServerConfigurationBean()
|
|
{
|
|
super("");
|
|
}
|
|
|
|
/**
|
|
* Class constructor
|
|
*
|
|
* @param srvName
|
|
* String
|
|
*/
|
|
public ServerConfigurationBean(String srvName)
|
|
{
|
|
super(srvName);
|
|
}
|
|
|
|
public void setCifsConfigBean(CIFSConfigBean cifsConfigBean)
|
|
{
|
|
this.cifsConfigBean = cifsConfigBean;
|
|
}
|
|
|
|
public void setFtpConfigBean(FTPConfigBean ftpConfigBean)
|
|
{
|
|
this.ftpConfigBean = ftpConfigBean;
|
|
}
|
|
|
|
public void setNfsConfigBean(NFSConfigBean nfsConfigBean)
|
|
{
|
|
this.nfsConfigBean = nfsConfigBean;
|
|
}
|
|
|
|
public void setFilesystemContexts(List<DeviceContext> filesystemContexts)
|
|
{
|
|
this.filesystemContexts = filesystemContexts;
|
|
}
|
|
|
|
public void setAvmAllStores(boolean avmAllStores)
|
|
{
|
|
this.avmAllStores = avmAllStores;
|
|
}
|
|
|
|
public void setSecurityConfigBean(SecurityConfigBean securityConfigBean)
|
|
{
|
|
this.securityConfigBean = securityConfigBean;
|
|
}
|
|
|
|
public void setCoreServerConfigBean(CoreServerConfigBean coreServerConfigBean)
|
|
{
|
|
this.coreServerConfigBean = coreServerConfigBean;
|
|
}
|
|
|
|
/**
|
|
* Process the CIFS server configuration
|
|
*/
|
|
protected void processCIFSServerConfig()
|
|
{
|
|
// If the configuration section is not valid then CIFS is disabled
|
|
|
|
if (cifsConfigBean == null)
|
|
{
|
|
removeConfigSection(CIFSConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Check if the server has been disabled
|
|
if (!cifsConfigBean.getServerEnabled())
|
|
{
|
|
removeConfigSection(CIFSConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Before we go any further, let's make sure there's a compatible authenticator in the authentication chain.
|
|
ICifsAuthenticator authenticator = cifsConfigBean.getAuthenticator();
|
|
if (authenticator == null || authenticator instanceof ActivateableBean && !((ActivateableBean)authenticator).isActive())
|
|
{
|
|
logger.warn("No enabled CIFS authenticator found in authentication chain. CIFS Server disabled");
|
|
removeConfigSection(CIFSConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Create the CIFS server configuration section
|
|
|
|
CIFSConfigSection cifsConfig = new CIFSConfigSection(this);
|
|
|
|
try
|
|
{
|
|
// Check if native code calls should be disabled on Windows
|
|
if (cifsConfigBean.getDisableNativeCode())
|
|
{
|
|
// Disable native code calls so that the JNI DLL is not required
|
|
|
|
cifsConfig.setNativeCodeDisabled(true);
|
|
m_disableNativeCode = true;
|
|
|
|
// Warning
|
|
|
|
logger.warn("CIFS server native calls disabled, JNI code will not be used");
|
|
}
|
|
|
|
// Get the network broadcast address
|
|
//
|
|
// Note: We need to set this first as the call to getLocalDomainName() may use a NetBIOS
|
|
// name lookup, so the broadcast mask must be set before then.
|
|
|
|
String broadcastAddess = cifsConfigBean.getBroadcastAddress();
|
|
if (broadcastAddess != null && broadcastAddess.length() > 0)
|
|
{
|
|
|
|
// Check if the broadcast mask is a valid numeric IP address
|
|
|
|
if (IPAddress.isNumericAddress(broadcastAddess) == false)
|
|
throw new AlfrescoRuntimeException("Invalid broadcast mask, must be n.n.n.n format");
|
|
|
|
// Set the network broadcast mask
|
|
|
|
cifsConfig.setBroadcastMask(broadcastAddess);
|
|
}
|
|
|
|
// Get the host configuration
|
|
|
|
String hostName = cifsConfigBean.getServerName();
|
|
if (hostName == null || hostName.length() == 0)
|
|
throw new AlfrescoRuntimeException("Host name not specified or invalid");
|
|
|
|
// Check if the host name contains the local name token
|
|
|
|
int pos = hostName.indexOf(TokenLocalName);
|
|
if (pos != -1)
|
|
{
|
|
|
|
// Get the local server name
|
|
|
|
String srvName = getLocalServerName(true);
|
|
|
|
// Rebuild the host name substituting the token with the local server name
|
|
|
|
StringBuilder hostStr = new StringBuilder();
|
|
|
|
hostStr.append(hostName.substring(0, pos));
|
|
hostStr.append(srvName);
|
|
|
|
pos += TokenLocalName.length();
|
|
if (pos < hostName.length())
|
|
hostStr.append(hostName.substring(pos));
|
|
|
|
hostName = hostStr.toString();
|
|
|
|
// Make sure the CIFS server name does not match the local server name
|
|
|
|
if (hostName.equals(srvName) && getPlatformType() == Platform.Type.WINDOWS)
|
|
throw new AlfrescoRuntimeException("CIFS server name must be unique");
|
|
}
|
|
|
|
// Check if the host name is longer than 15 characters. NetBIOS only allows a maximum of 16 characters in
|
|
// the
|
|
// server name with the last character reserved for the service type.
|
|
|
|
if (hostName.length() > 15)
|
|
{
|
|
// Truncate the CIFS server name
|
|
|
|
hostName = hostName.substring(0, 15);
|
|
|
|
// Output a warning
|
|
|
|
logger.warn("CIFS server name is longer than 15 characters, truncated to " + hostName);
|
|
}
|
|
|
|
// Set the CIFS server name
|
|
|
|
cifsConfig.setServerName(hostName.toUpperCase());
|
|
setServerName(hostName.toUpperCase());
|
|
|
|
// Get the domain/workgroup name
|
|
|
|
String domain = cifsConfigBean.getDomainName();
|
|
if (domain != null && domain.length() > 0)
|
|
{
|
|
// Set the domain/workgroup name
|
|
|
|
cifsConfig.setDomainName(domain.toUpperCase());
|
|
}
|
|
else
|
|
{
|
|
// Get the local domain/workgroup name
|
|
|
|
String localDomain = getLocalDomainName();
|
|
|
|
if (localDomain == null && (getPlatformType() != Platform.Type.WINDOWS || isNativeCodeDisabled()))
|
|
{
|
|
// Use a default domain/workgroup name
|
|
|
|
localDomain = "WORKGROUP";
|
|
|
|
// Output a warning
|
|
|
|
logger.error("Failed to get local domain/workgroup name, using default of " + localDomain);
|
|
logger.error("(This may be due to firewall settings or incorrect <broadcast> setting)");
|
|
}
|
|
|
|
// Set the local domain/workgroup that the CIFS server belongs to
|
|
|
|
cifsConfig.setDomainName(localDomain);
|
|
}
|
|
|
|
// Check for a server comment
|
|
String comment = cifsConfigBean.getServerComment();
|
|
if (comment != null && comment.length() > 0)
|
|
{
|
|
cifsConfig.setComment(comment);
|
|
}
|
|
|
|
// Check for a bind address
|
|
|
|
// Check if the network adapter name has been specified
|
|
String bindToAdapter = cifsConfigBean.getBindToAdapter();
|
|
String bindTo;
|
|
|
|
if (bindToAdapter != null && bindToAdapter.length() > 0)
|
|
{
|
|
|
|
// Get the IP address for the adapter
|
|
|
|
InetAddress bindAddr = parseAdapterName(bindToAdapter);
|
|
|
|
// Set the bind address for the server
|
|
|
|
cifsConfig.setSMBBindAddress(bindAddr);
|
|
}
|
|
else if ((bindTo = cifsConfigBean.getBindToAddress()) != null && bindTo.length() > 0
|
|
&& !bindTo.equals(BIND_TO_IGNORE))
|
|
{
|
|
|
|
// Validate the bind address
|
|
try
|
|
{
|
|
// Check the bind address
|
|
|
|
InetAddress bindAddr = InetAddress.getByName(bindTo);
|
|
|
|
// Set the bind address for the server
|
|
|
|
cifsConfig.setSMBBindAddress(bindAddr);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid CIFS server bind address");
|
|
}
|
|
}
|
|
|
|
// Get the authenticator
|
|
|
|
if (authenticator != null)
|
|
{
|
|
cifsConfig.setAuthenticator(authenticator);
|
|
}
|
|
else
|
|
throw new AlfrescoRuntimeException("CIFS authenticator not specified");
|
|
|
|
// Check if the host announcer has been disabled
|
|
|
|
if (!cifsConfigBean.getHostAccouncerEnabled())
|
|
{
|
|
// Switch off the host announcer
|
|
|
|
cifsConfig.setHostAnnouncer( false);
|
|
|
|
// Log that host announcements are not enabled
|
|
|
|
logger.info("Host announcements not enabled");
|
|
}
|
|
else
|
|
{
|
|
// Check for an announcement interval
|
|
|
|
Integer interval = cifsConfigBean.getHostAccounceInterval();
|
|
if (interval != null)
|
|
{
|
|
cifsConfig.setHostAnnounceInterval(interval);
|
|
}
|
|
|
|
// Check if the domain name has been set, this is required if the
|
|
// host announcer is enabled
|
|
|
|
if (cifsConfig.getDomainName() == null)
|
|
throw new AlfrescoRuntimeException("Domain name must be specified if host announcement is enabled");
|
|
|
|
// Enable host announcement
|
|
|
|
cifsConfig.setHostAnnouncer(true);
|
|
}
|
|
|
|
// Check if NetBIOS SMB is enabled
|
|
NetBIOSSMBConfigBean netBIOSSMBConfigBean = cifsConfigBean.getNetBIOSSMB();
|
|
if (netBIOSSMBConfigBean != null)
|
|
{
|
|
// Check if NetBIOS over TCP/IP is enabled for the current platform
|
|
|
|
String platformsStr = netBIOSSMBConfigBean.getPlatforms();
|
|
boolean platformOK = false;
|
|
|
|
if (platformsStr != null && platformsStr.length() > 0)
|
|
{
|
|
// Parse the list of platforms that NetBIOS over TCP/IP is to be enabled for and
|
|
// check if the current platform is included
|
|
|
|
EnumSet<Platform.Type> enabledPlatforms = parsePlatformString(platformsStr);
|
|
if (enabledPlatforms.contains(getPlatformType()))
|
|
platformOK = true;
|
|
}
|
|
else
|
|
{
|
|
// No restriction on platforms
|
|
|
|
platformOK = true;
|
|
}
|
|
|
|
// Enable the NetBIOS SMB support, if enabled for this platform
|
|
|
|
cifsConfig.setNetBIOSSMB(platformOK);
|
|
|
|
// Parse/check NetBIOS settings, if enabled
|
|
|
|
if (cifsConfig.hasNetBIOSSMB())
|
|
{
|
|
// Check if the broadcast mask has been specified
|
|
|
|
if (cifsConfig.getBroadcastMask() == null)
|
|
throw new AlfrescoRuntimeException("Network broadcast mask not specified");
|
|
|
|
// Check for a bind address
|
|
|
|
String bindto = netBIOSSMBConfigBean.getBindTo();
|
|
if (bindto != null && bindto.length() > 0 && !bindto.equals(BIND_TO_IGNORE))
|
|
{
|
|
|
|
// Validate the bind address
|
|
|
|
try
|
|
{
|
|
|
|
// Check the bind address
|
|
|
|
InetAddress bindAddr = InetAddress.getByName(bindto);
|
|
|
|
// Set the bind address for the NetBIOS name server
|
|
|
|
cifsConfig.setNetBIOSBindAddress(bindAddr);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid NetBIOS bind address");
|
|
}
|
|
}
|
|
else if (cifsConfig.hasSMBBindAddress())
|
|
{
|
|
|
|
// Use the SMB bind address for the NetBIOS name server
|
|
|
|
cifsConfig.setNetBIOSBindAddress(cifsConfig.getSMBBindAddress());
|
|
}
|
|
else
|
|
{
|
|
// Get a list of all the local addresses
|
|
|
|
InetAddress[] addrs = null;
|
|
|
|
try
|
|
{
|
|
// Get the local server IP address list
|
|
|
|
addrs = InetAddress.getAllByName(InetAddress.getLocalHost().getHostName());
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
logger.error("Failed to get local address list", ex);
|
|
}
|
|
|
|
// Check the address list for one or more valid local addresses filtering out the loopback
|
|
// address
|
|
|
|
int addrCnt = 0;
|
|
|
|
if (addrs != null)
|
|
{
|
|
for (int i = 0; i < addrs.length; i++)
|
|
{
|
|
|
|
// Check for a valid address, filter out '127.0.0.1' and '0.0.0.0' addresses
|
|
|
|
if (addrs[i].getHostAddress().equals("127.0.0.1") == false
|
|
&& addrs[i].getHostAddress().equals("0.0.0.0") == false)
|
|
addrCnt++;
|
|
}
|
|
}
|
|
|
|
// Check if any addresses were found
|
|
|
|
if (addrCnt == 0)
|
|
{
|
|
// Enumerate the network adapter list
|
|
|
|
Enumeration<NetworkInterface> niEnum = null;
|
|
|
|
try
|
|
{
|
|
niEnum = NetworkInterface.getNetworkInterfaces();
|
|
}
|
|
catch (SocketException ex)
|
|
{
|
|
}
|
|
|
|
if (niEnum != null)
|
|
{
|
|
while (niEnum.hasMoreElements())
|
|
{
|
|
// Get the current network interface
|
|
|
|
NetworkInterface ni = niEnum.nextElement();
|
|
|
|
// Enumerate the addresses for the network adapter
|
|
|
|
Enumeration<InetAddress> niAddrs = ni.getInetAddresses();
|
|
if (niAddrs != null)
|
|
{
|
|
// Check for any valid addresses
|
|
|
|
while (niAddrs.hasMoreElements())
|
|
{
|
|
InetAddress curAddr = niAddrs.nextElement();
|
|
|
|
if (curAddr.getHostAddress().equals("127.0.0.1") == false
|
|
&& curAddr.getHostAddress().equals("0.0.0.0") == false)
|
|
addrCnt++;
|
|
}
|
|
}
|
|
}
|
|
|
|
// DEBUG
|
|
|
|
if (addrCnt > 0 && logger.isDebugEnabled())
|
|
logger.debug("Found valid IP address from interface list");
|
|
}
|
|
|
|
// Check if we found any valid network addresses
|
|
|
|
if (addrCnt == 0)
|
|
{
|
|
// Log the available IP addresses
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Local address list dump :-");
|
|
if (addrs != null)
|
|
{
|
|
for (int i = 0; i < addrs.length; i++)
|
|
logger.debug(" Address: " + addrs[i]);
|
|
}
|
|
else
|
|
logger.debug(" No addresses");
|
|
}
|
|
|
|
// Throw an exception to stop the CIFS/NetBIOS name server from starting
|
|
|
|
throw new AlfrescoRuntimeException(
|
|
"Failed to get IP address(es) for the local server, check hosts file and/or DNS setup");
|
|
}
|
|
}
|
|
}
|
|
|
|
// Check if the session port has been specified
|
|
|
|
Integer portNum = netBIOSSMBConfigBean.getSessionPort();
|
|
if (portNum != null)
|
|
{
|
|
cifsConfig.setSessionPort(portNum);
|
|
if (cifsConfig.getSessionPort() <= 0 || cifsConfig.getSessionPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("NetBIOS session port out of valid range");
|
|
}
|
|
|
|
// Check if the name port has been specified
|
|
|
|
portNum = netBIOSSMBConfigBean.getNamePort();
|
|
if (portNum != null)
|
|
{
|
|
cifsConfig.setNameServerPort(portNum);
|
|
if (cifsConfig.getNameServerPort() <= 0 || cifsConfig.getNameServerPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("NetBIOS name port out of valid range");
|
|
}
|
|
|
|
// Check if the datagram port has been specified
|
|
|
|
portNum = netBIOSSMBConfigBean.getDatagramPort();
|
|
if (portNum != null)
|
|
{
|
|
cifsConfig.setDatagramPort(portNum);
|
|
if (cifsConfig.getDatagramPort() <= 0 || cifsConfig.getDatagramPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("NetBIOS datagram port out of valid range");
|
|
}
|
|
|
|
// Check for a bind address
|
|
|
|
String attr = netBIOSSMBConfigBean.getBindTo();
|
|
if (attr != null && attr.length() > 0 && !attr.equals(BIND_TO_IGNORE))
|
|
{
|
|
|
|
// Validate the bind address
|
|
|
|
try
|
|
{
|
|
|
|
// Check the bind address
|
|
|
|
InetAddress bindAddr = InetAddress.getByName(attr);
|
|
|
|
// Set the bind address for the NetBIOS name server
|
|
|
|
cifsConfig.setNetBIOSBindAddress(bindAddr);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new InvalidConfigurationException(ex.toString());
|
|
}
|
|
}
|
|
|
|
// Check for a bind address using the adapter name
|
|
|
|
else if ((attr = netBIOSSMBConfigBean.getAdapter()) != null && attr.length() > 0)
|
|
{
|
|
|
|
// Get the bind address via the network adapter name
|
|
|
|
InetAddress bindAddr = parseAdapterName(attr);
|
|
cifsConfig.setNetBIOSBindAddress(bindAddr);
|
|
}
|
|
else if (cifsConfig.hasSMBBindAddress())
|
|
{
|
|
|
|
// Use the SMB bind address for the NetBIOS name server
|
|
|
|
cifsConfig.setNetBIOSBindAddress(cifsConfig.getSMBBindAddress());
|
|
}
|
|
|
|
}
|
|
}
|
|
else
|
|
{
|
|
|
|
// Disable NetBIOS SMB support
|
|
|
|
cifsConfig.setNetBIOSSMB(false);
|
|
}
|
|
|
|
// Check if TCP/IP SMB is enabled
|
|
|
|
TcpipSMBConfigBean tcpipSMBConfigBean = cifsConfigBean.getTcpipSMB();
|
|
if (tcpipSMBConfigBean != null)
|
|
{
|
|
|
|
// Check if native SMB is enabled for the current platform
|
|
|
|
String platformsStr = tcpipSMBConfigBean.getPlatforms();
|
|
boolean platformOK = false;
|
|
|
|
if (platformsStr != null)
|
|
{
|
|
// Parse the list of platforms that native SMB is to be enabled for and
|
|
// check if the current platform is included
|
|
|
|
EnumSet<Platform.Type> enabledPlatforms = parsePlatformString(platformsStr);
|
|
if (enabledPlatforms.contains(getPlatformType()))
|
|
platformOK = true;
|
|
}
|
|
else
|
|
{
|
|
// No restriction on platforms
|
|
|
|
platformOK = true;
|
|
}
|
|
|
|
// Enable the TCP/IP SMB support, if enabled for this platform
|
|
|
|
cifsConfig.setTcpipSMB(platformOK);
|
|
|
|
// Check if the port has been specified
|
|
|
|
Integer portNum = tcpipSMBConfigBean.getPort();
|
|
if (portNum != null)
|
|
{
|
|
cifsConfig.setTcpipSMBPort(portNum);
|
|
if (cifsConfig.getTcpipSMBPort() <= 0 || cifsConfig.getTcpipSMBPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("TCP/IP SMB port out of valid range");
|
|
}
|
|
|
|
// Check if IPv6 support should be enabled
|
|
|
|
if ( tcpipSMBConfigBean.getIpv6Enabled())
|
|
{
|
|
try
|
|
{
|
|
// Use the IPv6 bind all address
|
|
|
|
cifsConfig.setSMBBindAddress( InetAddress.getByName( "::"));
|
|
|
|
// DEBUG
|
|
|
|
if ( logger.isInfoEnabled())
|
|
logger.info("Enabled CIFS IPv6 bind address for native SMB");
|
|
}
|
|
catch ( UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Failed to enable IPv6 bind address, " + ex.getMessage());
|
|
}
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
|
|
// Disable TCP/IP SMB support
|
|
|
|
cifsConfig.setTcpipSMB(false);
|
|
}
|
|
|
|
// Check if Win32 NetBIOS is enabled
|
|
|
|
Win32NetBIOSConfigBean win32NetBIOSConfigBean = cifsConfigBean.getWin32NetBIOS();
|
|
if (win32NetBIOSConfigBean != null)
|
|
{
|
|
|
|
// Check if the Win32 NetBIOS server name has been specified
|
|
|
|
String win32Name = win32NetBIOSConfigBean.getName();
|
|
if (win32Name != null && win32Name.length() > 0)
|
|
{
|
|
|
|
// Validate the name
|
|
|
|
if (win32Name.length() > 16)
|
|
throw new AlfrescoRuntimeException("Invalid Win32 NetBIOS name, " + win32Name);
|
|
|
|
// Set the Win32 NetBIOS file server name
|
|
|
|
cifsConfig.setWin32NetBIOSName(win32Name);
|
|
}
|
|
|
|
// Check if the Win32 NetBIOS LANA has been specified
|
|
|
|
String lanaStr = win32NetBIOSConfigBean.getLana();
|
|
if (lanaStr != null && lanaStr.length() > 0)
|
|
{
|
|
// Check if the LANA has been specified as an IP address or adapter name
|
|
|
|
int lana = -1;
|
|
|
|
if (IPAddress.isNumericAddress(lanaStr))
|
|
{
|
|
|
|
// Convert the IP address to a LANA id
|
|
|
|
lana = Win32NetBIOS.getLANAForIPAddress(lanaStr);
|
|
if (lana == -1)
|
|
throw new AlfrescoRuntimeException("Failed to convert IP address " + lanaStr + " to a LANA");
|
|
}
|
|
else if (lanaStr.length() > 1 && Character.isLetter(lanaStr.charAt(0)))
|
|
{
|
|
|
|
// Convert the network adapter to a LANA id
|
|
|
|
lana = Win32NetBIOS.getLANAForAdapterName(lanaStr);
|
|
if (lana == -1)
|
|
throw new AlfrescoRuntimeException("Failed to convert network adapter " + lanaStr
|
|
+ " to a LANA");
|
|
}
|
|
else
|
|
{
|
|
|
|
try
|
|
{
|
|
lana = Integer.parseInt(lanaStr);
|
|
}
|
|
catch (NumberFormatException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid win32 NetBIOS LANA specified");
|
|
}
|
|
}
|
|
|
|
// LANA should be in the range 0-255
|
|
|
|
if (lana < 0 || lana > 255)
|
|
throw new AlfrescoRuntimeException("Invalid Win32 NetBIOS LANA number, " + lana);
|
|
|
|
// Set the LANA number
|
|
|
|
cifsConfig.setWin32LANA(lana);
|
|
}
|
|
|
|
// Check if the native NetBIOS interface has been specified, either 'winsock' or 'netbios'
|
|
|
|
String nativeAPI = win32NetBIOSConfigBean.getApi();
|
|
if (nativeAPI != null && nativeAPI.length() > 0)
|
|
{
|
|
// Validate the API type
|
|
|
|
boolean useWinsock = true;
|
|
|
|
if (nativeAPI.equalsIgnoreCase("netbios"))
|
|
useWinsock = false;
|
|
else if (nativeAPI.equalsIgnoreCase("winsock") == false)
|
|
throw new AlfrescoRuntimeException("Invalid NetBIOS API type, spefify 'winsock' or 'netbios'");
|
|
|
|
// Set the NetBIOS API to use
|
|
|
|
cifsConfig.setWin32WinsockNetBIOS(useWinsock);
|
|
}
|
|
|
|
// Force the older NetBIOS API code to be used on 64Bit Windows
|
|
|
|
if (cifsConfig.useWinsockNetBIOS() == true && X64.isWindows64())
|
|
{
|
|
// Debug
|
|
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Using older Netbios() API code");
|
|
|
|
// Use the older NetBIOS API code
|
|
|
|
cifsConfig.setWin32WinsockNetBIOS(false);
|
|
}
|
|
|
|
// Check if the current operating system is supported by the Win32
|
|
// NetBIOS handler
|
|
|
|
String osName = System.getProperty("os.name");
|
|
if (osName.startsWith("Windows")
|
|
&& (osName.endsWith("95") == false && osName.endsWith("98") == false && osName.endsWith("ME") == false)
|
|
&& isNativeCodeDisabled() == false)
|
|
{
|
|
|
|
// Call the Win32NetBIOS native code to make sure it is initialized
|
|
|
|
if (Win32NetBIOS.LanaEnumerate() != null)
|
|
{
|
|
// Enable Win32 NetBIOS
|
|
|
|
cifsConfig.setWin32NetBIOS(true);
|
|
}
|
|
else
|
|
{
|
|
logger.warn("No NetBIOS LANAs available");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
|
|
// Win32 NetBIOS not supported on the current operating system
|
|
|
|
cifsConfig.setWin32NetBIOS(false);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
|
|
// Disable Win32 NetBIOS
|
|
|
|
cifsConfig.setWin32NetBIOS(false);
|
|
}
|
|
|
|
// Check if the Win32 host announcer has been disabled
|
|
|
|
if ( !cifsConfigBean.getWin32HostAnnouncerEnabled())
|
|
{
|
|
// Switch off the Win32 host announcer
|
|
|
|
cifsConfig.setWin32HostAnnouncer( false);
|
|
|
|
// Log that host announcements are not enabled
|
|
|
|
logger.info("Win32 host announcements not enabled");
|
|
}
|
|
else
|
|
{
|
|
// Check for an announcement interval
|
|
Integer interval = cifsConfigBean.getWin32HostAnnounceInterval();
|
|
if (interval != null)
|
|
{
|
|
cifsConfig.setWin32HostAnnounceInterval(interval);
|
|
}
|
|
|
|
// Check if the domain name has been set, this is required if the
|
|
// host announcer is enabled
|
|
|
|
if (cifsConfig.getDomainName() == null)
|
|
throw new AlfrescoRuntimeException("Domain name must be specified if host announcement is enabled");
|
|
|
|
// Enable Win32 NetBIOS host announcement
|
|
|
|
cifsConfig.setWin32HostAnnouncer(true);
|
|
}
|
|
|
|
// Check if NetBIOS and/or TCP/IP SMB have been enabled
|
|
|
|
if (cifsConfig.hasNetBIOSSMB() == false && cifsConfig.hasTcpipSMB() == false
|
|
&& cifsConfig.hasWin32NetBIOS() == false)
|
|
throw new AlfrescoRuntimeException("NetBIOS SMB, TCP/IP SMB or Win32 NetBIOS must be enabled");
|
|
|
|
// Check if WINS servers are configured
|
|
|
|
WINSConfigBean winsConfigBean = cifsConfigBean.getWINSConfig();
|
|
|
|
if (winsConfigBean != null && !winsConfigBean.isAutoDetectEnabled())
|
|
{
|
|
|
|
// Get the primary WINS server
|
|
|
|
String priWins = winsConfigBean.getPrimary();
|
|
|
|
if (priWins == null || priWins.length() == 0)
|
|
throw new AlfrescoRuntimeException("No primary WINS server configured");
|
|
|
|
// Validate the WINS server address
|
|
|
|
InetAddress primaryWINS = null;
|
|
|
|
try
|
|
{
|
|
primaryWINS = InetAddress.getByName(priWins);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid primary WINS server address, " + priWins);
|
|
}
|
|
|
|
// Check if a secondary WINS server has been specified
|
|
|
|
String secWins = winsConfigBean.getSecondary();
|
|
InetAddress secondaryWINS = null;
|
|
|
|
if (secWins != null && secWins.length() > 0)
|
|
{
|
|
|
|
// Validate the secondary WINS server address
|
|
|
|
try
|
|
{
|
|
secondaryWINS = InetAddress.getByName(secWins);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid secondary WINS server address, " + secWins);
|
|
}
|
|
}
|
|
|
|
// Set the WINS server address(es)
|
|
|
|
cifsConfig.setPrimaryWINSServer(primaryWINS);
|
|
if (secondaryWINS != null)
|
|
cifsConfig.setSecondaryWINSServer(secondaryWINS);
|
|
|
|
// Pass the setting to the NetBIOS session class
|
|
|
|
NetBIOSSession.setDefaultWINSServer(primaryWINS);
|
|
}
|
|
|
|
// Check if WINS is configured, if we are running on Windows and socket based NetBIOS is enabled
|
|
|
|
else if (cifsConfig.hasNetBIOSSMB() && getPlatformType() == Platform.Type.WINDOWS && !isNativeCodeDisabled())
|
|
{
|
|
// Get the WINS server list
|
|
|
|
String winsServers = Win32NetBIOS.getWINSServerList();
|
|
|
|
if (winsServers != null)
|
|
{
|
|
// Use the first WINS server address for now
|
|
|
|
StringTokenizer tokens = new StringTokenizer(winsServers, ",");
|
|
String addr = tokens.nextToken();
|
|
|
|
try
|
|
{
|
|
// Convert to a network address and check if the WINS server is accessible
|
|
|
|
InetAddress winsAddr = InetAddress.getByName(addr);
|
|
|
|
Socket winsSocket = new Socket();
|
|
InetSocketAddress sockAddr = new InetSocketAddress(winsAddr, RFCNetBIOSProtocol.NAME_PORT);
|
|
|
|
winsSocket.connect(sockAddr, 3000);
|
|
winsSocket.close();
|
|
|
|
// Set the primary WINS server address
|
|
|
|
cifsConfig.setPrimaryWINSServer(winsAddr);
|
|
|
|
// Debug
|
|
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Configuring to use WINS server " + addr);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid auto WINS server address, " + addr);
|
|
}
|
|
catch (IOException ex)
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Failed to connect to auto WINS server " + addr);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Check for session debug flags
|
|
|
|
String flags = cifsConfigBean.getSessionDebugFlags();
|
|
|
|
int sessDbg = 0;
|
|
|
|
if (flags != null && flags.length() > 0)
|
|
{
|
|
|
|
// Parse the flags
|
|
|
|
flags = flags.toUpperCase();
|
|
StringTokenizer token = new StringTokenizer(flags, ",");
|
|
|
|
while (token.hasMoreTokens())
|
|
{
|
|
// Get the current debug flag token
|
|
|
|
String dbg = token.nextToken().trim();
|
|
|
|
// Find the debug flag name
|
|
|
|
int idx = 0;
|
|
|
|
while (idx < m_sessDbgStr.length && m_sessDbgStr[idx].equalsIgnoreCase(dbg) == false)
|
|
idx++;
|
|
|
|
if (idx > m_sessDbgStr.length)
|
|
throw new AlfrescoRuntimeException("Invalid session debug flag, " + dbg);
|
|
|
|
// Set the debug flag
|
|
|
|
sessDbg += 1 << idx;
|
|
}
|
|
}
|
|
|
|
// Set the session debug flags
|
|
|
|
cifsConfig.setSessionDebugFlags(sessDbg);
|
|
|
|
// Check if NIO based socket code should be disabled
|
|
|
|
if (cifsConfigBean.getDisableNIO())
|
|
{
|
|
|
|
// Disable NIO based code
|
|
|
|
cifsConfig.setDisableNIOCode(true);
|
|
|
|
// DEBUG
|
|
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("NIO based code disabled for CIFS server");
|
|
}
|
|
|
|
|
|
// Check if a session timeout is configured
|
|
|
|
Integer tmo = cifsConfigBean.getSessionTimeout();
|
|
if (tmo != null)
|
|
{
|
|
|
|
// Validate the session timeout value
|
|
|
|
if (tmo < 0 || tmo > MaxSessionTimeout)
|
|
throw new AlfrescoRuntimeException("Session timeout out of range (0 - " + MaxSessionTimeout + ")");
|
|
|
|
// Convert the session timeout to milliseconds
|
|
|
|
cifsConfig.setSocketTimeout(tmo * 1000);
|
|
}
|
|
}
|
|
catch (InvalidConfigurationException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException(ex.getMessage());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Process the FTP server configuration
|
|
*/
|
|
protected void processFTPServerConfig()
|
|
{
|
|
// If the configuration section is not valid then FTP is disabled
|
|
|
|
if (ftpConfigBean == null)
|
|
{
|
|
removeConfigSection(FTPConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Check if the server has been disabled
|
|
|
|
if (!ftpConfigBean.getServerEnabled())
|
|
{
|
|
removeConfigSection(FTPConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Create the FTP configuration section
|
|
|
|
FTPConfigSection ftpConfig = new FTPConfigSection(this);
|
|
|
|
try
|
|
{
|
|
// Check for a bind address
|
|
|
|
String bindText = ftpConfigBean.getBindTo();
|
|
if (bindText != null && bindText.length() > 0 && !bindText.equals(BIND_TO_IGNORE))
|
|
{
|
|
|
|
// Validate the bind address
|
|
|
|
try
|
|
{
|
|
|
|
// Check the bind address
|
|
|
|
InetAddress bindAddr = InetAddress.getByName(bindText);
|
|
|
|
// Set the bind address for the FTP server
|
|
|
|
ftpConfig.setFTPBindAddress(bindAddr);
|
|
}
|
|
catch (UnknownHostException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid FTP bindto address, " + bindText);
|
|
}
|
|
}
|
|
|
|
// Check for an FTP server port
|
|
|
|
Integer port = ftpConfigBean.getPort();
|
|
if (port != null)
|
|
{
|
|
ftpConfig.setFTPPort(port);
|
|
if (ftpConfig.getFTPPort() <= 0 || ftpConfig.getFTPPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("FTP server port out of valid range");
|
|
}
|
|
else
|
|
{
|
|
|
|
// Use the default FTP port
|
|
|
|
ftpConfig.setFTPPort(DefaultFTPServerPort);
|
|
}
|
|
|
|
// Check if anonymous login is allowed
|
|
|
|
if (ftpConfigBean.getAllowAnonymous())
|
|
{
|
|
|
|
// Enable anonymous login to the FTP server
|
|
|
|
ftpConfig.setAllowAnonymousFTP(true);
|
|
|
|
// Check if an anonymous account has been specified
|
|
|
|
String anonAcc = ftpConfigBean.getAnonymousAccount();
|
|
if (anonAcc != null && anonAcc.length() > 0)
|
|
{
|
|
|
|
// Set the anonymous account name
|
|
|
|
ftpConfig.setAnonymousFTPAccount(anonAcc);
|
|
|
|
// Check if the anonymous account name is valid
|
|
|
|
if (ftpConfig.getAnonymousFTPAccount() == null || ftpConfig.getAnonymousFTPAccount().length() == 0)
|
|
throw new AlfrescoRuntimeException("Anonymous FTP account invalid");
|
|
}
|
|
else
|
|
{
|
|
|
|
// Use the default anonymous account name
|
|
|
|
ftpConfig.setAnonymousFTPAccount(DefaultFTPAnonymousAccount);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
|
|
// Disable anonymous logins
|
|
|
|
ftpConfig.setAllowAnonymousFTP(false);
|
|
}
|
|
|
|
// Check if a root path has been specified
|
|
|
|
String rootPath = ftpConfigBean.getRootDirectory();
|
|
if (rootPath != null && rootPath.length() > 0)
|
|
{
|
|
try
|
|
{
|
|
|
|
// Parse the path
|
|
|
|
new FTPPath(rootPath);
|
|
|
|
// Set the root path
|
|
|
|
ftpConfig.setFTPRootPath(rootPath);
|
|
}
|
|
catch (InvalidPathException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid FTP root directory, " + rootPath);
|
|
}
|
|
}
|
|
|
|
// Check for FTP debug flags
|
|
|
|
String flags = ftpConfigBean.getDebugFlags();
|
|
int ftpDbg = 0;
|
|
|
|
if (flags != null)
|
|
{
|
|
|
|
// Parse the flags
|
|
|
|
flags = flags.toUpperCase();
|
|
StringTokenizer token = new StringTokenizer(flags, ",");
|
|
|
|
while (token.hasMoreTokens())
|
|
{
|
|
|
|
// Get the current debug flag token
|
|
|
|
String dbg = token.nextToken().trim();
|
|
|
|
// Find the debug flag name
|
|
|
|
int idx = 0;
|
|
|
|
while (idx < m_ftpDebugStr.length && m_ftpDebugStr[idx].equalsIgnoreCase(dbg) == false)
|
|
idx++;
|
|
|
|
if (idx >= m_ftpDebugStr.length)
|
|
throw new AlfrescoRuntimeException("Invalid FTP debug flag, " + dbg);
|
|
|
|
// Set the debug flag
|
|
|
|
ftpDbg += 1 << idx;
|
|
}
|
|
|
|
// Set the FTP debug flags
|
|
|
|
ftpConfig.setFTPDebug(ftpDbg);
|
|
}
|
|
|
|
// Check if a character set has been specified
|
|
|
|
String charSet = ftpConfigBean.getCharSet();
|
|
if (charSet != null && charSet.length() > 0)
|
|
{
|
|
|
|
try
|
|
{
|
|
|
|
// Validate the character set name
|
|
|
|
Charset.forName(charSet);
|
|
|
|
// Set the FTP character set
|
|
|
|
ftpConfig.setFTPCharacterSet(charSet);
|
|
}
|
|
catch (IllegalCharsetNameException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Illegal character set name, " + charSet);
|
|
}
|
|
catch (UnsupportedCharsetException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Unsupported character set name, " + charSet);
|
|
}
|
|
}
|
|
|
|
// Check if an authenticator has been specified
|
|
|
|
FTPAuthenticator auth = ftpConfigBean.getAuthenticator();
|
|
if (auth != null)
|
|
{
|
|
|
|
// Initialize and set the authenticator class
|
|
|
|
ftpConfig.setAuthenticator(auth);
|
|
}
|
|
else
|
|
throw new AlfrescoRuntimeException("FTP authenticator not specified");
|
|
|
|
// Check if a data port range has been specified
|
|
|
|
if ( ftpConfigBean.getDataPortFrom() != 0 && ftpConfigBean.getDataPortTo() != 0) {
|
|
|
|
// Range check the data port values
|
|
|
|
int rangeFrom = ftpConfigBean.getDataPortFrom();
|
|
int rangeTo = ftpConfigBean.getDataPortTo();
|
|
|
|
if ( rangeFrom != 0 && rangeTo != 0) {
|
|
|
|
// Validate the FTP data port range
|
|
|
|
if ( rangeFrom < 1024 || rangeFrom > 65535)
|
|
throw new InvalidConfigurationException("Invalid FTP data port range from value, " + rangeFrom);
|
|
|
|
if ( rangeTo < 1024 || rangeTo > 65535)
|
|
throw new InvalidConfigurationException("Invalid FTP data port range to value, " + rangeTo);
|
|
|
|
if ( rangeFrom >= rangeTo)
|
|
throw new InvalidConfigurationException("Invalid FTP data port range, " + rangeFrom + "-" + rangeTo);
|
|
|
|
// Set the FTP data port range
|
|
|
|
ftpConfig.setFTPDataPortLow(rangeFrom);
|
|
ftpConfig.setFTPDataPortHigh(rangeTo);
|
|
|
|
// Log the data port range
|
|
|
|
logger.info("FTP server data ports restricted to range " + rangeFrom + ":" + rangeTo);
|
|
}
|
|
}
|
|
|
|
// FTPS parameter parsing
|
|
//
|
|
// Check if a key store path has been specified
|
|
|
|
if ( ftpConfigBean.getKeyStorePath() != null && ftpConfigBean.getKeyStorePath().length() > 0) {
|
|
|
|
// Get the path to the key store, check that the file exists
|
|
|
|
String keyStorePath = ftpConfigBean.getKeyStorePath();
|
|
File keyStoreFile = new File( keyStorePath);
|
|
|
|
if ( keyStoreFile.exists() == false)
|
|
throw new InvalidConfigurationException("FTPS key store file does not exist, " + keyStorePath);
|
|
else if ( keyStoreFile.isDirectory())
|
|
throw new InvalidConfigurationException("FTPS key store path is a directory, " + keyStorePath);
|
|
|
|
// Set the key store path
|
|
|
|
ftpConfig.setKeyStorePath( keyStorePath);
|
|
}
|
|
|
|
// Check if the trust store path has been specified
|
|
|
|
if ( ftpConfigBean.getTrustStorePath() != null && ftpConfigBean.getTrustStorePath().length() > 0) {
|
|
|
|
// Get the path to the trust store, check that the file exists
|
|
|
|
String trustStorePath = ftpConfigBean.getTrustStorePath();
|
|
File trustStoreFile = new File( trustStorePath);
|
|
|
|
if ( trustStoreFile.exists() == false)
|
|
throw new InvalidConfigurationException("FTPS trust store file does not exist, " + trustStorePath);
|
|
else if ( trustStoreFile.isDirectory())
|
|
throw new InvalidConfigurationException("FTPS trust store path is a directory, " + trustStorePath);
|
|
|
|
// Set the trust store path
|
|
|
|
ftpConfig.setTrustStorePath( trustStorePath);
|
|
}
|
|
|
|
// Check if the store passphrase has been specified
|
|
|
|
if ( ftpConfigBean.getPassphrase() != null && ftpConfigBean.getPassphrase().length() > 0) {
|
|
|
|
// Set the store passphrase
|
|
|
|
ftpConfig.setPassphrase( ftpConfigBean.getPassphrase());
|
|
}
|
|
|
|
// Check if only secure sessions should be allowed to logon
|
|
|
|
if ( ftpConfigBean.hasRequireSecureSession()) {
|
|
|
|
// Only allow secure sessions to logon to the FTP server
|
|
|
|
ftpConfig.setRequireSecureSession( true);
|
|
}
|
|
|
|
// Check that all the required FTPS parameters have been set
|
|
|
|
if ( ftpConfig.getKeyStorePath() != null || ftpConfig.getTrustStorePath() != null || ftpConfig.getPassphrase() != null) {
|
|
|
|
// Make sure all parameters are set
|
|
|
|
if ( ftpConfig.getKeyStorePath() == null || ftpConfig.getTrustStorePath() == null || ftpConfig.getPassphrase() == null)
|
|
throw new InvalidConfigurationException("FTPS configuration requires keyStore, trustStore and storePassphrase to be set");
|
|
}
|
|
|
|
// Check if SSLEngine debug output should be enabled
|
|
|
|
if ( ftpConfigBean.hasSslEngineDebug()) {
|
|
|
|
// Enable SSLEngine debug output
|
|
|
|
System.setProperty("javax.net.debug", "ssl,handshake");
|
|
}
|
|
}
|
|
catch (InvalidConfigurationException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException(ex.getMessage());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Process the NFS server configuration
|
|
*/
|
|
protected void processNFSServerConfig()
|
|
{
|
|
// If the configuration section is not valid then NFS is disabled
|
|
|
|
if (nfsConfigBean == null)
|
|
{
|
|
removeConfigSection(NFSConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Check if the server has been disabled
|
|
|
|
if (!nfsConfigBean.getServerEnabled())
|
|
{
|
|
removeConfigSection(NFSConfigSection.SectionName);
|
|
return;
|
|
}
|
|
|
|
// Create the NFS configuration section
|
|
|
|
NFSConfigSection nfsConfig = new NFSConfigSection(this);
|
|
|
|
try
|
|
{
|
|
// Check if the port mapper is enabled
|
|
|
|
if (nfsConfigBean.getPortMapperEnabled())
|
|
nfsConfig.setNFSPortMapper(true);
|
|
|
|
// Check for the thread pool size
|
|
|
|
Integer poolSize = nfsConfigBean.getThreadPool();
|
|
|
|
if (poolSize != null)
|
|
{
|
|
|
|
// Range check the pool size value
|
|
|
|
if (poolSize < 4)
|
|
throw new AlfrescoRuntimeException("NFS thread pool size is below minimum of 4");
|
|
|
|
// Set the thread pool size
|
|
|
|
nfsConfig.setNFSThreadPoolSize(poolSize);
|
|
}
|
|
|
|
// NFS packet pool size
|
|
|
|
Integer pktPoolSize = nfsConfigBean.getPacketPool();
|
|
|
|
if (pktPoolSize != null)
|
|
{
|
|
// Range check the pool size value
|
|
|
|
if (pktPoolSize < 10)
|
|
throw new AlfrescoRuntimeException("NFS packet pool size is below minimum of 10");
|
|
|
|
if (pktPoolSize < nfsConfig.getNFSThreadPoolSize() + 1)
|
|
throw new AlfrescoRuntimeException("NFS packet pool must be at least thread pool size plus one");
|
|
|
|
// Set the packet pool size
|
|
|
|
nfsConfig.setNFSPacketPoolSize(pktPoolSize);
|
|
}
|
|
|
|
// Check for a port mapper server port
|
|
|
|
Integer portMapperPort = nfsConfigBean.getPortMapperPort();
|
|
if (portMapperPort != null)
|
|
{
|
|
nfsConfig.setPortMapperPort(portMapperPort);
|
|
if ( nfsConfig.getPortMapperPort() == -1) {
|
|
logger.info("NFS portmapper registration disabled");
|
|
}
|
|
else {
|
|
if (nfsConfig.getPortMapperPort() <= 0 || nfsConfig.getPortMapperPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("Port mapper server port out of valid range");
|
|
}
|
|
}
|
|
|
|
// Check for a mount server port
|
|
|
|
Integer mountServerPort = nfsConfigBean.getMountServerPort();
|
|
if (mountServerPort != null)
|
|
{
|
|
nfsConfig.setMountServerPort(mountServerPort);
|
|
if (nfsConfig.getMountServerPort() < 0 || nfsConfig.getMountServerPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("Mount server port out of valid range");
|
|
}
|
|
|
|
// Check for an NFS server port
|
|
|
|
Integer nfsServerPort = nfsConfigBean.getNfsServerPort();
|
|
if (nfsServerPort != null)
|
|
{
|
|
nfsConfig.setNFSServerPort(nfsServerPort);
|
|
if (nfsConfig.getNFSServerPort() < 0 || nfsConfig.getNFSServerPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("NFS server port out of valid range");
|
|
}
|
|
|
|
// Check for an RPC registration port
|
|
|
|
Integer rpcRegisterPort = nfsConfigBean.getRpcRegisterPort();
|
|
if ( rpcRegisterPort != null)
|
|
{
|
|
nfsConfig.setRPCRegistrationPort( rpcRegisterPort);
|
|
if ( nfsConfig.getRPCRegistrationPort() < 0 || nfsConfig.getRPCRegistrationPort() >= 65535)
|
|
throw new AlfrescoRuntimeException("RPC registrtion port out of valid range");
|
|
}
|
|
|
|
// Check for NFS debug flags
|
|
|
|
String flags = nfsConfigBean.getDebugFlags();
|
|
int nfsDbg = 0;
|
|
|
|
if (flags != null && flags.length() > 0)
|
|
{
|
|
|
|
// Parse the flags
|
|
|
|
flags = flags.toUpperCase();
|
|
StringTokenizer token = new StringTokenizer(flags, ",");
|
|
|
|
while (token.hasMoreTokens())
|
|
{
|
|
|
|
// Get the current debug flag token
|
|
|
|
String dbg = token.nextToken().trim();
|
|
|
|
// Find the debug flag name
|
|
|
|
int idx = 0;
|
|
|
|
while (idx < m_nfsDebugStr.length && m_nfsDebugStr[idx].equalsIgnoreCase(dbg) == false)
|
|
idx++;
|
|
|
|
if (idx >= m_nfsDebugStr.length)
|
|
throw new AlfrescoRuntimeException("Invalid NFS debug flag, " + dbg);
|
|
|
|
// Set the debug flag
|
|
|
|
nfsDbg += 1 << idx;
|
|
}
|
|
|
|
// Set the NFS debug flags
|
|
|
|
nfsConfig.setNFSDebug(nfsDbg);
|
|
}
|
|
|
|
// Check if mount server debug output is enabled
|
|
|
|
if (nfsConfigBean.getMountServerDebug())
|
|
nfsConfig.setMountServerDebug(true);
|
|
|
|
// Check if portmapper debug output is enabled
|
|
|
|
if (nfsConfigBean.getPortMapperDebug())
|
|
nfsConfig.setPortMapperDebug(true);
|
|
|
|
// Create the RPC authenticator
|
|
RpcAuthenticator rpcAuthenticator = nfsConfigBean.getRpcAuthenticator();
|
|
if (rpcAuthenticator != null)
|
|
{
|
|
nfsConfig.setRpcAuthenticator(rpcAuthenticator);
|
|
}
|
|
else
|
|
throw new AlfrescoRuntimeException("RPC authenticator configuration missing, require user mappings");
|
|
}
|
|
catch (InvalidConfigurationException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException(ex.getMessage());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Process the filesystems configuration
|
|
*/
|
|
protected void processFilesystemsConfig()
|
|
{
|
|
// Create the filesystems configuration section
|
|
|
|
FilesystemsConfigSection fsysConfig = new FilesystemsConfigSection(this);
|
|
|
|
// Access the security configuration section
|
|
|
|
SecurityConfigSection secConfig = (SecurityConfigSection) getConfigSection(SecurityConfigSection.SectionName);
|
|
|
|
// Process the filesystems list
|
|
|
|
if (this.filesystemContexts != null)
|
|
{
|
|
|
|
// Add the filesystems
|
|
|
|
for (DeviceContext filesystem : this.filesystemContexts)
|
|
{
|
|
|
|
// Get the current filesystem configuration
|
|
|
|
try
|
|
{
|
|
// Check the filesystem type and use the appropriate driver
|
|
|
|
DiskSharedDevice filesys = null;
|
|
|
|
if (filesystem instanceof AVMContext)
|
|
{
|
|
// Create a new filesystem driver instance and register a context for
|
|
// the new filesystem
|
|
|
|
ExtendedDiskInterface filesysDriver = getAvmDiskInterface();
|
|
filesysDriver.registerContext(filesystem);
|
|
|
|
// Create the shared filesystem
|
|
|
|
filesys = new DiskSharedDevice(filesystem.getDeviceName(), filesysDriver, (AVMContext)filesystem);
|
|
filesys.setConfiguration( this);
|
|
|
|
// Check if the filesystem uses the file state cache, if so then add to the file state reaper
|
|
|
|
DiskDeviceContext diskCtx = (DiskDeviceContext) filesystem;
|
|
|
|
if ( diskCtx.hasStateCache()) {
|
|
|
|
// Register the state cache with the reaper thread
|
|
|
|
fsysConfig.addFileStateCache( filesystem.getDeviceName(), diskCtx.getStateCache());
|
|
}
|
|
|
|
// Start the filesystem
|
|
|
|
((AVMContext)filesystem).startFilesystem(filesys);
|
|
}
|
|
else
|
|
{
|
|
// Create a new filesystem driver instance and register a context for
|
|
// the new filesystem
|
|
|
|
ExtendedDiskInterface filesysDriver = getRepoDiskInterface();
|
|
ContentContext filesysContext = (ContentContext) filesystem;
|
|
filesysDriver.registerContext(filesystem);
|
|
|
|
// Check if an access control list has been specified
|
|
|
|
AccessControlList acls = null;
|
|
AccessControlListBean accessControls = filesysContext.getAccessControlList();
|
|
if (accessControls != null)
|
|
{
|
|
// Parse the access control list
|
|
acls = accessControls.toAccessControlList(secConfig);
|
|
}
|
|
else if (secConfig.hasGlobalAccessControls())
|
|
{
|
|
|
|
// Use the global access control list for this disk share
|
|
acls = secConfig.getGlobalAccessControls();
|
|
}
|
|
|
|
// Create the shared filesystem
|
|
|
|
filesys = new DiskSharedDevice(filesystem.getDeviceName(), filesysDriver, filesysContext);
|
|
filesys.setConfiguration( this);
|
|
|
|
// Add any access controls to the share
|
|
|
|
filesys.setAccessControlList(acls);
|
|
|
|
// Check if the filesystem uses the file state cache, if so then add to the file state reaper
|
|
|
|
if ( filesysContext.hasStateCache()) {
|
|
|
|
// Register the state cache with the reaper thread
|
|
|
|
fsysConfig.addFileStateCache( filesystem.getDeviceName(), filesysContext.getStateCache());
|
|
}
|
|
|
|
// Check if change notifications should be enabled
|
|
|
|
if ( filesysContext.getDisableChangeNotifications() == false)
|
|
filesysContext.enableChangeHandler( true);
|
|
|
|
// Start the filesystem
|
|
|
|
filesysContext.startFilesystem(filesys);
|
|
}
|
|
|
|
// Add the new filesystem
|
|
|
|
fsysConfig.addShare(filesys);
|
|
}
|
|
catch (DeviceContextException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException("Error creating filesystem " + filesystem.getDeviceName(), ex);
|
|
}
|
|
catch (InvalidConfigurationException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException(ex.getMessage(), ex);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// No filesystems defined
|
|
|
|
logger.warn("No filesystems defined");
|
|
}
|
|
|
|
// Check if shares should be added for all AVM stores
|
|
if (this.avmAllStores && getAvmDiskInterface() != null)
|
|
{
|
|
// Get the list of store names
|
|
|
|
AVMDiskDriver avmDriver = (AVMDiskDriver) getAvmDiskInterface();
|
|
StringList storeNames = avmDriver.getAVMStoreNames();
|
|
|
|
// Add shares for each of the store names, if the share name does not already exist
|
|
|
|
if (storeNames != null && storeNames.numberOfStrings() > 0)
|
|
{
|
|
// Add a share for each store
|
|
|
|
for (int i = 0; i < storeNames.numberOfStrings(); i++)
|
|
{
|
|
String storeName = storeNames.getStringAt(i);
|
|
|
|
// Check if a share of the same name already exists
|
|
|
|
if (fsysConfig.getShares().findShare(storeName, ShareType.DISK, true) == null)
|
|
{
|
|
// Create the new share for the store
|
|
|
|
AVMContext avmContext = new AVMContext(storeName, storeName + ":/", AVMContext.VERSION_HEAD);
|
|
avmContext.enableStateCache(true);
|
|
|
|
// Create the shared filesystem
|
|
|
|
DiskSharedDevice filesys = new DiskSharedDevice(storeName, avmDriver, avmContext);
|
|
filesys.setConfiguration( this);
|
|
|
|
fsysConfig.addShare( filesys);
|
|
|
|
// DEBUG
|
|
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Added AVM share " + storeName);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
// home folder share mapper could be declared in security config
|
|
}
|
|
|
|
/**
|
|
* Process the security configuration
|
|
*/
|
|
protected void processSecurityConfig()
|
|
{
|
|
// Create the security configuration section
|
|
|
|
SecurityConfigSection secConfig = new SecurityConfigSection(this);
|
|
|
|
try
|
|
{
|
|
// Check if global access controls have been specified
|
|
|
|
AccessControlListBean accessControls = securityConfigBean.getGlobalAccessControl();
|
|
|
|
if (accessControls != null)
|
|
{
|
|
// Parse the access control list
|
|
AccessControlList acls = accessControls.toAccessControlList(secConfig);
|
|
if (acls != null)
|
|
secConfig.setGlobalAccessControls(acls);
|
|
}
|
|
|
|
|
|
// Check if a JCE provider class has been specified
|
|
|
|
String jceProvider = securityConfigBean.getJCEProvider();
|
|
if (jceProvider != null && jceProvider.length() > 0)
|
|
{
|
|
|
|
// Set the JCE provider
|
|
|
|
secConfig.setJCEProvider(jceProvider);
|
|
}
|
|
else
|
|
{
|
|
// Use the default Bouncy Castle JCE provider
|
|
|
|
secConfig.setJCEProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
|
|
}
|
|
|
|
// Check if a share mapper has been specified
|
|
|
|
ShareMapper shareMapper = securityConfigBean.getShareMapper();
|
|
if (shareMapper != null)
|
|
{
|
|
// Associate the share mapper
|
|
secConfig.setShareMapper(shareMapper);
|
|
}
|
|
else
|
|
{
|
|
// Check if the tenant service is enabled
|
|
|
|
if (m_tenantService != null && m_tenantService.isEnabled())
|
|
{
|
|
// Initialize the multi-tenancy share mapper
|
|
|
|
secConfig.setShareMapper("org.alfresco.filesys.alfresco.MultiTenantShareMapper",
|
|
new GenericConfigElement("shareMapper"));
|
|
}
|
|
}
|
|
|
|
// Check if any domain mappings have been specified
|
|
|
|
List<DomainMappingConfigBean> mappings = securityConfigBean.getDomainMappings();
|
|
if (mappings != null)
|
|
{
|
|
DomainMapping mapping = null;
|
|
|
|
for (DomainMappingConfigBean domainMap : mappings)
|
|
{
|
|
// Get the domain name
|
|
|
|
String name = domainMap.getName();
|
|
|
|
// Check if the domain is specified by subnet or range
|
|
|
|
String subnetStr = domainMap.getSubnet();
|
|
String rangeFromStr;
|
|
if (subnetStr != null && subnetStr.length() > 0)
|
|
{
|
|
String maskStr = domainMap.getMask();
|
|
|
|
// Parse the subnet and mask, to validate and convert to int values
|
|
|
|
int subnet = IPAddress.parseNumericAddress(subnetStr);
|
|
int mask = IPAddress.parseNumericAddress(maskStr);
|
|
|
|
if (subnet == 0 || mask == 0)
|
|
throw new AlfrescoRuntimeException("Invalid subnet/mask for domain mapping " + name);
|
|
|
|
// Create the subnet domain mapping
|
|
|
|
mapping = new SubnetDomainMapping(name, subnet, mask);
|
|
}
|
|
else if ((rangeFromStr = domainMap.getRangeFrom()) != null && rangeFromStr.length() > 0)
|
|
{
|
|
String rangeToStr = domainMap.getRangeTo();
|
|
|
|
// Parse the range from/to values and convert to int values
|
|
|
|
int rangeFrom = IPAddress.parseNumericAddress(rangeFromStr);
|
|
int rangeTo = IPAddress.parseNumericAddress(rangeToStr);
|
|
|
|
if (rangeFrom == 0 || rangeTo == 0)
|
|
throw new AlfrescoRuntimeException("Invalid address range domain mapping " + name);
|
|
|
|
// Create the subnet domain mapping
|
|
|
|
mapping = new RangeDomainMapping(name, rangeFrom, rangeTo);
|
|
}
|
|
else
|
|
throw new AlfrescoRuntimeException("Invalid domain mapping specified");
|
|
|
|
// Add the domain mapping
|
|
|
|
secConfig.addDomainMapping(mapping);
|
|
}
|
|
}
|
|
}
|
|
catch (InvalidConfigurationException ex)
|
|
{
|
|
throw new AlfrescoRuntimeException(ex.getMessage());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Process the core server configuration
|
|
*
|
|
* @exception InvalidConfigurationException
|
|
*/
|
|
protected void processCoreServerConfig() throws InvalidConfigurationException
|
|
{
|
|
// Create the core server configuration section
|
|
|
|
CoreServerConfigSection coreConfig = new CoreServerConfigSection(this);
|
|
|
|
// Check if the CIFS server is not enabled, do not create the thread/memory pools
|
|
|
|
if ( cifsConfigBean == null || cifsConfigBean.getServerEnabled() == false)
|
|
return;
|
|
|
|
// Check if the server core element has been specified
|
|
|
|
if (coreServerConfigBean == null)
|
|
{
|
|
|
|
// Configure a default memory pool
|
|
|
|
coreConfig.setMemoryPool(DefaultMemoryPoolBufSizes, DefaultMemoryPoolInitAlloc, DefaultMemoryPoolMaxAlloc);
|
|
|
|
// Configure a default thread pool size
|
|
|
|
coreConfig.setThreadPool(DefaultThreadPoolInit, DefaultThreadPoolMax);
|
|
return;
|
|
}
|
|
|
|
// Check if the thread pool size has been specified
|
|
|
|
Integer initSize = coreServerConfigBean.getThreadPoolInit();
|
|
if (initSize == null)
|
|
{
|
|
initSize = DefaultThreadPoolInit;
|
|
}
|
|
Integer maxSize = coreServerConfigBean.getThreadPoolMax();
|
|
if (maxSize == null)
|
|
{
|
|
maxSize = DefaultThreadPoolMax;
|
|
}
|
|
|
|
// Range check the thread pool size
|
|
|
|
if (initSize < ThreadRequestPool.MinimumWorkerThreads)
|
|
throw new InvalidConfigurationException("Thread pool size below minimum allowed size");
|
|
|
|
if (initSize > ThreadRequestPool.MaximumWorkerThreads)
|
|
throw new InvalidConfigurationException("Thread pool size above maximum allowed size");
|
|
|
|
// Range check the maximum thread pool size
|
|
|
|
if (maxSize < ThreadRequestPool.MinimumWorkerThreads)
|
|
throw new InvalidConfigurationException("Thread pool maximum size below minimum allowed size");
|
|
|
|
if (maxSize > ThreadRequestPool.MaximumWorkerThreads)
|
|
throw new InvalidConfigurationException("Thread pool maximum size above maximum allowed size");
|
|
|
|
if (maxSize < initSize)
|
|
throw new InvalidConfigurationException("Initial size is larger than maxmimum size");
|
|
|
|
// Configure the thread pool
|
|
|
|
coreConfig.setThreadPool(initSize, maxSize);
|
|
|
|
// Check if thread pool debug output is enabled
|
|
|
|
if (coreServerConfigBean.getThreadPoolDebug())
|
|
coreConfig.getThreadPool().setDebug(true);
|
|
|
|
// Check if the packet sizes/allocations have been specified
|
|
|
|
List<MemoryPacketConfigBean> packetSizes = coreServerConfigBean.getMemoryPacketSizes();
|
|
if (packetSizes != null)
|
|
{
|
|
|
|
// Calculate the array size for the packet size/allocation arrays
|
|
|
|
int elemCnt = packetSizes.size();
|
|
|
|
// Create the packet size, initial allocation and maximum allocation arrays
|
|
|
|
int[] pktSizes = new int[elemCnt];
|
|
int[] initSizes = new int[elemCnt];
|
|
int[] maxSizes = new int[elemCnt];
|
|
|
|
int elemIdx = 0;
|
|
|
|
// Process the packet size elements
|
|
for (MemoryPacketConfigBean curChild : packetSizes)
|
|
{
|
|
|
|
// Get the packet size
|
|
|
|
int pktSize = -1;
|
|
|
|
Long pktSizeLong = curChild.getSize();
|
|
if (pktSizeLong == null)
|
|
throw new InvalidConfigurationException("Memory pool packet size not specified");
|
|
|
|
// Parse the packet size
|
|
|
|
try
|
|
{
|
|
pktSize = MemorySize.getByteValueInt(pktSizeLong.toString());
|
|
}
|
|
catch (NumberFormatException ex)
|
|
{
|
|
throw new InvalidConfigurationException("Memory pool packet size, invalid size value, "
|
|
+ pktSizeLong);
|
|
}
|
|
|
|
// Make sure the packet sizes have been specified in ascending order
|
|
|
|
if (elemIdx > 0 && pktSizes[elemIdx - 1] >= pktSize)
|
|
throw new InvalidConfigurationException(
|
|
"Invalid packet size specified, less than/equal to previous packet size");
|
|
|
|
// Get the initial allocation for the current packet size
|
|
Integer initAlloc = curChild.getInit();
|
|
if (initAlloc == null)
|
|
throw new InvalidConfigurationException("Memory pool initial allocation not specified");
|
|
|
|
// Range check the initial allocation
|
|
|
|
if (initAlloc < MemoryPoolMinimumAllocation)
|
|
throw new InvalidConfigurationException("Initial memory pool allocation below minimum of "
|
|
+ MemoryPoolMinimumAllocation);
|
|
|
|
if (initAlloc > MemoryPoolMaximumAllocation)
|
|
throw new InvalidConfigurationException("Initial memory pool allocation above maximum of "
|
|
+ MemoryPoolMaximumAllocation);
|
|
|
|
// Get the maximum allocation for the current packet size
|
|
|
|
Integer maxAlloc = curChild.getMax();
|
|
if (maxAlloc == null)
|
|
throw new InvalidConfigurationException("Memory pool maximum allocation not specified");
|
|
|
|
// Range check the maximum allocation
|
|
|
|
if (maxAlloc < MemoryPoolMinimumAllocation)
|
|
throw new InvalidConfigurationException("Maximum memory pool allocation below minimum of "
|
|
+ MemoryPoolMinimumAllocation);
|
|
|
|
if (initAlloc > MemoryPoolMaximumAllocation)
|
|
throw new InvalidConfigurationException("Maximum memory pool allocation above maximum of "
|
|
+ MemoryPoolMaximumAllocation);
|
|
|
|
// Set the current packet size elements
|
|
|
|
pktSizes[elemIdx] = pktSize;
|
|
initSizes[elemIdx] = initAlloc;
|
|
maxSizes[elemIdx] = maxAlloc;
|
|
|
|
elemIdx++;
|
|
}
|
|
|
|
// Check if all elements were used in the packet size/allocation arrays
|
|
|
|
if (elemIdx < pktSizes.length)
|
|
{
|
|
|
|
// Re-allocate the packet size/allocation arrays
|
|
|
|
int[] newPktSizes = new int[elemIdx];
|
|
int[] newInitSizes = new int[elemIdx];
|
|
int[] newMaxSizes = new int[elemIdx];
|
|
|
|
// Copy the values to the shorter arrays
|
|
|
|
System.arraycopy(pktSizes, 0, newPktSizes, 0, elemIdx);
|
|
System.arraycopy(initSizes, 0, newInitSizes, 0, elemIdx);
|
|
System.arraycopy(maxSizes, 0, newMaxSizes, 0, elemIdx);
|
|
|
|
// Move the new arrays into place
|
|
|
|
pktSizes = newPktSizes;
|
|
initSizes = newInitSizes;
|
|
maxSizes = newMaxSizes;
|
|
}
|
|
|
|
// Configure the memory pool
|
|
|
|
coreConfig.setMemoryPool(pktSizes, initSizes, maxSizes);
|
|
}
|
|
else
|
|
{
|
|
|
|
// Configure a default memory pool
|
|
|
|
coreConfig.setMemoryPool(DefaultMemoryPoolBufSizes, DefaultMemoryPoolInitAlloc, DefaultMemoryPoolMaxAlloc);
|
|
}
|
|
}
|
|
}
|