diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml index 05a962a69f..a931fba337 100644 --- a/config/alfresco/action-services-context.xml +++ b/config/alfresco/action-services-context.xml @@ -548,9 +548,6 @@ - - - diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml index 6e4e94014a..e321bf7507 100644 --- a/config/alfresco/content-services-context.xml +++ b/config/alfresco/content-services-context.xml @@ -93,6 +93,9 @@ + + + @@ -112,6 +115,10 @@ + + + @@ -149,6 +156,9 @@ + + + @@ -206,7 +216,9 @@ - + + + @@ -412,7 +424,9 @@ + parent="baseContentTransformer"> + + + + + diff --git a/config/alfresco/extension/bm-remote-loader-context.xml.sample b/config/alfresco/extension/bm-remote-loader-context.xml.sample index e4b4249dc6..2eafcc5a6d 100644 --- a/config/alfresco/extension/bm-remote-loader-context.xml.sample +++ b/config/alfresco/extension/bm-remote-loader-context.xml.sample @@ -16,9 +16,6 @@ - - - @@ -51,9 +48,6 @@ - - - @@ -77,4 +71,4 @@ - \ No newline at end of file + diff --git a/config/alfresco/rendition-services-context.xml b/config/alfresco/rendition-services-context.xml index 92481e745c..742606deb9 100644 --- a/config/alfresco/rendition-services-context.xml +++ b/config/alfresco/rendition-services-context.xml @@ -131,7 +131,11 @@ + parent="baseRenderingAction"> + + + + ${imap.server.attachments.extraction.enabled} + + + diff --git a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java index 5025a4e6a0..048a654748 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java +++ b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java @@ -1826,15 +1826,9 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware, throw new CMISContentAlreadyExistsException(); } - contentStream = contentStream.markSupported() ? contentStream : new BufferedInputStream(contentStream); - - // establish content encoding - ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder(); - Charset encoding = charsetFinder.getCharset(contentStream, mimeType); - ContentWriter writer = contentService.getWriter(nodeRef, propertyQName, true); + writer.guessEncoding(); writer.setMimetype(mimeType); - writer.setEncoding(encoding.name()); writer.putContent(contentStream); return existed; diff --git a/source/java/org/alfresco/filesys/FTPServerTest.java b/source/java/org/alfresco/filesys/FTPServerTest.java new file mode 100644 index 0000000000..94b20f407a --- /dev/null +++ b/source/java/org/alfresco/filesys/FTPServerTest.java @@ -0,0 +1,666 @@ +/* + * 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 . + */ +package org.alfresco.filesys; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.StringWriter; + +import org.alfresco.filesys.repo.ContentDiskDriverTest; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.model.Repository; +import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.transaction.RetryingTransactionHelper; +import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; +import org.alfresco.service.cmr.repository.ChildAssociationRef; +import org.alfresco.service.cmr.repository.ContentService; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.security.MutableAuthenticationService; +import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; +import org.alfresco.service.transaction.TransactionService; +import org.alfresco.util.ApplicationContextHelper; +import org.alfresco.util.BaseAlfrescoSpringTest; +import org.alfresco.util.PropertyMap; + +import java.io.InputStream; + +import junit.framework.TestCase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.net.PrintCommandListener; +import org.apache.commons.net.ftp.FTPClient; +import org.apache.commons.net.ftp.FTPFile; +import org.apache.commons.net.ftp.FTPReply; +import org.springframework.context.ApplicationContext; + + +/** + * End to end JUNIT test of the FTP server + * + * Uses the commons-net ftp client library to connect to the + * Alfresco FTP server. + */ +public class FTPServerTest extends TestCase + +{ + private static Log logger = LogFactory.getLog(FTPServerTest.class); + + private ApplicationContext applicationContext; + + private final String USER_ADMIN="admin"; + private final String PASSWORD_ADMIN="admin"; + private final String USER_ONE = "FTPServerTestOne"; + private final String USER_TWO = "FTPServerTestTwo"; + private final String PASSWORD_ONE="Password01"; + private final String PASSWORD_TWO="Password02"; + private final String HOSTNAME="localhost"; + + private final String TEST_FOLDER = "FTPServerTest"; + + + private NodeService nodeService; + private PersonService personService; + private MutableAuthenticationService authenticationService; + private AuthenticationComponent authenticationComponent; + private TransactionService transactionService; + private Repository repositoryHelper; + private PermissionService permissionService; + + @Override + protected void setUp() throws Exception + { + applicationContext = ApplicationContextHelper.getApplicationContext(); + + nodeService = (NodeService)applicationContext.getBean("nodeService"); + personService = (PersonService)applicationContext.getBean("personService"); + authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService"); + authenticationComponent = (AuthenticationComponent)applicationContext.getBean("authenticationComponent"); + transactionService = (TransactionService)applicationContext.getBean("transactionService"); + repositoryHelper = (Repository)applicationContext.getBean("repositoryHelper"); + permissionService = (PermissionService)applicationContext.getBean("permissionService"); + + assertNotNull("nodeService is null", nodeService); + assertNotNull("reporitoryHelper is null", repositoryHelper); + assertNotNull("personService is null", personService); + assertNotNull("authenticationService is null", authenticationService); + assertNotNull("authenticationComponent is null", authenticationComponent); + + authenticationComponent.setSystemUserAsCurrentUser(); + + final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper(); + + RetryingTransactionCallback createUsersCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + createUser(USER_ONE, PASSWORD_ONE); + createUser(USER_TWO, PASSWORD_TWO); + return null; + } + }; + tran.doInTransaction(createUsersCB); + + RetryingTransactionCallback createTestDirCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + { + NodeRef userOneHome = repositoryHelper.getUserHome(personService.getPerson(USER_ONE)); + permissionService.setPermission(userOneHome, USER_TWO, PermissionService.CONTRIBUTOR, true); + permissionService.setPermission(userOneHome, USER_TWO, PermissionService.WRITE, true); + } + return null; + } + }; + tran.doInTransaction(createTestDirCB, false, true); + } + + protected void tearDown() throws Exception + { +// UserTransaction txn = transactionService.getUserTransaction(); +// assertNotNull("transaction leaked", txn); +// txn.getStatus(); +// txn.rollback(); + } + + /** + * Simple test that connects to the inbuilt ftp server and logs on + * + * @throws Exception + */ + public void testFTPConnect() throws Exception + { + logger.debug("Start testFTPConnect"); + + FTPClient ftp = connectClient(); + try + { + int reply = ftp.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + boolean login = ftp.login(USER_ADMIN, PASSWORD_ADMIN); + assertTrue("admin login not successful", login); + } + finally + { + ftp.disconnect(); + } + } + + /** + * Simple negative test that connects to the inbuilt ftp server and attempts to + * log on with the wrong password. + * + * @throws Exception + */ + public void testFTPConnectNegative() throws Exception + { + logger.debug("Start testFTPConnectNegative"); + + FTPClient ftp = connectClient(); + + try + { + int reply = ftp.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + boolean login = ftp.login(USER_ADMIN, "garbage"); + assertFalse("admin login successful", login); + + // now attempt to list the files and check that the command does not + // succeed + FTPFile[] files = ftp.listFiles(); + + assertNotNull(files); + assertTrue(files.length == 0); + reply = ftp.getReplyCode(); + + assertTrue(FTPReply.isNegativePermanent(reply)); + + } + finally + { + ftp.disconnect(); + } + } + + /** + * Test CWD for FTP server + * + * @throws Exception + */ + public void testCWD() throws Exception + { + logger.debug("Start testCWD"); + + FTPClient ftp = connectClient(); + + try + { + int reply = ftp.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + boolean login = ftp.login(USER_ADMIN, PASSWORD_ADMIN); + assertTrue("admin login successful", login); + + FTPFile[] files = ftp.listFiles(); + reply = ftp.getReplyCode(); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // expect /Alfresco directory + // /AVM directory + assertTrue(files.length == 2); + + boolean foundAVM=false; + boolean foundAlfresco=false; + for(FTPFile file : files) + { + logger.debug("file name=" + file.getName()); + assertTrue(file.isDirectory()); + + if(file.getName().equalsIgnoreCase("AVM")) + { + foundAVM=true; + } + if(file.getName().equalsIgnoreCase("Alfresco")) + { + foundAlfresco=true; + } + } + assertTrue(foundAVM); + assertTrue(foundAlfresco); + + // Change to Alfresco Dir that we know exists + reply = ftp.cwd("/Alfresco"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // relative path with space char + reply = ftp.cwd("Data Dictionary"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // non existant absolute + reply = ftp.cwd("/Garbage"); + assertTrue(FTPReply.isNegativePermanent(reply)); + + reply = ftp.cwd("/Alfresco/User Homes"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // Wild card + reply = ftp.cwd("/Alfresco/User*Homes"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // two level folder + reply = ftp.cwd("/Alfresco/Data Dictionary"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // go up one + reply = ftp.cwd(".."); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + reply = ftp.pwd(); + ftp.getStatus(); + + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // check we are at the correct point in the tree + reply = ftp.cwd("Data Dictionary"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + + } + finally + { + ftp.disconnect(); + } + + } + + /** + * Test CRUD for FTP server + * + * @throws Exception + */ + public void testCRUD() throws Exception + { + final String PATH1 = "FTPServerTest"; + final String PATH2 = "Second part"; + + logger.debug("Start testFTPCRUD"); + + FTPClient ftp = connectClient(); + + try + { + int reply = ftp.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + boolean login = ftp.login(USER_ADMIN, PASSWORD_ADMIN); + assertTrue("admin login successful", login); + + reply = ftp.cwd("/Alfresco/User Homes"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // Delete the root directory in case it was left over from a previous test run + try + { + ftp.removeDirectory(PATH1); + } + catch (IOException e) + { + // ignore this error + } + + // make root directory + ftp.makeDirectory(PATH1); + ftp.cwd(PATH1); + + // make sub-directory in new directory + ftp.makeDirectory(PATH2); + ftp.cwd(PATH2); + + // List the files in the new directory + FTPFile[] files = ftp.listFiles(); + assertTrue("files not empty", files.length == 0); + + // Create a file + String FILE1_CONTENT_1="test file 1 content"; + String FILE1_NAME = "testFile1.txt"; + ftp.appendFile(FILE1_NAME , new ByteArrayInputStream(FILE1_CONTENT_1.getBytes("UTF-8"))); + + // Get the new file + FTPFile[] files2 = ftp.listFiles(); + assertTrue("files not one", files2.length == 1); + + InputStream is = ftp.retrieveFileStream(FILE1_NAME); + + String content = inputStreamToString(is); + assertEquals("Content is not as expected", content, FILE1_CONTENT_1); + ftp.completePendingCommand(); + + // Update the file contents + String FILE1_CONTENT_2="That's how it is says Pooh!"; + ftp.appendFile(FILE1_NAME , new ByteArrayInputStream(FILE1_CONTENT_2.getBytes("UTF-8"))); + + InputStream is2 = ftp.retrieveFileStream(FILE1_NAME); + + String content2 = inputStreamToString(is2); + assertEquals("Content is not as expected", content2, FILE1_CONTENT_2); + ftp.completePendingCommand(); + + // now delete the file we have been using. + assertTrue (ftp.deleteFile(FILE1_NAME)); + + // negative test - file should have gone now. + assertFalse (ftp.deleteFile(FILE1_NAME)); + + } + finally + { + // clean up tree if left over from previous run + + ftp.disconnect(); + } + } + + /** + * Test of obscure path names in the FTP server + * + * RFC959 states that paths are constructed thus... + * ::= | + * ::= + * ::= any of the 128 ASCII characters except and + * + * So we need to check how high characters and problematic are encoded + */ + public void testPathNames() throws Exception + { + + logger.debug("Start testPathNames"); + + FTPClient ftp = connectClient(); + + String PATH1="testPathNames"; + + try + { + int reply = ftp.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + boolean login = ftp.login(USER_ADMIN, PASSWORD_ADMIN); + assertTrue("admin login successful", login); + + reply = ftp.cwd("/Alfresco/User*Homes"); + assertTrue(FTPReply.isPositiveCompletion(reply)); + + // Delete the root directory in case it was left over from a previous test run + try + { + ftp.removeDirectory(PATH1); + } + catch (IOException e) + { + // ignore this error + } + + // make root directory for this test + boolean success = ftp.makeDirectory(PATH1); + assertTrue("unable to make directory:" + PATH1, success); + + success = ftp.changeWorkingDirectory(PATH1); + assertTrue("unable to change to working directory:" + PATH1, success); + + assertTrue("with a space", ftp.makeDirectory("test space")); + assertTrue("with exclamation", ftp.makeDirectory("space!")); + assertTrue("with dollar", ftp.makeDirectory("space$")); + assertTrue("with brackets", ftp.makeDirectory("space()")); + assertTrue("with hash curley brackets", ftp.makeDirectory("space{}")); + + + //Pound sign U+00A3 + //Yen Sign U+00A5 + //Capital Omega U+03A9 + + assertTrue("with pound sign", ftp.makeDirectory("pound \u00A3.world")); + assertTrue("with yen sign", ftp.makeDirectory("yen \u00A5.world")); + + // Test steps that do not work + // assertTrue("with omega", ftp.makeDirectory("omega \u03A9.world")); + // assertTrue("with obscure ASCII chars", ftp.makeDirectory("?/.,<>")); + } + finally + { + // clean up tree if left over from previous run + + ftp.disconnect(); + } + + + } + + /** + * Create a user other than "admin" who has access to a set of files. + * + * Create a folder containing test.docx as user one + * Update that file as user two. + * Check user one can see user two's changes. + * + * @throws Exception + */ + public void testTwoUserUpdate() throws Exception + { + logger.debug("Start testFTPConnect"); + + final String TEST_DIR="/Alfresco/User Homes/" + USER_ONE; + + final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper(); + + FTPClient ftpOne = connectClient(); + FTPClient ftpTwo = connectClient(); + try + { + int reply = ftpOne.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + reply = ftpTwo.getReplyCode(); + + if (!FTPReply.isPositiveCompletion(reply)) + { + fail("FTP server refused connection."); + } + + boolean login = ftpOne.login(USER_ONE, PASSWORD_ONE); + assertTrue("user one login not successful", login); + + login = ftpTwo.login(USER_TWO, PASSWORD_TWO); + assertTrue("user two login not successful", login); + + boolean success = ftpOne.changeWorkingDirectory("Alfresco"); + assertTrue("user one unable to cd to Alfreco", success); + success = ftpOne.changeWorkingDirectory("User*Homes"); + assertTrue("user one unable to cd to User*Homes", success); + success = ftpOne.changeWorkingDirectory(USER_ONE); + assertTrue("user one unable to cd to " + USER_ONE, success); + + success = ftpTwo.changeWorkingDirectory("Alfresco"); + assertTrue("user two unable to cd to Alfreco", success); + success = ftpTwo.changeWorkingDirectory("User*Homes"); + assertTrue("user two unable to cd to User*Homes", success); + success = ftpTwo.changeWorkingDirectory(USER_ONE); + assertTrue("user two unable to cd " + USER_ONE, success); + + // Create a file as user one + String FILE1_CONTENT_1="test file 1 content"; + String FILE1_NAME = "test.docx"; + success = ftpOne.appendFile(FILE1_NAME , new ByteArrayInputStream(FILE1_CONTENT_1.getBytes("UTF-8"))); + assertTrue("user one unable to append file", success); + + // Update the file as user two + String FILE1_CONTENT_2="test file content updated"; + success = ftpTwo.appendFile(FILE1_NAME , new ByteArrayInputStream(FILE1_CONTENT_2.getBytes("UTF-8"))); + assertTrue("user two unable to append file", success); + + // User one should read user2's content + InputStream is1 = ftpOne.retrieveFileStream(FILE1_NAME); + assertNotNull("is1 is null", is1); + String content1 = inputStreamToString(is1); + assertEquals("Content is not as expected", FILE1_CONTENT_2, content1); + ftpOne.completePendingCommand(); + + // User two should read user2's content + InputStream is2 = ftpTwo.retrieveFileStream(FILE1_NAME); + assertNotNull("is2 is null", is2); + String content2 = inputStreamToString(is2); + assertEquals("Content is not as expected", FILE1_CONTENT_2, content2); + ftpTwo.completePendingCommand(); + logger.debug("Test finished"); + + } + finally + { + ftpOne.dele(TEST_DIR); + if(ftpOne != null) + { + ftpOne.disconnect(); + } + if(ftpTwo != null) + { + ftpTwo.disconnect(); + } + } + + } + + /** + * Create a user with a small quota. + * + * Upload a file less than the quota. + * + * Upload a file greater than the quota. + * + * @throws Exception + */ + public void DISABLED_testQuota() throws Exception + { + fail("not yet implemented"); + } + + private FTPClient connectClient() throws IOException + { + FTPClient ftp = new FTPClient(); + + if(logger.isDebugEnabled()) + { + ftp.addProtocolCommandListener(new PrintCommandListener( + new PrintWriter(System.out))); + } + + String server = HOSTNAME; + + ftp.connect(server); + return ftp; + } + + /** + * Test quality utility to read an input stream into a string. + * @param is + * @return the content of the stream in a string. + * @throws IOException + */ + private String inputStreamToString(InputStream is) throws IOException + { + if (is != null) + { + StringWriter writer = new StringWriter(); + + char[] buffer = new char[1024]; + try + { + Reader reader = new BufferedReader(new InputStreamReader(is, "UTF-8")); + int n; + while ((n = reader.read(buffer)) != -1) + { + writer.write(buffer, 0, n); + } + } + finally + { + is.close(); + } + is.close(); + + return writer.getBuffer().toString(); + + } + return ""; + } + + private void createUser(String userName, String password) + { + if (this.authenticationService.authenticationExists(userName) == false) + { + this.authenticationService.createAuthentication(userName, password.toCharArray()); + + PropertyMap ppOne = new PropertyMap(4); + ppOne.put(ContentModel.PROP_USERNAME, userName); + ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName"); + ppOne.put(ContentModel.PROP_LASTNAME, "lastName"); + ppOne.put(ContentModel.PROP_EMAIL, "email@email.com"); + ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle"); + + this.personService.createPerson(ppOne); + } + } + + +} diff --git a/source/java/org/alfresco/filesys/alfresco/package-info.java b/source/java/org/alfresco/filesys/alfresco/package-info.java new file mode 100644 index 0000000000..c5cbfe5da6 --- /dev/null +++ b/source/java/org/alfresco/filesys/alfresco/package-info.java @@ -0,0 +1,12 @@ +/** + * FileSystem + * + * DesktopAction + * + * AlfrescoDiskDriver + * + * MultiTenantShareMapper + * + * + */ +package org.alfresco.filesys.alfresco; diff --git a/source/java/org/alfresco/filesys/auth/cifs/package-info.java b/source/java/org/alfresco/filesys/auth/cifs/package-info.java new file mode 100644 index 0000000000..b5e6184554 --- /dev/null +++ b/source/java/org/alfresco/filesys/auth/cifs/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.auth.cifs; diff --git a/source/java/org/alfresco/filesys/auth/ftp/package-info.java b/source/java/org/alfresco/filesys/auth/ftp/package-info.java new file mode 100644 index 0000000000..18c8783155 --- /dev/null +++ b/source/java/org/alfresco/filesys/auth/ftp/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.auth.ftp; diff --git a/source/java/org/alfresco/filesys/auth/nfs/package-info.java b/source/java/org/alfresco/filesys/auth/nfs/package-info.java new file mode 100644 index 0000000000..c780e407be --- /dev/null +++ b/source/java/org/alfresco/filesys/auth/nfs/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.auth.nfs; diff --git a/source/java/org/alfresco/filesys/auth/package-info.java b/source/java/org/alfresco/filesys/auth/package-info.java new file mode 100644 index 0000000000..03430ab354 --- /dev/null +++ b/source/java/org/alfresco/filesys/auth/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.auth; diff --git a/source/java/org/alfresco/filesys/avm/package-info.java b/source/java/org/alfresco/filesys/avm/package-info.java new file mode 100644 index 0000000000..b017b96a61 --- /dev/null +++ b/source/java/org/alfresco/filesys/avm/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.avm; diff --git a/source/java/org/alfresco/filesys/config/acl/package-info.java b/source/java/org/alfresco/filesys/config/acl/package-info.java new file mode 100644 index 0000000000..2916500028 --- /dev/null +++ b/source/java/org/alfresco/filesys/config/acl/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.config.acl; diff --git a/source/java/org/alfresco/filesys/config/package-info.java b/source/java/org/alfresco/filesys/config/package-info.java new file mode 100644 index 0000000000..d30d447fc6 --- /dev/null +++ b/source/java/org/alfresco/filesys/config/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.config; diff --git a/source/java/org/alfresco/filesys/debug/package-info.java b/source/java/org/alfresco/filesys/debug/package-info.java new file mode 100644 index 0000000000..2e324d733f --- /dev/null +++ b/source/java/org/alfresco/filesys/debug/package-info.java @@ -0,0 +1,3 @@ +/** + */ +package org.alfresco.filesys.debug; diff --git a/source/java/org/alfresco/filesys/package-info.java b/source/java/org/alfresco/filesys/package-info.java new file mode 100644 index 0000000000..81b02384fe --- /dev/null +++ b/source/java/org/alfresco/filesys/package-info.java @@ -0,0 +1,4 @@ +/** + * The Alfresco file system interface implementation + */ +package org.alfresco.filesys; diff --git a/source/java/org/alfresco/filesys/repo/CifsHelper.java b/source/java/org/alfresco/filesys/repo/CifsHelper.java index d6b1612083..2076535b4f 100644 --- a/source/java/org/alfresco/filesys/repo/CifsHelper.java +++ b/source/java/org/alfresco/filesys/repo/CifsHelper.java @@ -627,7 +627,7 @@ public class CifsHelper ContentData newContentData = fileToMoveInfo.getContentData(); // Reset the mime type - + // TODO Pass the content along when guessing the mime type, so we're more accurate String mimetype = mimetypeService.guessMimetype(newName); newContentData = ContentData.setMimetype(newContentData, mimetype); diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java index 45dddff6b8..321d9ae3bb 100644 --- a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java +++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java @@ -408,10 +408,9 @@ public class ContentDiskDriverTest extends TestCase final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper(); - /** * Step 1 : Create a new file in read/write mode and add some content. - */ + */ int openAction = FileAction.CreateNotExist; String FILE_PATH="\\testDeleteFile.new"; @@ -635,12 +634,23 @@ public class ContentDiskDriverTest extends TestCase TreeConnection testConnection = testServer.getTreeConnection(share); final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper(); - final String FILE_NAME="testOpenFileY.whatever"; + class TestContext + { + NodeRef testDirNodeRef; + }; + + final TestContext testContext = new TestContext(); + + final String FILE_NAME="testOpenFile.txt"; + FileOpenParams dirParams = new FileOpenParams(TEST_ROOT_DOS_PATH, 0, AccessMode.ReadOnly, FileAttribute.NTDirectory, 0); + driver.createDirectory(testSession, testConnection, dirParams); + + testContext.testDirNodeRef = driver.getNodeForPath(testConnection, TEST_ROOT_DOS_PATH); /** * Step 1 : Negative test - try to open a file that does not exist - */ - String FILE_PATH="\\" + FILE_NAME; + */ + final String FILE_PATH= TEST_ROOT_DOS_PATH + "\\" + FILE_NAME; FileOpenParams params = new FileOpenParams(FILE_PATH, FileAction.CreateNotExist, AccessMode.ReadWrite, FileAttribute.NTNormal, 0); try @@ -656,13 +666,13 @@ public class ContentDiskDriverTest extends TestCase /** * Step 2: Now create the file through the node service and open it. */ + logger.debug("Step 2) Open file created by node service"); RetryingTransactionCallback createFileCB = new RetryingTransactionCallback() { @Override public Void execute() throws Throwable { - NodeRef companyHome = repositoryHelper.getCompanyHome(); - ChildAssociationRef ref = nodeService.createNode(companyHome, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, FILE_NAME), ContentModel.TYPE_CONTENT); + ChildAssociationRef ref = nodeService.createNode(testContext.testDirNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, FILE_NAME), ContentModel.TYPE_CONTENT); nodeService.setProperty(ref.getChildRef(), ContentModel.PROP_NAME, FILE_NAME); return null; } @@ -672,14 +682,21 @@ public class ContentDiskDriverTest extends TestCase NetworkFile file = driver.openFile(testSession, testConnection, params); assertNotNull(file); - driver.deleteFile(testSession, testConnection, FILE_PATH); + //driver.deleteFile(testSession, testConnection, FILE_PATH); + // BODGE - there's a dangling transaction that needs getting rid of + // Work around for ALF-7674 + UserTransaction txn = transactionService.getUserTransaction(); + assertNotNull("transaction leaked", txn); + txn.getStatus(); + txn.rollback(); + } // testOpenFile /** * Unit test of file exists */ - public void testFileExists() throws Exception + public void DISABLED_testFileExists() throws Exception { logger.debug("testFileExists"); ServerConfiguration scfg = new ServerConfiguration("testServer"); @@ -689,21 +706,37 @@ public class ContentDiskDriverTest extends TestCase TreeConnection testConnection = testServer.getTreeConnection(share); final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper(); - String FILE_PATH="\\testFileExists.new"; + final String FILE_PATH= TEST_ROOT_DOS_PATH + "\\testFileExists.new"; + + class TestContext + { + }; + + final TestContext testContext = new TestContext(); + + /** + * Step 1 : Call FileExists for a directory which does not exist + */ + logger.debug("Step 1, negative test dir does not exist"); + int status = driver.fileExists(testSession, testConnection, TEST_ROOT_DOS_PATH); + assertEquals(status, 0); /** - * Step 1 : Call FileExists for a file which does not exist + * Step 2 : Call FileExists for a file which does not exist */ - int status = driver.fileExists(testSession, testConnection, FILE_PATH); + logger.debug("Step 2, negative test file does not exist"); + status = driver.fileExists(testSession, testConnection, FILE_PATH); assertEquals(status, 0); /** - * Step 2: Create a new file in read/write mode and add some content. + * Step 3: Create a new file in read/write mode and add some content. */ int openAction = FileAction.CreateNotExist; FileOpenParams params = new FileOpenParams(FILE_PATH, openAction, AccessMode.ReadWrite, FileAttribute.NTNormal, 0); - + FileOpenParams dirParams = new FileOpenParams(TEST_ROOT_DOS_PATH, 0, AccessMode.ReadOnly, FileAttribute.NTDirectory, 0); + + driver.createDirectory(testSession, testConnection, dirParams); final NetworkFile file = driver.createFile(testSession, testConnection, params); assertNotNull("file is null", file); assertFalse("file is read only, should be read-write", file.isReadOnly()); @@ -726,8 +759,9 @@ public class ContentDiskDriverTest extends TestCase assertEquals(status, 1); /** - * Step 3 : Delete the node - check status goes back to 0 + * Step 4 : Delete the node - check status goes back to 0 */ + logger.debug("Step 4, successfully delete node"); driver.deleteFile(testSession, testConnection, FILE_PATH); status = driver.fileExists(testSession, testConnection, FILE_PATH); @@ -2708,6 +2742,186 @@ public class ContentDiskDriverTest extends TestCase } } + /** + * Simulates a SaveAs from Word2003 + * 1. Create new document SAVEAS.DOC, file did not exist + * 2. Create -WRDnnnn.TMP file, where 'nnnn' is a 4 digit sequence to make the name unique + * 3. Rename SAVEAS.DOC to Backup of SAVEAS.wbk + * 4. Rename -WRDnnnn.TMP to SAVEAS.DOC + */ + public void testScenarioMSWord2003SaveAsShuffle() throws Exception + { + logger.debug("testScenarioMSWord2003SaveShuffle"); + final String FILE_NAME = "SAVEAS.DOC"; + final String FILE_OLD_TEMP = "SAVEAS.wbk"; + final String FILE_NEW_TEMP = "~WRD0002.TMP"; + + class TestContext + { + NetworkFile firstFileHandle; + }; + + final TestContext testContext = new TestContext(); + + final String TEST_DIR = TEST_ROOT_DOS_PATH + "\\testScenarioMSWord2003SaveAsShuffle"; + + ServerConfiguration scfg = new ServerConfiguration("testServer"); + TestServer testServer = new TestServer("testServer", scfg); + final SrvSession testSession = new TestSrvSession(666, testServer, "test", "remoteName"); + DiskSharedDevice share = getDiskSharedDevice(); + final TreeConnection testConnection = testServer.getTreeConnection(share); + final RetryingTransactionHelper tran = transactionService.getRetryingTransactionHelper(); + + /** + * Clean up just in case garbage is left from a previous run + */ + RetryingTransactionCallback deleteGarbageFileCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + driver.deleteFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME); + return null; + } + }; + + /** + * Create a file in the test directory + */ + + try + { + tran.doInTransaction(deleteGarbageFileCB); + } + catch (Exception e) + { + // expect to go here + } + + logger.debug("a) create new file"); + RetryingTransactionCallback createFileCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + + /** + * Create the test directory we are going to use + */ + FileOpenParams createRootDirParams = new FileOpenParams(TEST_ROOT_DOS_PATH, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0); + FileOpenParams createDirParams = new FileOpenParams(TEST_DIR, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0); + driver.createDirectory(testSession, testConnection, createRootDirParams); + driver.createDirectory(testSession, testConnection, createDirParams); + + /** + * Create the file we are going to use + */ + FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NAME, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0); + testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams); + assertNotNull(testContext.firstFileHandle); + + return null; + } + }; + tran.doInTransaction(createFileCB, false, true); + + /** + * b) Save the new file + * Write ContentDiskDriverTest3.doc to the test file, + */ + logger.debug("b) move new file into place"); + RetryingTransactionCallback writeFileCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + FileOpenParams createFileParams = new FileOpenParams(TEST_DIR + "\\" + FILE_NEW_TEMP, 0, AccessMode.ReadWrite, FileAttribute.NTNormal, 0); + testContext.firstFileHandle = driver.createFile(testSession, testConnection, createFileParams); + + ClassPathResource fileResource = new ClassPathResource("filesys/ContentDiskDriverTest3.doc"); + assertNotNull("unable to find test resource filesys/ContentDiskDriverTest3.doc", fileResource); + + byte[] buffer= new byte[1000]; + InputStream is = fileResource.getInputStream(); + try + { + long offset = 0; + int i = is.read(buffer, 0, buffer.length); + while(i > 0) + { + testContext.firstFileHandle.writeFile(buffer, i, 0, offset); + offset += i; + i = is.read(buffer, 0, buffer.length); + } + } + finally + { + is.close(); + } + + testContext.firstFileHandle.close(); + + return null; + } + }; + tran.doInTransaction(writeFileCB, false, true); + + /** + * c) rename the old file + */ + logger.debug("c) rename old file"); + RetryingTransactionCallback renameOldFileCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + driver.renameFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NAME, TEST_DIR + "\\" + FILE_OLD_TEMP); + return null; + } + }; + tran.doInTransaction(renameOldFileCB, false, true); + + /** + * d) Move the new file into place, stuff should get shuffled + */ + logger.debug("d) move new file into place"); + RetryingTransactionCallback moveNewFileCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + driver.renameFile(testSession, testConnection, TEST_DIR + "\\" + FILE_NEW_TEMP, TEST_DIR + "\\" + FILE_NAME); + return null; + } + }; + + tran.doInTransaction(moveNewFileCB, false, true); + + logger.debug("e) validate results"); + /** + * Now validate everything is correct + */ + RetryingTransactionCallback validateCB = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + NodeRef shuffledNodeRef = driver.getNodeForPath(testConnection, TEST_DIR + "\\" + FILE_NAME); + + Map props = nodeService.getProperties(shuffledNodeRef); + + ContentData data = (ContentData)props.get(ContentModel.PROP_CONTENT); + assertEquals("size is wrong", 26112, data.getSize()); + assertEquals("mimeType is wrong", "application/msword",data.getMimetype()); + + return null; + } + }; + + tran.doInTransaction(validateCB, true, true); + + } + /** * Test server */ diff --git a/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java b/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java index 8ca61be71c..f23157aa75 100644 --- a/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java +++ b/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java @@ -18,17 +18,12 @@ */ package org.alfresco.filesys.repo; -import java.io.BufferedInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.nio.ByteBuffer; -import java.nio.channels.Channels; import java.nio.channels.FileChannel; -import java.nio.charset.Charset; import org.alfresco.error.AlfrescoRuntimeException; -import org.springframework.extensions.surf.util.I18NUtil; import org.alfresco.jlan.server.SrvSession; import org.alfresco.jlan.server.filesys.AccessDeniedException; import org.alfresco.jlan.server.filesys.DiskFullException; @@ -41,7 +36,6 @@ import org.alfresco.jlan.smb.server.SMBSrvSession; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.AbstractContentReader; import org.alfresco.repo.content.MimetypeMap; -import org.alfresco.repo.content.encoding.ContentCharsetFinder; import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; @@ -59,6 +53,7 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.usage.ContentQuotaException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.surf.util.I18NUtil; /** * Implementation of the NetworkFile for direct interaction @@ -419,25 +414,22 @@ public class ContentNetworkFile extends NodeRefNetworkFile if (modified) { NodeRef contentNodeRef = getNodeRef(); + ContentWriter writer = (ContentWriter)content; + // We may be in a retry block, in which case this section will already have executed and channel will be null if (channel != null) { - // Take a guess at the mimetype (if it has not been set by something already) + // Do we need the mimetype guessing for us when we're done? if (content.getMimetype() == null || content.getMimetype().equals(MimetypeMap.MIMETYPE_BINARY) ) { String filename = (String) nodeService.getProperty(contentNodeRef, ContentModel.PROP_NAME); - String mimetype = mimetypeService.guessMimetype(filename); - content.setMimetype(mimetype); + writer.guessMimetype(filename); } - // Take a guess at the locale - channel.position(0); - InputStream is = new BufferedInputStream(Channels.newInputStream(channel)); - ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder(); - Charset charset = charsetFinder.getCharset(is, content.getMimetype()); - content.setEncoding(charset.name()); - + + // We always want the encoding guessing + writer.guessEncoding(); + // Close the channel - channel.close(); channel = null; } @@ -449,7 +441,7 @@ public class ContentNetworkFile extends NodeRefNetworkFile // Update node properties, but only if the binary has changed (ETHREEOH-1861) - ContentReader postUpdateContentReader = ((ContentWriter) content).getReader(); + ContentReader postUpdateContentReader = writer.getReader(); RunAsWork getReader = new RunAsWork() { diff --git a/source/java/org/alfresco/filesys/repo/desk/package-info.java b/source/java/org/alfresco/filesys/repo/desk/package-info.java new file mode 100644 index 0000000000..75a92da495 --- /dev/null +++ b/source/java/org/alfresco/filesys/repo/desk/package-info.java @@ -0,0 +1,4 @@ +/** + * Implementation of desk top actions for file system protocols. + */ +package org.alfresco.filesys.repo.desk; diff --git a/source/java/org/alfresco/filesys/util/package-info.java b/source/java/org/alfresco/filesys/util/package-info.java new file mode 100644 index 0000000000..cb3402f40b --- /dev/null +++ b/source/java/org/alfresco/filesys/util/package-info.java @@ -0,0 +1,8 @@ +/** + * Filesystem utilities + * + * Contains : + * CifsMounter to mount and unmount a CIFS filesystem. + * + */ +package org.alfresco.filesys.util; diff --git a/source/java/org/alfresco/repo/action/ActionServiceImpl.java b/source/java/org/alfresco/repo/action/ActionServiceImpl.java index 682d214331..f81252097e 100644 --- a/source/java/org/alfresco/repo/action/ActionServiceImpl.java +++ b/source/java/org/alfresco/repo/action/ActionServiceImpl.java @@ -1718,7 +1718,7 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A */ public CopyBehaviourCallback getCopyCallback(QName classRef, CopyDetails copyDetails) { - return AdctionParameterTypeCopyBehaviourCallback.INSTANCE; + return ActionParameterTypeCopyBehaviourCallback.INSTANCE; } /** @@ -1728,9 +1728,9 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A * @author Derek Hulley * @since 3.2 */ - private static class AdctionParameterTypeCopyBehaviourCallback extends DefaultCopyBehaviourCallback + private static class ActionParameterTypeCopyBehaviourCallback extends DefaultCopyBehaviourCallback { - private static final AdctionParameterTypeCopyBehaviourCallback INSTANCE = new AdctionParameterTypeCopyBehaviourCallback(); + private static final ActionParameterTypeCopyBehaviourCallback INSTANCE = new ActionParameterTypeCopyBehaviourCallback(); @Override public Map getCopyProperties(QName classQName, CopyDetails copyDetails, @@ -1750,7 +1750,7 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A public void onCopyComplete(QName classRef, NodeRef sourceNodeRef, NodeRef targetNodeRef, boolean copyToNewNode, Map copyMap) { - AdctionParameterTypeCopyBehaviourCallback.INSTANCE.repointNodeRefs(sourceNodeRef, targetNodeRef, + ActionParameterTypeCopyBehaviourCallback.INSTANCE.repointNodeRefs(sourceNodeRef, targetNodeRef, ActionModel.PROP_PARAMETER_VALUE, copyMap, nodeService); } } diff --git a/source/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java b/source/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java index 24aa910af5..be6be7b847 100644 --- a/source/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java @@ -49,7 +49,6 @@ import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentWriter; -import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.view.ImporterService; @@ -90,11 +89,6 @@ public class ImporterActionExecuter extends ActionExecuterAbstractBase */ private ContentService contentService; - /** - * The mimetype service - */ - private MimetypeService mimetypeService; - /** * The file folder service */ @@ -130,16 +124,6 @@ public class ImporterActionExecuter extends ActionExecuterAbstractBase this.contentService = contentService; } - /** - * Sets the MimetypeService to use - * - * @param mimetypeService The MimetypeService - */ - public void setMimetypeService(MimetypeService mimetypeService) - { - this.mimetypeService = mimetypeService; - } - /** * Sets the FileFolderService to use * @@ -263,7 +247,7 @@ public class ImporterActionExecuter extends ActionExecuterAbstractBase // push the content of the file into the node InputStream contentStream = new BufferedInputStream(new FileInputStream(file), BUFFER_SIZE); ContentWriter writer = this.contentService.getWriter(fileRef, ContentModel.PROP_CONTENT, true); - writer.setMimetype(this.mimetypeService.guessMimetype(fileName)); + writer.guessMimetype(fileName); writer.putContent(contentStream); } else diff --git a/source/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java b/source/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java index 50d013943d..1d519f8c0c 100644 --- a/source/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java +++ b/source/java/org/alfresco/repo/action/executer/TransformActionExecuterTest.java @@ -97,15 +97,16 @@ class DummyMimetypeService implements MimetypeService { private final String result; public DummyMimetypeService(String result) { this.result = result; } - public ContentCharsetFinder getContentCharsetFinder() { return null; } - public Map getDisplaysByExtension() { return null; } - public Map getDisplaysByMimetype() { return null; } - public String getExtension(String mimetype) { return result; } - public Map getExtensionsByMimetype() { return null; } - public String getMimetype(String extension) { return null; } - public List getMimetypes() { return null; } - public Map getMimetypesByExtension() { return null; } - public String guessMimetype(String filename) { return null; } - public boolean isText(String mimetype) { return false;} - public String getMimetypeIfNotMatches(ContentReader reader) { return null; } + public ContentCharsetFinder getContentCharsetFinder() { return null; } + public Map getDisplaysByExtension() { return null; } + public Map getDisplaysByMimetype() { return null; } + public String getExtension(String mimetype) { return result;} + public Map getExtensionsByMimetype() { return null; } + public String getMimetype(String extension) { return null; } + public List getMimetypes() { return null; } + public Map getMimetypesByExtension() { return null; } + public String guessMimetype(String filename) { return null; } + public String guessMimetype(String filename,ContentReader reader){ return null; } + public boolean isText(String mimetype) { return false; } + public String getMimetypeIfNotMatches(ContentReader reader) { return null; } } \ No newline at end of file diff --git a/source/java/org/alfresco/repo/content/AbstractContentWriter.java b/source/java/org/alfresco/repo/content/AbstractContentWriter.java index 183dcc1733..d1de7af0d6 100644 --- a/source/java/org/alfresco/repo/content/AbstractContentWriter.java +++ b/source/java/org/alfresco/repo/content/AbstractContentWriter.java @@ -29,16 +29,19 @@ import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.repo.content.encoding.ContentCharsetFinder; import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.service.cmr.repository.ContentAccessor; import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentStreamListener; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,6 +65,8 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl private List listeners; private WritableByteChannel channel; private ContentReader existingContentReader; + private MimetypeService mimetypeService; + private DoGuessingOnCloseListener guessingOnCloseListener; /** * @param contentUrl the content URL @@ -73,6 +78,21 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl this.existingContentReader = existingContentReader; listeners = new ArrayList(2); + + // We always register our own listener as the first one + // This allows us to perform any guessing (if needed) before + // the normal listeners kick in and eg write things to the DB + guessingOnCloseListener = new DoGuessingOnCloseListener(); + listeners.add(guessingOnCloseListener); + } + + /** + * Supplies the Mimetype Service to be used when guessing + * encoding and mimetype information. + */ + public void setMimetypeService(MimetypeService mimetypeService) + { + this.mimetypeService = mimetypeService; } /** @@ -454,7 +474,19 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl { // attempt to use the correct encoding String encoding = getEncoding(); - byte[] bytes = (encoding == null) ? content.getBytes() : content.getBytes(encoding); + byte[] bytes; + if(encoding == null) + { + // Use the system default, and record what that was + bytes = content.getBytes(); + setEncoding( System.getProperty("file.encoding") ); + } + else + { + // Use the encoding that they specified + bytes = content.getBytes(encoding); + } + // get the stream OutputStream os = getContentOutputStream(); ByteArrayInputStream is = new ByteArrayInputStream(bytes); @@ -469,4 +501,108 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl e); } } + + /** + * When the content has been written, attempt to guess + * the encoding of it. + * + * @see ContentWriter#guessEncoding() + */ + public void guessEncoding() + { + if (mimetypeService == null) + { + logger.warn("MimetypeService not supplied, but required for content guessing"); + return; + } + + if(isClosed()) + { + // Content written, can do it now + doGuessEncoding(); + } + else + { + // Content not yet written, wait for the + // data to be written before doing so + guessingOnCloseListener.guessEncoding = true; + } + } + private void doGuessEncoding() + { + ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder(); + + ContentReader reader = getReader(); + InputStream is = reader.getContentInputStream(); + Charset charset = charsetFinder.getCharset(is, getMimetype()); + try + { + is.close(); + } + catch(IOException e) + {} + + setEncoding(charset.name()); + } + + /** + * When the content has been written, attempt to guess + * the mimetype of it, using the filename and contents. + * + * @see ContentWriter#guessMimetype(String) + */ + public void guessMimetype(String filename) + { + if (mimetypeService == null) + { + logger.warn("MimetypeService not supplied, but required for content guessing"); + return; + } + + + if(isClosed()) + { + // Content written, can do it now + doGuessMimetype(filename); + } + else + { + // Content not yet written, wait for the + // data to be written before doing so + guessingOnCloseListener.guessMimetype = true; + guessingOnCloseListener.filename = filename; + } + } + private void doGuessMimetype(String filename) + { + String mimetype = mimetypeService.guessMimetype( + filename, getReader() + ); + setMimetype(mimetype); + } + + /** + * Our own listener that is always the first on the list, + * which lets us perform guessing operations when the + * content has been written. + */ + private class DoGuessingOnCloseListener implements ContentStreamListener + { + private boolean guessEncoding = false; + private boolean guessMimetype = false; + private String filename = null; + + @Override + public void contentStreamClosed() throws ContentIOException + { + if(guessMimetype) + { + doGuessMimetype(filename); + } + if(guessEncoding) + { + doGuessEncoding(); + } + } + } } diff --git a/source/java/org/alfresco/repo/content/ContentServiceImpl.java b/source/java/org/alfresco/repo/content/ContentServiceImpl.java index 1937889e35..b17caba098 100644 --- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java +++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java @@ -50,6 +50,7 @@ import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.NoTransformerException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; @@ -85,6 +86,7 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa private DictionaryService dictionaryService; private NodeService nodeService; private AVMService avmService; + private MimetypeService mimetypeService; private RetryingTransactionHelper transactionHelper; private ApplicationContext applicationContext; @@ -127,6 +129,11 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa this.nodeService = nodeService; } + public void setMimetypeService(MimetypeService mimetypeService) + { + this.mimetypeService = mimetypeService; + } + public void setTransformerRegistry(ContentTransformerRegistry transformerRegistry) { this.transformerRegistry = transformerRegistry; @@ -492,6 +499,12 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa } + // supply the writer with a copy of the mimetype service if needed + if (writer instanceof AbstractContentWriter) + { + ((AbstractContentWriter)writer).setMimetypeService(mimetypeService); + } + // give back to the client return writer; } diff --git a/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java b/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java new file mode 100644 index 0000000000..d8e556b6d1 --- /dev/null +++ b/source/java/org/alfresco/repo/content/MimetypeMapContentTest.java @@ -0,0 +1,109 @@ +/* + * 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 . + */ +package org.alfresco.repo.content; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.net.URL; + +import junit.framework.TestCase; + +import org.alfresco.repo.content.filestore.FileContentReader; +import org.alfresco.service.cmr.repository.ContentReader; +import org.alfresco.service.cmr.repository.MimetypeService; +import org.alfresco.util.DataModelTestApplicationContextHelper; +import org.apache.poi.util.IOUtils; +import org.springframework.context.ApplicationContext; + +/** + * Content specific tests for MimeTypeMap + * + * @see org.alfresco.repo.content.MimetypeMap + * @see org.alfresco.repo.content.MimetypeMapTest + */ +public class MimetypeMapContentTest extends TestCase +{ + private static ApplicationContext ctx = DataModelTestApplicationContextHelper.getApplicationContext(); + + private MimetypeService mimetypeService; + + @Override + public void setUp() throws Exception + { + mimetypeService = (MimetypeService)ctx.getBean("mimetypeService"); + } + + public void testGuessMimetypeForFile() throws Exception + { + // Correct ones + assertEquals( + "application/msword", + mimetypeService.guessMimetype("something.doc", openQuickTestFile("quick.doc")) + ); + assertEquals( + "application/msword", + mimetypeService.guessMimetype("SOMETHING.DOC", openQuickTestFile("quick.doc")) + ); + + // Incorrect ones, Tika spots the mistake + assertEquals( + "application/msword", + mimetypeService.guessMimetype("something.pdf", openQuickTestFile("quick.doc")) + ); + assertEquals( + "application/pdf", + mimetypeService.guessMimetype("something.doc", openQuickTestFile("quick.pdf")) + ); + + // Ones where we use a different mimetype to the canonical one + assertEquals( + "image/bmp", // Officially image/x-ms-bmp + mimetypeService.guessMimetype("image.bmp", openQuickTestFile("quick.bmp")) + ); + + + // Where the file is corrupted + File tmp = File.createTempFile("alfresco", ".tmp"); + ContentReader reader = openQuickTestFile("quick.doc"); + InputStream inp = reader.getContentInputStream(); + byte[] trunc = new byte[512+256]; + IOUtils.readFully(inp, trunc); + inp.close(); + FileOutputStream out = new FileOutputStream(tmp); + out.write(trunc); + out.close(); + ContentReader truncReader = new FileContentReader(tmp); + + // Because the file is truncated, Tika won't be able to process the contents + // of the OLE2 structure + // So, it'll fall back to just OLE2, but it won't fail + assertEquals( + "application/x-tika-msoffice", + mimetypeService.guessMimetype("something.doc", truncReader) + ); + } + + private ContentReader openQuickTestFile(String filename) + { + URL url = getClass().getClassLoader().getResource("quick/" + filename); + File file = new File(url.getFile()); + return new FileContentReader(file); + } +} diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentReader.java b/source/java/org/alfresco/repo/content/filestore/FileContentReader.java index 8a49c57b45..c49dd394d1 100644 --- a/source/java/org/alfresco/repo/content/filestore/FileContentReader.java +++ b/source/java/org/alfresco/repo/content/filestore/FileContentReader.java @@ -45,6 +45,7 @@ import org.apache.commons.logging.LogFactory; * @author Derek Hulley */ public class FileContentReader extends AbstractContentReader + implements org.alfresco.service.cmr.repository.FileContentReader { /** * message key for missing content. Parameters are @@ -147,6 +148,9 @@ public class FileContentReader extends AbstractContentReader return file; } + /** + * @return Whether the file exists or not + */ public boolean exists() { return file.exists(); diff --git a/source/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java b/source/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java index 4f1f5a2d7f..8c8697520c 100644 --- a/source/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/ArchiveContentTransformer.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import org.alfresco.service.cmr.repository.TransformationOptions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.tika.config.TikaConfig; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AutoDetectParser; @@ -50,22 +51,11 @@ public class ArchiveContentTransformer extends TikaPoweredContentTransformer private static Log logger = LogFactory.getLog(ArchiveContentTransformer.class); private boolean includeContents = false; - public void setIncludeContents(String includeContents) - { - // Spring really ought to be able to handle - // setting a boolean that might still be - // ${foo} (i.e. not overridden in a property). - // As we can't do that with spring, we do it... - this.includeContents = false; - if(includeContents != null && includeContents.length() > 0) - { - this.includeContents = TransformationOptions.relaxedBooleanTypeConverter.convert(includeContents).booleanValue(); - } - } + private TikaConfig tikaConfig; /** * We support all the archive mimetypes that the Tika - * office parser can handle + * package parser can handle */ public static ArrayList SUPPORTED_MIMETYPES; static { @@ -81,6 +71,29 @@ public class ArchiveContentTransformer extends TikaPoweredContentTransformer super(SUPPORTED_MIMETYPES); } + /** + * Injects the TikaConfig to use + * + * @param tikaConfig The Tika Config to use + */ + public void setTikaConfig(TikaConfig tikaConfig) + { + this.tikaConfig = tikaConfig; + } + + public void setIncludeContents(String includeContents) + { + // Spring really ought to be able to handle + // setting a boolean that might still be + // ${foo} (i.e. not overridden in a property). + // As we can't do that with spring, we do it... + this.includeContents = false; + if(includeContents != null && includeContents.length() > 0) + { + this.includeContents = TransformationOptions.relaxedBooleanTypeConverter.convert(includeContents).booleanValue(); + } + } + @Override protected Parser getParser() { return new PackageParser(); @@ -96,9 +109,15 @@ public class ArchiveContentTransformer extends TikaPoweredContentTransformer { recurse = options.getIncludeEmbedded(); } + if(recurse) { - context.set(Parser.class, new AutoDetectParser()); + // Use an auto detect parser to handle the contents + if(tikaConfig == null) + { + tikaConfig = TikaConfig.getDefaultConfig(); + } + context.set(Parser.class, new AutoDetectParser(tikaConfig)); } return context; diff --git a/source/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java b/source/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java index 5a415cf587..04c8211db9 100644 --- a/source/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/TextMiningContentTransformer.java @@ -18,94 +18,27 @@ */ package org.alfresco.repo.content.transform; -import java.io.IOException; -import java.io.InputStream; - import org.alfresco.repo.content.MimetypeMap; -import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.service.cmr.repository.ContentWriter; -import org.alfresco.service.cmr.repository.TransformationOptions; -import org.apache.poi.POIOLE2TextExtractor; -import org.apache.poi.hwpf.OldWordFileFormatException; -import org.apache.poi.hwpf.extractor.Word6Extractor; -import org.apache.poi.hwpf.extractor.WordExtractor; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; +import org.apache.tika.parser.Parser; +import org.apache.tika.parser.microsoft.OfficeParser; /** * This badly named transformer turns Microsoft Word documents - * (Word 6, 95, 97, 2000, 2003) into plain text. - * - * Doesn't currently use {@link http://tika.apache.org/ Apache Tika} to - * do this, pending TIKA-408. When Apache POI 3.7 beta 2 has been - * released, we can switch to Tika and then handle Word 6, - * Word 95, Word 97, 2000, 2003, 2007 and 2010 formats. - * - * TODO Switch to Tika in November 2010 once 3.4 is out + * (Word 6, 95, 97, 2000, 2003) into plain text, using Apache Tika. * * @author Nick Burch */ -public class TextMiningContentTransformer extends AbstractContentTransformer2 +public class TextMiningContentTransformer extends TikaPoweredContentTransformer { public TextMiningContentTransformer() - { - } - - /** - * Currently the only transformation performed is that of text extraction from Word documents. - */ - public boolean isTransformable(String sourceMimetype, String targetMimetype, TransformationOptions options) - { - if (!MimetypeMap.MIMETYPE_WORD.equals(sourceMimetype) || - !MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(targetMimetype)) - { - // only support DOC -> Text - return false; - } - else - { - return true; - } + { + super(new String[] { + MimetypeMap.MIMETYPE_WORD + }); } - public void transformInternal(ContentReader reader, ContentWriter writer, TransformationOptions options) - throws Exception - { - POIOLE2TextExtractor extractor = null; - InputStream is = null; - String text = null; - try - { - is = reader.getContentInputStream(); - POIFSFileSystem fs = new POIFSFileSystem(is); - try { - extractor = new WordExtractor(fs); - } catch(OldWordFileFormatException e) { - extractor = new Word6Extractor(fs); - } - text = extractor.getText(); - } - catch (IOException e) - { - // check if this is an error caused by the fact that the .doc is in fact - // one of Word's temp non-documents - if (e.getMessage().contains("Unable to read entire header")) - { - // just assign an empty string - text = ""; - } - else - { - throw e; - } - } - finally - { - if (is != null) - { - is.close(); - } - } - // dump the text out. This will close the writer automatically. - writer.putContent(text); + @Override + protected Parser getParser() { + return new OfficeParser(); } } diff --git a/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java b/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java index 20e81f4921..492381c98b 100644 --- a/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java +++ b/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformer.java @@ -20,6 +20,7 @@ package org.alfresco.repo.content.transform; import java.util.ArrayList; +import org.apache.tika.config.TikaConfig; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AutoDetectParser; import org.apache.tika.parser.Parser; @@ -37,6 +38,9 @@ import org.apache.tika.parser.Parser; */ public class TikaAutoContentTransformer extends TikaPoweredContentTransformer { + private static AutoDetectParser parser; + private static TikaConfig config; + /** * We support all the mimetypes that the Tika * auto-detect parser can handle, except for @@ -44,10 +48,13 @@ public class TikaAutoContentTransformer extends TikaPoweredContentTransformer * make much sense */ public static ArrayList SUPPORTED_MIMETYPES; - static { + private static ArrayList buildMimeTypes(TikaConfig tikaConfig) + { + config = tikaConfig; + parser = new AutoDetectParser(config); + SUPPORTED_MIMETYPES = new ArrayList(); - AutoDetectParser p = new AutoDetectParser(); - for(MediaType mt : p.getParsers().keySet()) { + for(MediaType mt : parser.getParsers().keySet()) { if(mt.toString().startsWith("application/vnd.oasis.opendocument.formula")) { // TODO Tika support for quick.odf, mimetype=application/vnd.oasis.opendocument.formula // TODO Tika support for quick.otf, mimetype=application/vnd.oasis.opendocument.formula-template @@ -85,11 +92,12 @@ public class TikaAutoContentTransformer extends TikaPoweredContentTransformer SUPPORTED_MIMETYPES.add( mt.toString() ); } } + return SUPPORTED_MIMETYPES; } - public TikaAutoContentTransformer() + public TikaAutoContentTransformer(TikaConfig tikaConfig) { - super(SUPPORTED_MIMETYPES); + super( buildMimeTypes(tikaConfig) ); } /** @@ -100,6 +108,6 @@ public class TikaAutoContentTransformer extends TikaPoweredContentTransformer */ protected Parser getParser() { - return new AutoDetectParser(); + return parser; } } diff --git a/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java b/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java index 72c5e098c1..076c6bb6e0 100644 --- a/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java +++ b/source/java/org/alfresco/repo/content/transform/TikaAutoContentTransformerTest.java @@ -20,6 +20,7 @@ package org.alfresco.repo.content.transform; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.TransformationOptions; +import org.apache.tika.config.TikaConfig; /** * Most of the work for testing the Tika Auto-Detect transformer @@ -38,7 +39,8 @@ public class TikaAutoContentTransformerTest extends TikaPoweredContentTransforme { super.setUp(); - transformer = new TikaAutoContentTransformer(); + TikaConfig config = (TikaConfig)ctx.getBean("tikaConfig"); + transformer = new TikaAutoContentTransformer( config ); } /** diff --git a/source/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java b/source/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java index 9ad65aa033..d57e4feb85 100644 --- a/source/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java +++ b/source/java/org/alfresco/repo/content/transform/TikaPoweredContainerExtractor.java @@ -79,18 +79,10 @@ public class TikaPoweredContainerExtractor private NodeService nodeService; private ContentService contentService; + private TikaConfig config; private AutoDetectParser parser; private Detector detector; - public TikaPoweredContainerExtractor() - { - TikaConfig config = TikaConfig.getDefaultConfig(); - detector = new ContainerAwareDetector( - config.getMimeRepository() - ); - parser = new AutoDetectParser(detector); - } - /** * Injects the nodeService bean. * @@ -110,6 +102,22 @@ public class TikaPoweredContainerExtractor { this.contentService = contentService; } + + /** + * Injects the TikaConfig to use + * + * @param tikaConfig The Tika Config to use + */ + public void setTikaConfig(TikaConfig tikaConfig) + { + this.config = tikaConfig; + + // Setup the detector and parser + detector = new ContainerAwareDetector( + config.getMimeRepository() + ); + parser = new AutoDetectParser(detector); + } /** * Extracts out all the entries from the container @@ -277,6 +285,9 @@ public class TikaPoweredContainerExtractor + + + diff --git a/source/java/org/alfresco/repo/googledocs/GoogleDocsServiceImpl.java b/source/java/org/alfresco/repo/googledocs/GoogleDocsServiceImpl.java index 9bea800ded..a00961ea79 100755 --- a/source/java/org/alfresco/repo/googledocs/GoogleDocsServiceImpl.java +++ b/source/java/org/alfresco/repo/googledocs/GoogleDocsServiceImpl.java @@ -339,7 +339,8 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter ContentReader contentReader = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT); if (contentReader == null) { - // Determine the mimetype from the file extension + // Determine the mimetype from the file extension only + // (We've no content so we can't include that in our check) mimetype = mimetypeService.guessMimetype(name); } else diff --git a/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java b/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java index 901f7b9ff0..2429a3ad4f 100644 --- a/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java +++ b/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java @@ -1065,100 +1065,11 @@ public class AlfrescoImapFolder extends AbstractImapFolder implements Serializab if (extractAttachmentsEnabled) { - extractAttachments(folderFileInfo, messageFile, message); + imapService.extractAttachments(folderFileInfo.getNodeRef(), messageFile.getNodeRef(), message); } return new IncomingImapMessage(messageFile, serviceRegistry, message); } - - private void extractAttachments( - FileInfo parentFolder, - FileInfo messageFile, - MimeMessage originalMessage) - throws IOException, MessagingException - { - NodeService nodeService = serviceRegistry.getNodeService(); - FileFolderService fileFolderService = serviceRegistry.getFileFolderService(); - - String messageName = (String)nodeService.getProperty(messageFile.getNodeRef(), ContentModel.PROP_NAME); - String attachmentsFolderName = messageName + "-attachments"; - FileInfo attachmentsFolderFileInfo = null; - Object content = originalMessage.getContent(); - if (content instanceof Multipart) - { - Multipart multipart = (Multipart) content; - - for (int i = 0, n = multipart.getCount(); i < n; i++) - { - Part part = multipart.getBodyPart(i); - if ("attachment".equalsIgnoreCase(part.getDisposition())) - { - if (attachmentsFolderFileInfo == null) - { - attachmentsFolderFileInfo = fileFolderService.create( - parentFolder.getNodeRef(), - attachmentsFolderName, - ContentModel.TYPE_FOLDER); - serviceRegistry.getNodeService().createAssociation( - messageFile.getNodeRef(), - attachmentsFolderFileInfo.getNodeRef(), - ImapModel.ASSOC_IMAP_ATTACHMENTS_FOLDER); - } - createAttachment(messageFile, attachmentsFolderFileInfo, part); - } - } - } - - } - - private void createAttachment(FileInfo messageFile, FileInfo attachmentsFolderFileInfo, Part part) throws MessagingException, IOException - { - String fileName = part.getFileName(); - try - { - fileName = MimeUtility.decodeText(fileName); - } - catch (UnsupportedEncodingException e) - { - if (logger.isWarnEnabled()) - { - logger.warn("Cannot decode file name '" + fileName + "'", e); - } - } - - ContentType contentType = new ContentType(part.getContentType()); - FileFolderService fileFolderService = serviceRegistry.getFileFolderService(); - List result = fileFolderService.search(attachmentsFolderFileInfo.getNodeRef(), fileName, false); - // The one possible behaviour - /* - if (result.size() > 0) - { - for (FileInfo fi : result) - { - fileFolderService.delete(fi.getNodeRef()); - } - } - */ - // And another one behaviour which will overwrite the content of the existing file. It is performance preferable. - FileInfo attachmentFile = null; - if (result.size() == 0) - { - FileInfo createdFile = fileFolderService.create( - attachmentsFolderFileInfo.getNodeRef(), - fileName, - ContentModel.TYPE_CONTENT); - serviceRegistry.getNodeService().createAssociation( - messageFile.getNodeRef(), - createdFile.getNodeRef(), - ImapModel.ASSOC_IMAP_ATTACHMENT); - result.add(createdFile); - } - attachmentFile = result.get(0); - ContentWriter writer = fileFolderService.getWriter(attachmentFile.getNodeRef()); - writer.setMimetype(contentType.getBaseType()); - OutputStream os = writer.getContentOutputStream(); - FileCopyUtils.copy(part.getInputStream(), os); - } - + private void removeMessageFromCache(long uid) { messages.remove(uid); diff --git a/source/java/org/alfresco/repo/imap/ImapService.java b/source/java/org/alfresco/repo/imap/ImapService.java index dbc9b3f8f7..685c094a86 100644 --- a/source/java/org/alfresco/repo/imap/ImapService.java +++ b/source/java/org/alfresco/repo/imap/ImapService.java @@ -18,10 +18,13 @@ */ package org.alfresco.repo.imap; +import java.io.IOException; import java.util.List; import javax.mail.Flags; +import javax.mail.MessagingException; import javax.mail.Flags.Flag; +import javax.mail.internet.MimeMessage; import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode; import org.alfresco.service.cmr.model.FileInfo; @@ -261,4 +264,20 @@ public interface ImapService */ public boolean isNodeInSitesLibrary(NodeRef nodeRef); + + /** + * Extract Attachments + * + * @param parentFolder + * @param messageFile the node ref of the message. + * @param originalMessage + * @throws IOException + * @throws MessagingException + */ + public NodeRef extractAttachments( + NodeRef parentFolder, + NodeRef messageFile, + MimeMessage originalMessage) + throws IOException, MessagingException; + } diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java index a64d3dacc0..1e2b681446 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -20,7 +20,11 @@ package org.alfresco.repo.imap; import static org.alfresco.repo.imap.AlfrescoImapConst.DICTIONARY_TEMPLATE_PREFIX; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.OutputStream; import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -34,6 +38,12 @@ import java.util.Set; import javax.mail.Flags; import javax.mail.Flags.Flag; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.Part; +import javax.mail.internet.ContentType; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeUtility; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; @@ -64,7 +74,9 @@ import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.SubFolderFilter; import org.alfresco.service.cmr.preference.PreferenceService; import org.alfresco.service.cmr.repository.ChildAssociationRef; +import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.InvalidNodeRefException; +import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; @@ -80,9 +92,11 @@ import org.alfresco.util.Utf7; import org.alfresco.util.config.RepositoryFolderConfigBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.poi.hmef.HMEFMessage; import org.springframework.context.ApplicationEvent; import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.extensions.surf.util.I18NUtil; +import org.springframework.util.FileCopyUtils; /** * @author Dmitry Vaserin @@ -108,6 +122,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol private PermissionService permissionService; private ServiceRegistry serviceRegistry; private BehaviourFilter policyBehaviourFilter; + private MimetypeService mimetypeService; /** * Folders cache @@ -201,11 +216,6 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol this.foldersCache = foldersCache; } - public SimpleCache getFoldersCache() - { - return foldersCache; - } - public FileFolderService getFileFolderService() { return fileFolderService; @@ -216,9 +226,9 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol this.fileFolderService = fileFolderService; } - public NodeService getNodeService() + public void setMimetypeService(MimetypeService mimetypeService) { - return nodeService; + this.mimetypeService = mimetypeService; } public void setNodeService(NodeService nodeService) @@ -226,21 +236,11 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol this.nodeService = nodeService; } - public PermissionService getPermissionService() - { - return permissionService; - } - public void setPermissionService(PermissionService permissionService) { this.permissionService = permissionService; } - public ServiceRegistry getServiceRegistry() - { - return serviceRegistry; - } - public void setServiceRegistry(ServiceRegistry serviceRegistry) { this.serviceRegistry = serviceRegistry; @@ -320,6 +320,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol PropertyCheck.mandatory(this, "defaultFromAddress", defaultFromAddress); PropertyCheck.mandatory(this, "repositoryTemplatePath", repositoryTemplatePath); PropertyCheck.mandatory(this, "policyBehaviourFilter", policyBehaviourFilter); + PropertyCheck.mandatory(this, "mimetypeService", mimetypeService); } public void startup() @@ -900,7 +901,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol { if (logger.isDebugEnabled()) { - logger.debug("[searchByPattern] Start. nodeRef=" + contextNodeRef + ", namePattern=" + namePattern); + logger.debug("[searchByPattern] Start. nodeRef=" + contextNodeRef + ", viewMode=" + viewMode + " namePattern=" + namePattern); } List searchResult; @@ -913,13 +914,13 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol /** * This is a simple listing of all folders below contextNodeRef */ + logger.debug("call file folder service to list folders"); + searchResult = fileFolderService.listFolders(contextNodeRef); } else { - // MER TODO I'm not sure we ever get here in real use of IMAP. But if we do then the use of this - // deprecated method needs to be re-worked. - // searchResult = fileFolderService.search(contextNodeRef, namePattern, false, true, false); + logger.debug("call listDeepFolders"); searchResult = fileFolderService.listDeepFolders(contextNodeRef, new ImapSubFolderFilter(viewMode, namePattern)); } @@ -1000,7 +1001,10 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol if (logger.isDebugEnabled()) { - logger.debug("[searchByPattern] End. namePattern=" + namePattern); + if (logger.isDebugEnabled()) + { + logger.debug("[searchByPattern] End. nodeRef=" + contextNodeRef + ", viewMode=" + viewMode + ", namePattern=" + namePattern + ", searchResult=" +searchResult.size()); + } } return searchResult; @@ -1271,7 +1275,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol { if (logger.isDebugEnabled()) { - logger.debug("List folder: mailboxPattern=" + mailboxPattern); + logger.debug("expand folder: root:" + root + " user: " + user + " :mailboxPattern=" + mailboxPattern); } if (mailboxPattern == null) return null; @@ -2015,7 +2019,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol ImapSubFolderFilter(ImapViewMode imapViewMode) { this.imapViewMode = imapViewMode; - this.typesToExclude = getServiceRegistry().getDictionaryService().getSubTypes(SiteModel.TYPE_SITE, true); + this.typesToExclude = serviceRegistry.getDictionaryService().getSubTypes(SiteModel.TYPE_SITE, true); this.favs = getFavouriteSites(getCurrentUser()); } @@ -2192,5 +2196,173 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol { return nodeService.getType(parent).equals(SiteModel.TYPE_SITE) && isInDocLibrary; } - } + } + + /** + * Extract attachments from a MimeMessage + * + * Puts the attachments into a subfolder below the parent folder. + * + * @return the node ref of the folder containing the attachments or null if there are no + * attachments. + */ + public NodeRef extractAttachments( + NodeRef parentFolder, + NodeRef messageFile, + MimeMessage originalMessage) + throws IOException, MessagingException + { + + String messageName = (String)nodeService.getProperty(messageFile, ContentModel.PROP_NAME); + String attachmentsFolderName = messageName + "-attachments"; + FileInfo attachmentsFolderFileInfo = null; + Object content = originalMessage.getContent(); + if (content instanceof Multipart) + { + Multipart multipart = (Multipart) content; + + for (int i = 0, n = multipart.getCount(); i < n; i++) + { + Part part = multipart.getBodyPart(i); + + if ("attachment".equalsIgnoreCase(part.getDisposition())) + { + if (attachmentsFolderFileInfo == null) + { + attachmentsFolderFileInfo = fileFolderService.create( + parentFolder, + attachmentsFolderName, + ContentModel.TYPE_FOLDER); + nodeService.createAssociation( + messageFile, + attachmentsFolderFileInfo.getNodeRef(), + ImapModel.ASSOC_IMAP_ATTACHMENTS_FOLDER); + } + createAttachment(messageFile, attachmentsFolderFileInfo.getNodeRef(), part); + } + } + } + if(attachmentsFolderFileInfo != null) + { + return attachmentsFolderFileInfo.getNodeRef(); + } + else + { + return null; + } + } + + /** + * Create an attachment given a mime part + * + * @param messageFile the file containing the message + * @param destinationFolder where to put the attachment + * @param part the mime part + * + * @throws MessagingException + * @throws IOException + */ + private void createAttachment(NodeRef messageFile, NodeRef destinationFolder, Part part) throws MessagingException, IOException + { + String fileName = part.getFileName(); + try + { + fileName = MimeUtility.decodeText(fileName); + } + catch (UnsupportedEncodingException e) + { + if (logger.isWarnEnabled()) + { + logger.warn("Cannot decode file name '" + fileName + "'", e); + } + } + + ContentType contentType = new ContentType(part.getContentType()); + + if(contentType.getBaseType().equalsIgnoreCase("application/ms-tnef")) + { + // The content is TNEF + HMEFMessage hmef = new HMEFMessage(part.getInputStream()); + + //hmef.getBody(); + List attachments = hmef.getAttachments(); + for(org.apache.poi.hmef.Attachment attachment : attachments) + { + String subName = attachment.getLongFilename(); + + NodeRef attachmentNode = fileFolderService.searchSimple(destinationFolder, subName); + if (attachmentNode == null) + { + /* + * If the node with the given name does not already exist + * Create the content node to contain the attachment + */ + FileInfo createdFile = fileFolderService.create( + destinationFolder, + subName, + ContentModel.TYPE_CONTENT); + + attachmentNode = createdFile.getNodeRef(); + + serviceRegistry.getNodeService().createAssociation( + messageFile, + attachmentNode, + ImapModel.ASSOC_IMAP_ATTACHMENT); + + + byte[] bytes = attachment.getContents(); + ContentWriter writer = fileFolderService.getWriter(attachmentNode); + + //TODO ENCODING - attachment.getAttribute(TNEFProperty.); + String extension = attachment.getExtension(); + String mimetype = mimetypeService.getMimetype(extension); + if(mimetype != null) + { + writer.setMimetype(mimetype); + } + + OutputStream os = writer.getContentOutputStream(); + ByteArrayInputStream is = new ByteArrayInputStream(bytes); + FileCopyUtils.copy(is, os); + } + } + } + else + { + // not TNEF + NodeRef attachmentNode = fileFolderService.searchSimple(destinationFolder, fileName); + if (attachmentNode == null) + { + /* + * If the node with the given name does not already exist + * Create the content node to contain the attachment + */ + FileInfo createdFile = fileFolderService.create( + destinationFolder, + fileName, + ContentModel.TYPE_CONTENT); + + attachmentNode = createdFile.getNodeRef(); + + serviceRegistry.getNodeService().createAssociation( + messageFile, + attachmentNode, + ImapModel.ASSOC_IMAP_ATTACHMENT); + + + // the part is a normal IMAP attachment + ContentWriter writer = fileFolderService.getWriter(attachmentNode); + writer.setMimetype(contentType.getBaseType()); + + String charset = contentType.getParameter("charset"); + if(charset != null) + { + writer.setEncoding(charset); + } + + OutputStream os = writer.getContentOutputStream(); + FileCopyUtils.copy(part.getInputStream(), os); + } + } + } } diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java index 5a84bb0d20..32e47ba5cc 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java @@ -18,13 +18,18 @@ */ package org.alfresco.repo.imap; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Properties; import javax.mail.Flags; +import javax.mail.Session; +import javax.mail.internet.MimeMessage; import javax.transaction.UserTransaction; import junit.framework.TestCase; @@ -37,10 +42,12 @@ import org.alfresco.repo.importer.ACPImportPackageHandler; import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory; import org.alfresco.repo.model.filefolder.FileFolderServiceImpl; import org.alfresco.repo.node.integrity.IntegrityChecker; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileInfo; +import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; @@ -55,7 +62,6 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; -import org.alfresco.util.Utf7; import org.alfresco.util.config.RepositoryFolderConfigBean; import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; @@ -285,18 +291,24 @@ public class ImapServiceImplTest extends TestCase assertTrue("folder A found", foundA); assertTrue("folder B found", foundB); + mf = imapService.listMailboxes(user, MAILBOX_PATTERN); + assertEquals("can't repeat the listing of folders", 2, mf.size()); + + mf = imapService.listMailboxes(user, MAILBOX_PATTERN); + assertEquals("can't repeat the listing of folders", 2, mf.size()); + /** * The new mailboxes should be subscribed? */ List aif = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN); - assertEquals(2, aif.size()); + assertEquals("not subscribed to two mailboxes", 2, aif.size()); /** * Unsubscribe to one of the mailboxes. */ imapService.unsubscribe(user, MAILBOX_NAME_B); List aif2 = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN); - assertEquals(1, aif2.size()); + assertEquals("not subscribed to one mailbox", 1, aif2.size()); } public void testListSubscribedMailbox() throws Exception @@ -514,8 +526,8 @@ public class ImapServiceImplTest extends TestCase public void testRenameAccentedMailbox() throws Exception { - String MAILBOX_ACCENTED_NAME_A = "Hôtel"; - String MAILBOX_ACCENTED_NAME_B = "HôtelXX"; + String MAILBOX_ACCENTED_NAME_A = "H�tel"; + String MAILBOX_ACCENTED_NAME_B = "H�telXX"; imapService.createMailbox(user, MAILBOX_ACCENTED_NAME_A); imapService.deleteMailbox(user, MAILBOX_ACCENTED_NAME_A); @@ -526,4 +538,45 @@ public class ImapServiceImplTest extends TestCase assertTrue("Can't rename mailbox", checkMailbox(user, MAILBOX_ACCENTED_NAME_B)); imapService.deleteMailbox(user, MAILBOX_ACCENTED_NAME_B); } + + /** + * Test attachment extraction with a TNEF message + * @throws Exception + */ + public void testAttachmentExtraction() throws Exception + { + AuthenticationUtil.setRunAsUserSystem(); + /** + * Load a TNEF message + */ + ClassPathResource fileResource = new ClassPathResource("imap/test-tnef-message.eml"); + assertNotNull("unable to find test resource test-tnef-message.eml", fileResource); + InputStream is = new FileInputStream(fileResource.getFile()); + MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()), is); + + /** + * Create a test node containing the message + */ + String storePath = "workspace://SpacesStore"; + String companyHomePathInStore = "/app:company_home"; + StoreRef storeRef = new StoreRef(storePath); + NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef); + + List nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore, null, namespaceService, false); + NodeRef companyHomeNodeRef = nodeRefs.get(0); + + FileInfo f1 = fileFolderService.create(companyHomeNodeRef, "ImapServiceImplTest", ContentModel.TYPE_FOLDER); + FileInfo d2 = fileFolderService.create(f1.getNodeRef(), "ImapServiceImplTest", ContentModel.TYPE_FOLDER); + FileInfo f2 = fileFolderService.create(f1.getNodeRef(), "test-tnef-message.eml", ContentModel.TYPE_CONTENT); + + ContentWriter writer = fileFolderService.getWriter(f2.getNodeRef()); + writer.putContent(new FileInputStream(fileResource.getFile())); + + NodeRef folder = imapService.extractAttachments(f1.getNodeRef(), f2.getNodeRef(), message); + assertNotNull(folder); + + List files = fileFolderService.listFiles(folder); + assertTrue("three files not found", files.size() == 3); + + } } diff --git a/source/java/org/alfresco/repo/imap/package-info.java b/source/java/org/alfresco/repo/imap/package-info.java new file mode 100644 index 0000000000..d53a236d16 --- /dev/null +++ b/source/java/org/alfresco/repo/imap/package-info.java @@ -0,0 +1,17 @@ +/** + * The implementation of the Alfresco Imap Server + * + *

+ * AlfrescoImapServer which implements the IMAP protocol. It contains an instance of the Ice Green ImapServer and delegates imap commands to + * AlfrescoImapHostManager and AlfrescoImapUserManager. AlfrescoImapHostManager in turn delegates to ImapService and AlfrescoImapUserManager uses the PersonService. + * + *

+ * ImapServiceImpl provides the implementation of the various IMAP commands on an alfresco repository. Also contains the transaction and security boundary. + * + *

+ * AlfrescoImapFolder contains the implementation of IMAPFolders and contains messages. + * + * @since 3.2 + * + */ +package org.alfresco.repo.imap; diff --git a/source/java/org/alfresco/repo/importer/FileImporterImpl.java b/source/java/org/alfresco/repo/importer/FileImporterImpl.java index 65986b5f66..d6d30e04b1 100644 --- a/source/java/org/alfresco/repo/importer/FileImporterImpl.java +++ b/source/java/org/alfresco/repo/importer/FileImporterImpl.java @@ -29,6 +29,7 @@ import java.util.Map; import org.alfresco.model.ApplicationModel; import org.alfresco.model.ContentModel; +import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.dictionary.DictionaryService; @@ -267,13 +268,17 @@ public class FileImporterImpl implements FileImporter "Unable to create file. " + "Parent type is inappropriate: " + nodeService.getType(parentNodeRef)); } + + // Identify the type of the file + FileContentReader reader = new FileContentReader(file); + String mimetype = mimetypeService.guessMimetype(file.getName(), reader); // create properties for content type Map contentProps = new HashMap(3, 1.0f); contentProps.put(ContentModel.PROP_NAME, file.getName()); contentProps.put( ContentModel.PROP_CONTENT, - new ContentData(null, mimetypeService.guessMimetype(file.getName()), 0L, "UTF-8")); + new ContentData(null, mimetype, 0L, "UTF-8")); String currentUser = authenticationService.getCurrentUserName(); contentProps.put(ContentModel.PROP_CREATOR, currentUser == null ? "unknown" : currentUser); diff --git a/source/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java b/source/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java index 0a61abb8a0..9db9111aff 100644 --- a/source/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java +++ b/source/java/org/alfresco/repo/jscript/ContentAwareScriptableQNameMap.java @@ -81,6 +81,8 @@ public class ContentAwareScriptableQNameMap extends ScriptableQNameMap String fileName = (String)get("cm:name"); if (fileName != null) { + // We don't have any content, so just use the filename when + // trying to guess the mimetype for this mimetype = this.services.getMimetypeService().guessMimetype(fileName); } } diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java index 83da9fb564..7bc7f507a0 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptNode.java +++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java @@ -3415,7 +3415,9 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol */ public void guessMimetype(String filename) { - setMimetype(services.getMimetypeService().guessMimetype(filename)); + ContentService contentService = services.getContentService(); + ContentReader reader = contentService.getReader(nodeRef, property); + setMimetype(services.getMimetypeService().guessMimetype(filename, reader)); } /** diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java index 4e68a4fa9f..ac17f7535a 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java @@ -360,7 +360,7 @@ public class FileFolderServiceImpl implements FileFolderService { logger.debug("Deep search for files: \n" + " context: " + contextNodeRef + "\n" + - " results: " + results); + " results: " + results.size()); } return results; @@ -600,12 +600,7 @@ public class FileFolderServiceImpl implements FileFolderService /** * A deep version of listSimple. Which recursively walks down the tree from a given starting point, returning * the node refs of files or folders found along the way. - * - * MER: I've added this rather than changing listSimple to minimise the risk of breaking - * the existing code. This is a quick performance improvement between using - * XPath which is awful or adding new methods to the NodeService/DB This is also a dangerous method in that it can return a - * lot of data and take a long time. - * + *

* The folder filter is called for each sub-folder to determine whether to search in that sub-folder, should a subfolder be excluded * then all its chidren are excluded as well. * @@ -615,8 +610,19 @@ public class FileFolderServiceImpl implements FileFolderService * @param subfolder filter controls which folders to search. If null then all subfolders are searched. * @return list of node references */ + /*

+ * MER: I've added this rather than changing listSimple to minimise the risk of breaking + * the existing code. This is a quick performance improvement between using + * XPath which is awful or adding new methods to the NodeService/DB This is also a dangerous method in that it can return a + * lot of data and take a long time. + */ private List listSimpleDeep(NodeRef contextNodeRef, boolean folders, boolean files, SubFolderFilter folderFilter) { + if(logger.isDebugEnabled()) + { + logger.debug("searchSimpleDeep contextNodeRef:" + contextNodeRef); + } + Set folderTypeQNames = new HashSet(10); Set fileTypeQNames = new HashSet(10); @@ -701,7 +707,10 @@ public class FileFolderServiceImpl implements FileFolderService } } - logger.debug("search deep finished size:" + result.size()); + if(logger.isDebugEnabled()) + { + logger.debug("searchSimpleDeep finished size:" + result.size()); + } // Done return result; @@ -1214,7 +1223,7 @@ public class FileFolderServiceImpl implements FileFolderService if (writer.getMimetype() == null) { final String name = fileInfo.getName(); - writer.setMimetype(mimetypeService.guessMimetype(name)); + writer.guessMimetype(name); } // Done return writer; diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java index 9b9d3a3c45..5f3fdf12be 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java @@ -20,6 +20,7 @@ package org.alfresco.repo.model.filefolder; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.Reader; import java.util.ArrayList; import java.util.Date; @@ -894,12 +895,25 @@ public class FileFolderServiceImplTest extends TestCase { FileInfo fileInfo = fileFolderService.create(workingRootNodeRef, "Something.html", ContentModel.TYPE_CONTENT); NodeRef fileNodeRef = fileInfo.getNodeRef(); + // Write the content but without setting the mimetype ContentWriter writer = fileFolderService.getWriter(fileNodeRef); writer.putContent("CONTENT"); ContentReader reader = fileFolderService.getReader(fileNodeRef); assertEquals("Mimetype was not automatically set", MimetypeMap.MIMETYPE_HTML, reader.getMimetype()); + + + // Now ask for encoding too + writer = fileFolderService.getWriter(fileNodeRef); + writer.guessEncoding(); + OutputStream out = writer.getContentOutputStream(); + out.write( "hall\u00e5 v\u00e4rlden".getBytes("UnicodeBig") ); + out.close(); + + reader = fileFolderService.getReader(fileNodeRef); + assertEquals("Mimetype was not automatically set", MimetypeMap.MIMETYPE_HTML, reader.getMimetype()); + assertEquals("Encoding was not automatically set", "UTF-16BE", reader.getEncoding()); } @SuppressWarnings("unused") diff --git a/source/java/org/alfresco/repo/remote/FileFolderRemoteServer.java b/source/java/org/alfresco/repo/remote/FileFolderRemoteServer.java index 8142fc0c5a..3c03e6865c 100644 --- a/source/java/org/alfresco/repo/remote/FileFolderRemoteServer.java +++ b/source/java/org/alfresco/repo/remote/FileFolderRemoteServer.java @@ -20,10 +20,8 @@ package org.alfresco.repo.remote; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.nio.charset.Charset; import java.util.List; -import org.alfresco.repo.content.encoding.ContentCharsetFinder; import org.alfresco.repo.model.filefolder.FileFolderServiceImpl; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; @@ -55,7 +53,6 @@ public class FileFolderRemoteServer implements FileFolderRemote private RetryingTransactionHelper retryingTransactionHelper; private AuthenticationService authenticationService; private FileFolderService fileFolderService; - private MimetypeService mimetypeService; /** * @param transactionService provides transactional support and retrying @@ -82,11 +79,11 @@ public class FileFolderRemoteServer implements FileFolderRemote } /** - * @param mimetypeService used to determine the character encoding + * @deprecated The mimetype service is no longer needed. */ + @Deprecated public void setMimetypeService(MimetypeService mimetypeService) { - this.mimetypeService = mimetypeService; } /** @@ -552,19 +549,15 @@ public class FileFolderRemoteServer implements FileFolderRemote { public ContentData execute() throws Throwable { - // Guess the mimetype - String mimetype = mimetypeService.guessMimetype(filename); - // Get a writer ContentWriter writer = fileFolderService.getWriter(nodeRef); + + // We need the mimetype and encoding finding for us + writer.guessEncoding(); + writer.guessMimetype(filename); + // Make a stream ByteArrayInputStream is = new ByteArrayInputStream(bytes); - // Guess the encoding - ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder(); - Charset charset = charsetFinder.getCharset(is, mimetype); - // Set metadata - writer.setEncoding(charset.name()); - writer.setMimetype(mimetype); // Write the stream writer.putContent(is); @@ -606,19 +599,15 @@ public class FileFolderRemoteServer implements FileFolderRemote for (int i = 0; i < filenames.length; i++) { - - String mimetype = mimetypeService.guessMimetype(filenames[i]); - // Get a writer ContentWriter writer = fileFolderService.getWriter(nodeRefs[i]); + + // We need the mimetype and encoding finding for us + writer.guessEncoding(); + writer.guessMimetype(filenames[i]); + // Make a stream ByteArrayInputStream is = new ByteArrayInputStream(bytes[i]); - // Guess the encoding - ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder(); - Charset charset = charsetFinder.getCharset(is, mimetype); - // Set metadata - writer.setEncoding(charset.name()); - writer.setMimetype(mimetype); // Write the stream writer.putContent(is); diff --git a/source/java/org/alfresco/repo/remote/LoaderRemoteServer.java b/source/java/org/alfresco/repo/remote/LoaderRemoteServer.java index 33ecc5c80e..72ef715191 100644 --- a/source/java/org/alfresco/repo/remote/LoaderRemoteServer.java +++ b/source/java/org/alfresco/repo/remote/LoaderRemoteServer.java @@ -20,13 +20,11 @@ package org.alfresco.repo.remote; import java.io.ByteArrayInputStream; import java.io.Serializable; -import java.nio.charset.Charset; import java.util.HashMap; import java.util.List; import java.util.Map; import org.alfresco.model.ContentModel; -import org.alfresco.repo.content.encoding.ContentCharsetFinder; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; @@ -71,7 +69,6 @@ public class LoaderRemoteServer implements LoaderRemote private NodeService nodeService; private FileFolderService fileFolderService; private FileFolderRemote fileFolderRemote; - private MimetypeService mimetypeService; private CheckOutCheckInService checkOutCheckInService; /** @@ -112,11 +109,11 @@ public class LoaderRemoteServer implements LoaderRemote } /** - * @param mimetypeService used to determine encoding, etc + * @deprecated The mimetype service is no longer needed. */ + @Deprecated public void setMimetypeService(MimetypeService mimetypeService) { - this.mimetypeService = mimetypeService; } public void setCheckOutCheckInService(CheckOutCheckInService checkOutCheckInService) @@ -260,18 +257,16 @@ public class LoaderRemoteServer implements LoaderRemote results[i] = newFileInfo; NodeRef newFileNodeRef = newFileInfo.getNodeRef(); - // Guess the mimetype - String mimetype = mimetypeService.guessMimetype(filenames[i]); // Get a writer ContentWriter writer = fileFolderService.getWriter(newFileNodeRef); + + // We need the encoding and mimetype guessing + writer.guessMimetype(filenames[i]); + writer.guessEncoding(); + // Make a stream ByteArrayInputStream is = new ByteArrayInputStream(bytes[i]); - // Guess the encoding - ContentCharsetFinder charsetFinder = mimetypeService.getContentCharsetFinder(); - Charset charset = charsetFinder.getCharset(is, mimetype); - // Set metadata - writer.setEncoding(charset.name()); - writer.setMimetype(mimetype); + // Write the stream writer.putContent(is); } diff --git a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java index 27ab1a0537..e29847ea61 100644 --- a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java +++ b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java @@ -49,6 +49,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.tika.config.TikaConfig; import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; @@ -79,6 +80,7 @@ import org.xml.sax.helpers.AttributesImpl; public class HTMLRenderingEngine extends AbstractRenderingEngine { private static Log logger = LogFactory.getLog(HTMLRenderingEngine.class); + private TikaConfig tikaConfig; /** * This optional parameter, when set to true, causes only the @@ -110,6 +112,15 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine return paramList; } + /** + * Injects the TikaConfig to use + * + * @param tikaConfig The Tika Config to use + */ + public void setTikaConfig(TikaConfig tikaConfig) + { + this.tikaConfig = tikaConfig; + } /* * (non-Javadoc) @@ -122,7 +133,7 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine String sourceMimeType = contentReader.getMimetype(); // Check that Tika supports the supplied file - AutoDetectParser p = new AutoDetectParser(); + AutoDetectParser p = new AutoDetectParser(tikaConfig); MediaType sourceMediaType = MediaType.parse(sourceMimeType); if(! p.getParsers().containsKey(sourceMediaType)) { diff --git a/source/test-resources/filesys/ContentDiskDriverTest3.doc b/source/test-resources/filesys/ContentDiskDriverTest3.doc new file mode 100644 index 0000000000..14adb3dbe4 Binary files /dev/null and b/source/test-resources/filesys/ContentDiskDriverTest3.doc differ diff --git a/source/test-resources/imap/test-tnef-message.eml b/source/test-resources/imap/test-tnef-message.eml new file mode 100644 index 0000000000..6b864c3a7b --- /dev/null +++ b/source/test-resources/imap/test-tnef-message.eml @@ -0,0 +1,551 @@ +From: "jdoe" +To: +Subject: RichText message +Date: Mon, 7 Mar 2011 11:35:03 -0000 +Message-ID: <004001cbdcbb$b5a14030$20e3c090$@com> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_003D_01CBDCBB.B59ECF30" +X-Mailer: Microsoft Office Outlook 12.0 +Thread-Index: Acvcu7Jb3LBLiff7Tw+9Zrc/fCNoyQ== +Content-Language: en-gb +X-MS-TNEF-Correlator: 00000000A1194318D0D97A4B97B404309E21A629E4572700 +X-OlkEid: 29E45727D8685FF8FA8A6F41A8C492486E862FD4 +x-cr-hashedpuzzle: B37Q Czl0 DV4S DxQB EBAG EjJ8 ElKw FnaG FwpZ F8pe GFxS Gyp3 ICxD Ih0b JGnQ JOaM;1;agBkAG8AZQBAAGEAbABmAHIAZQBzAGMAbwAuAGMAbwBtAA==;Sosha1_v1;7;{51762BA9-0EDC-4534-85AE-F36BC611EC07};agBkAG8AZQBAAGEAbABmAHIAZQBzAGMAbwAuAGMAbwBtAA==;Mon, 07 Mar 2011 11:35:01 GMT;UgBpAGMAaABUAGUAeAB0ACAAbQBlAHMAcwBhAGcAZQA= +x-cr-puzzleid: {51762BA9-0EDC-4534-85AE-F36BC611EC07} + +This is a multi-part message in MIME format. + +------=_NextPart_000_003D_01CBDCBB.B59ECF30 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 7bit + + + +------=_NextPart_000_003D_01CBDCBB.B59ECF30 +Content-Type: application/ms-tnef; + name="winmail.dat" +Content-Transfer-Encoding: base64 +Content-Disposition: attachment; + filename="winmail.dat" + +eJ8+IgcLAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEIgAcAGAAAAElQTS5NaWNy +b3NvZnQgTWFpbC5Ob3RlADEIAQOQBgCQHQAAOAAAAAsAAgABAAAAAwAmAAAAAAALACkAAAAAAB4A +cAABAAAAEQAAAFJpY2hUZXh0IG1lc3NhZ2UAAAAAAgFxAAEAAAAWAAAAAcvcu7Jb3LBLiff7Tw+9 +Zrc/fCNoyQAACwABDgAAAAACAQoOAQAAABgAAAAAAAAAjJ6Q1uz0mkCDydhbunRH/CKBAAAeACgO +AQAAACAAAAAwMDAwMDAwYgFqZG9lQGFsZnJlc2NvLmNvbQFqZG9lAB4AKQ4BAAAAIAAAADAwMDAw +MDBiAWpkb2VAYWxmcmVzY28uY29tAWpkb2UAAgEJEAEAAAAyFgAALhYAABdfAABMWkZ1zSefswcA +BgEBC2BuZzEwMmY1AGQAcmNwDdAOADIFDGBjDURmMzE1MEI3APVzdHNoBXBidGNoD9I2EIQJABEL +aHMOsBEaYmkP1w2iAdA1iRQXZmUUo3RoZQeAnxRnFdcVYAFAFddjcwHo8wKkE7BkaQM2AgARAArA +CHNldALRcHJxMqUAACoKoW5vGlAgDfCRG6E2MDMUsDA0HCEzAdAcEDR9B20CgzM0/xkfGiQAUBqv +AdAcUhwUG/JxIPF9Q2EG0AchBdBh/xXQHeQQEB5mA+MZ/xsLATDPHHIbshxQIdZsaSJhHeT/D+EZ +DyRvGy8cPx1OD+Efwf8ofymPKp8rryy+DyAt3y7v9yCPIZ8ntzMzPzRPL+8w//8yDztQOC85PzpP +O188bxSw/z2fPq8/v0DPQd8RUSN/RC//JZ8mrye3I1hDn0ofRb9Gz48Cg1CgTW9OdDIzOE7k4iAH +bSBDRVI0Lb9Tpuc9clRvVXN5clI0OB8fVtY2H8VYT0cJ0WtSND2P71r3MyFbvwOCVAhwUjRC/x0f +VjcjUV+PA4IoSGX7ImAH0ClSNEhoYg5UP2QWvwcQAaAOsGT1TV8fVjhIYetnPwOCQgdAdA6wUjRn +AV9pn1skWeFrP2RDVgiQdPZuIkAHkGVk9Q3gSH9Tvn8nRVWoVjhyPVfHc7dZZjHfWehJDFtoc7Zd +CTFduHiu/19Wc7Zg12Lge39qjnO2bIr/auB+v25uc7Zwbw/SbU9yr/dYX1XED9I5hh9XX1hvWXT/ +D9F0uVqPi49cro1yMy98f/9f32DljXJZ72J/b29kmo1y/12/Zn+Xv2iajXJhb3+/a4//bJiNcmVv +gy+b74TPjYGGD/eHH4v/iTcxid+K76ifjQjeMo2/js+P35DqMpG/ks9/k9+U6Kfwsj+Wv5fPmNwy +/5nPmt+4L5z9DgG6X58voD/9oUkyog+jH7xfpT+t8aZ/96ePIjaJKDKqT6tfyQeNCN8P0MpPeS8i +RZDbM7Ivsz97IjaU2TO+b79/IjahHDP/wn/DjyI2xZ/NUsbvx/+sb/2JNzPKP8tP3h+NCFYvzp/7 +4d+Q2zTRH9IvtE+U6Fnf/7cP6b+Yvl2vuz/tn5zuYV//1X/xz6EcZV/ZD/X/2q/jYu/b/90P4e+J +NzTfz+Df/o//jQiNkABP5M/l35D5DxEEP//o3+nvA4frj+yf+h+YzeOA/wwP8N/x750MA/AQP/UP +9h/9oTo19//5DxJP+y8D4fxv9/1/Al+JNzUAPwFPHv+NCP8FoiDfBV8Gb5EXCaIkvwlfvwpvJAYL +/w0PGo+YzTYQL/cRPy6PnP02FF8VbxZ/oSv+NhhvGX8yvxufJFGCHx3vv3O9JEIgqHVvdn+NFzd0 +z/8ln3ovQ6MoiHwPfR9DWDTI939PgF+hOjc42IK/g888H99D0BzfPl8iz4k3NyCvQa97VH+NCDgk +j0UPJq+Q6jjvKI9IjyqvlOg4LG8tfzr/vZjNODCfMa9kD5z9ODTP/0vvNu+hK0xian86HzsvhPgB +hYFjb2xvcnRiCGw7XJDgZDBcZ42Q4W5zUHLgdWUwcw/6Zb5QNXQ6dVF1D3YZdCR/dkJ0r3h/eD13 +v3XvdD9l/ZGgOH4KfyF+33/pdCSAEr9+f4JPgg2Bj3+/g4Q5XgD/htSIMYBTiDB+D3a3gm+AsKGR +MSpcZGVbAXBuwVWRcTBMcXOyEWxa0GeXQhBD0I2zZoCAMDNh4CmOVG5wjrIgjDZwYfmM0XFsbsBQ +oHNQ03BzUKFEoGRjdGyQUHKRUCWdAHCMgWF1oTBcYR5zkFCRsEUQkrJudW0llTBhknB0b5KwZGrI +dXN003BnaJKg03Cnc7FQoHOxaXSQYDCPwDBcbm9xUCFo4G90TGUgmVCUcHlsaGBo/bFgdJlQkK+R +v5LPk9+U70+JcJiwWxBa8XMxbsBh/40DY4Cd0I2CUJCN0Y6wvlC/l9GbkJ1EnOGND44dY4QQP26Q +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 +wK9tX8LPw99wj//F/3KsyB/JL4evy0+JzM0//85PjM/Qb47s0l/Tb5Hv1Y//lAzXf9iPlw/ar5ks +3J/dr/+cL50/t+/iL+M/oX+ij7L//+cP6B+mz6ff63/sj+2frB//rS/wz/Hf3n+xb7J/Qo/3L/+1 +r/lPqJr7T/xfuq+7v63J/wA/AU+/n9/Pwb8FLwY/xO//CF/HDwp/C4/KPw2vcqwPz/8Q389fEv+J +zBTvFf/Ufxgf/47sGg8bH9mfHT+UDB8vID//3r8iX5ksJE8lX+Pf5O//n/8p3yrv6S/qP/qvLr8v +z+5//++PMy80PzVP88/03zh/OY/nJi/5H/ovIDQ97z7//X///o+ouEL/RA8CXwNvrclH7/9I/wdP +J38Jb0zfTe8Mn1AP/w6/Ui9TPxHvVV9yrFd/WI//Fw9ar4nMXJ9drxwvX8+O7P9hv2LPIU9k75QM +Zt9n7yZv/2oPmSxr/20PK48sn0dPcY//cp8w3zHvQl92b3d/Ni83P/9633vvfP87fzyPgC+BP23f +80DPQd8gNYWfhq9FL0Y//6i4iq+Lv0oPSx+tyY+fkK//Tv9vL1EflI+Vn1RPl79Wb/+Z35rvWZ+d +D8xcny+gP16//6Jf0XykT6VfY9+nf9acqW//qn9o/6yf27yuj6+fbh+xv//g3LOvtL9zP3RPjv+5 +P7pP/3iPeZ+KD74fvy99337vwo//w5/Er4MvhD/H38jvtY+If/mJjyA2zU/OX4zfje/waP/SX9Nv +kb+Sz/V510/YX5av/7bfmM/cP91Pm//fb54f4Y//4p+hT+S/FAzm3+fvpm/qD/8ZLOv/7Q+rj+8v +HkzxH/Iv/7Cv9E8jbPY/90+1z/lvKIz/+1/8b7rvu//WrwDvAf/AP//BT9G/Bc8G38WPxp8KPwtP +Pwxfyt/L7w+PEJ/9NnFmsRPAbWF0CETPljH+TABTdWJ0bGUgRfRtcFEgc1vAFP8WDxcf9c+lMghM +ST2gPZARkBnvNxr/HA8XnjMITBmFUmX4ZmVyPZA9gCAPIR8iL/8jNg2cHwYlDyYfJy8oP98s6EJv +b3UQVM/gGcArM0MjJ/QMQmlibM+wZ/RyYR+geSszLY8jY/5MQFRPQyBIZVEzO4B9fXtcKlxkF5AN +H8B0E8AfYDAxMDVaMDdyMjdzNzA4N9Q0AmQSoDc4NmQ2YwEpMDJlNTM0MTWGODnQOLA0YzUy6bDf +1TDkYOmwDYA5cDM6UDsgHzfUO97QEDdxzyBjZjFAMWUwYTFiPXBh7mU3QD4/PywzPZBAETdw4SrA +ZmYwOTy2QY84Ef9CXUI9QLJE0kG2RL5FN0c//0hPSV9Kb0t/TI9Nn06vT7//UM9R31LvU/9VD1Yf +Vy9YP/9ZT1pfW29cf12PXp9fr2C//2HPYt9j72T/Zg9nH2gvaT//ak9rX2xvbX9uj2+fcK9xv/9y +z3PfdO91/3cPeB95L3o/+3tPfDxkfDVExX4vfz+AT/+BX4Jvg3+Ej4Wfhq+Hv4jP/4nfiu+L/40P +jh+PL5A/kU//kl+Tb5R/lY+Wn5evmL+Zz/+a35vvnP+eD58foC+hP6JP/6NfpG+lf6aPp5+or6m/ +qs//q9+s763/rw+wH7Evsj+zT/+0X7Vvtn+3j7ifua+6v7vPn0TTOlA8wUUhvXI3NDek+jQ3YTZA +Qb3yDYC90UEC/7+/wM/B38Lvw/84ETziN2GLvC99VmP+MGQ5OMeQWmLHsDM6ITngOTXAZvU5MGQ5 +wWI9kEYvyaY3wEBmNGY3YWLLIGT9zNBiNzBFv8y/zc/O38/v/9D/0g/TH9QvRs/WLNSv2D//2U/a +X9tv3H/dj96f36/gv//hz+Lf4+/VD+YP1y/oL+k//+pP61/sb+1/7o/vn/Cv8b//8s/z3+T/9f/n +H/gf+S/6P1/7T0N+N2T8NTYwAP5gAAADAN4/n04AAAMA8T8JCAAAAwACWQAAFgADAAlZAwAAAB4A +C4CGAwIAAAAAAMAAAAAAAABGAQAAACQAAAB4AC0AYwByAC0AaABhAHMAaABlAGQAcAB1AHoAegBs +AGUAAAABAAAAMgEAAEIzN1EgQ3psMCBEVjRTIER4UUIgRUJBRyBFako4IEVsS3cgRm5hRyBGd3Ba +IEY4cGUgR0Z4UyBHeXAzIElDeEQgSWgwYiBKR25RIEpPYU07MTthZ0JrQUc4QVpRQkFBR0VBYkFC +bUFISUFaUUJ6QUdNQWJ3QXVBR01BYndCdEFBPT07U29zaGExX3YxOzc7ezUxNzYyQkE5LTBFREMt +NDUzNC04NUFFLUYzNkJDNjExRUMwN307YWdCa0FHOEFaUUJBQUdFQWJBQm1BSElBWlFCekFHTUFi +d0F1QUdNQWJ3QnRBQT09O01vbiwgMDcgTWFyIDIwMTEgMTE6MzU6MDEgR01UO1VnQnBBR01BYUFC +VUFHVUFlQUIwQUNBQWJRQmxBSE1BY3dCaEFHY0FaUUE9AAAAHgAMgIYDAgAAAAAAwAAAAAAAAEYB +AAAAHAAAAHgALQBjAHIALQBwAHUAegB6AGwAZQBpAGQAAAABAAAAJwAAAHs1MTc2MkJBOS0wRURD +LTQ1MzQtODVBRS1GMzZCQzYxMUVDMDd9AAADABCAVqvzKU1V0BGpfACgyRH1CgAAAAAAoAAAAQAA +AAMAG4BTq/MpTVXQEal8AKDJEfUKAAAAAEOgAAABAAAAAwApgAMgBgAAAAAAwAAAAAAAAEYAAAAA +E4EAAAEAAAADACuAAyAGAAAAAADAAAAAAAAARgAAAAABgQAAAAAAAAMALIAIIAYAAAAAAMAAAAAA +AABGAAAAABCFAAAAAAAACwAygAMgBgAAAAAAwAAAAAAAAEYAAAAAHIEAAAAAAAADADaAAyAGAAAA +AADAAAAAAAAARgAAAAAjgQAA////fwMAOoAIIAYAAAAAAMAAAAAAAABGAAAAAAGFAAAAAAAABQBS +gAMgBgAAAAAAwAAAAAAAAEYAAAAAAoEAAAAAAAAAAAAAAwBTgAMgBgAAAAAAwAAAAAAAAEYAAAAA +EIEAAAAAAAADAFSAAyAGAAAAAADAAAAAAAAARgAAAAARgQAAAAAAAAsAWoADIAYAAAAAAMAAAAAA +AABGAAAAACSBAAAAAAAACwBbgAMgBgAAAAAAwAAAAAAAAEYAAAAALIEAAAAAAAADAFyAAyAGAAAA +AADAAAAAAAAARgAAAAApgQAAAAAAAAMAXYADIAYAAAAAAMAAAAAAAABGAAAAACqBAAAAAAAAHgBi +gAMgBgAAAAAAwAAAAAAAAEYAAAAAJ4EAAAEAAAABAAAAAAAAAAMAaYADIAYAAAAAAMAAAAAAAABG +AAAAABKBAAABAAAAHgBtgAMgBgAAAAAAwAAAAAAAAEYAAAAAIYEAAAEAAAABAAAAAAAAAAsAcIAD +IAYAAAAAAMAAAAAAAABGAAAAAAOBAAAAAAAACwBxgAMgBgAAAAAAwAAAAAAAAEYAAAAAJoEAAAAA +AAALAHWACCAGAAAAAADAAAAAAAAARgAAAAAGhQAAAAAAAAsAd4AIIAYAAAAAAMAAAAAAAABGAAAA +AA6FAAAAAAAAAwB6gAggBgAAAAAAwAAAAAAAAEYAAAAAGIUAAAAAAAALAJCACCAGAAAAAADAAAAA +AAAARgAAAACChQAAAAAAAAMAuYAEIQIgQmgNQ7Gchzm/25GIAAAAAACBAAANtwAAHgC6gAQhAiBC +aA1DsZyHOb/bkYgAAAAAUIYAAAEAAAAHAAAAMTM0MTEwAABAALuABCECIEJoDUOxnIc5v9uRiAAA +AABShgAAayOfs7vcywELAB8OAQAAAAIB+A8BAAAAEAAAAKEZQxjQ2XpLl7QEMJ4hpikCAfoPAQAA +ABAAAAChGUMY0Nl6S5e0BDCeIaYpAwD+DwUAAAADAA00/T+lBgMADzT9P6UGAgEUNAEAAAAQAAAA +TklUQfm/uAEAqgA32W4AAAIBfwABAAAAMQAAADAwMDAwMDAwQTExOTQzMThEMEQ5N0E0Qjk3QjQw +NDMwOUUyMUE2MjlFNDU3MjcwMAAAAAADAAYQAAAAAAMABxAAAAAAAwAQEAAAAAADABEQAAAAAB4A +CBABAAAAAQAAAAAAAABQXAICkAYADgAAAAEAAAAAACAAIAAAAAAAQQACE4ADAA4AAADbBwMABwAL +ACAABgABAB4BAg+ABgALAAAASGVsbG8gV29ybGQcBAIQgAEADAAAAEVuZ2xpc2gudHh0AFgEAhGA +BgC4DQAAAQAJAAAD3AYAAAAAIQYAAAAABQAAAAkCAAAAAAUAAAABAv///wClAAAAQQvGAIgAIAAg +AAAAAAAgACAAAAAAACgAAAAgAAAAQAAAAAEAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAA+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAA +D/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAf ++AAAP/iIgH/4AAD/+AAB//////////////////////8hBgAAQQtGAGYAIAAgAAAAAAAgACAAAAAA +ACgAAAAgAAAAIAAAAAEAGAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAADW1tb5+vr5+vr5+vr5+fn5+fn4+fn4+fn4+fn4+fn4+Pj4+Pj3 ++Pj3+Pj39/f29/f29/f29/f29/f29/f7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AADW1tbw6+Tg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg +1sjg1sjw6+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb9/f36+vr6+vr5+vr5 ++vr5+vr5+fn5+fn4+fn4+fn4+fn4+fn4+Pj3+Pj3+Pj39/f39/f29/f29/f7+/sAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tbw6+Tg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg +1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjw6+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAADW1tb9/f36+/v6+vr6+vr6+vr5+vr5+vr5+vr5+fn5+fn4+fn4+fn4+fn3+Pj3+Pj3+Pj3 ++Pj3+Pj39/f7+/sAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tbw6+Tg1sjg1sjg +1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjw6+QAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb9/f37+/v6+/v6+/v6+/v6+vr6+vr6+vr5+vr5 ++vr5+vr5+fn5+fn4+fn4+Pj3+Pj3+Pj3+Pj3+Pj7/PwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAADW1tbw6+Tg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg +1sjg1sjg1sjg1sjw6+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb9/v77+/v7 ++/v7+/v7+/v6+/v6+/v6+vr6+vr6+vr5+vr5+vr5+vr4+fn4+fn4+fn4+Pj4+Pj3+Pj7/PwAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tbw6+Tg1sjg1sjg1sjg1sjg1sjg1sjg1sjg +1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjw6+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAADW1tb+/v78/Pz7/Pz7/Pz7+/v7+/v7+/v6+/v6+/v6+/v6+vr6+vr6+vr5+fn5 ++fn4+fn4+fn4+fn4+fn8/PwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tbw6+Tg +1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjw6+QA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb+/v78/Pz8/Pz8/Pz7/Pz7/Pz7+/v7 ++/v7+/v7+/v6+/v6+/v6+vr5+vr5+vr5+fn5+fn4+fn4+fn8/PwAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAADW1tbw6+Tg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg +1sjg1sjg1sjg1sjg1sjg1sjw6+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb+ +/v78/f38/Pz8/Pz8/Pz8/Pz8/Pz7/Pz7/Pz7+/v7+/v7+/v6+/v6+vr6+vr5+vr5+vr5+vr5+fn8 +/PwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tbw6+Tg1sjg1sjg1sjg1sjg1sjg +1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjw6+QAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAADW1tb+/v79/f39/f38/f38/Pz8/Pz8/Pz8/Pz8/Pz7/Pz7/Pz7+/v7 ++/v6+/v6+vr6+vr6+vr5+vr5+vr8/f0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW +1tbw6+Tg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg1sjg +1sjq6uoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb+/v79/f39/f39/f39/f39 +/f38/f38/Pz8/Pz8/Pz8/Pz8/Pz7/Pz7+/v6+/v6+/vW1tbOzs6/v7+4uLgAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAADW1tb9/f39/f39/f39/f39/f39/f39/f38/f38/Pz8/Pz8/Pz8 +/Pz8/Pz7+/uysrKrq6upqampqamvr6+1tbUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AADW1tb+/v79/f39/f39/f39/f39/f39/f39/f38/f38/Pz8/Pz8/Pz8/Pz7+/vGxsb19fX09PTj +4+O5ubkxMTEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb+/v7+/v79/v79/f39 +/f39/f38/f38/Pz8/Pz8/Pz8/Pz8/Pz7/Pz7/PzOzs76+vrr6+vHx8c0NDQAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb//v7s6enEv7/y7/D9/f3s6enEv7/y7/D8/Pzs6enE +v7/y7/D8/Pz8/PzNzc3k5OTGxsYxMTEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAADW1tb//v69uLgAAADd2tr9/f29uLgAAADd2tr8/f29uLgAAADd2tr8/Pzq6urDw8PHx8cv +Ly8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tb//v7s6enEv7/z +8PD9/f3s6enEv7/z8PD9/f3s6enEv7/z8PD8/Pzc3Ny/v7+urKwAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADW1tbW1tbW1tb28/PW1tbW1tbW1tb28/PW1tbW1tbW +1tb28/PW1tbW1tbMzMzDwcHHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAA+zwIFkAYABAEAABQAAAAD +ACAORw4AAB4AATABAAAADAAAAEVuZ2xpc2gudHh0AAIBAjcBAAAAAAAAAB4AAzcBAAAABQAAAC50 +eHQAAAAAAwAFNwEAAAAeAAc3AQAAAAwAAABFbmdsaXNoLnR4dAADAAs3AAAAAAMAFDcAAAAAAwD6 +fwAAAABAAPt/AEDdo1dFswxAAPx/AEDdo1dFswwDAP1/AAAAAAsA/n8AAAAACwD/fwAAAAADACEO +pYQAAAIB+A8BAAAAEAAAAKEZQxjQ2XpLl7QEMJ4hpikCAfoPAQAAABAAAAChGUMY0Nl6S5e0BDCe +IaYpAwD+DwcAAAADAA00/T+lBgMADzT9P6UG5DICApAGAA4AAAABAB8AAAAgACAAAAAAAGAAAhOA +AwAOAAAA2wcDAAcACwATAAIAAQANAQIPgAYAFQAAAEJvbmpvdXIgdG91dCBsZSBtb25kZe8HAhCA +AQALAAAARnJlbmNoLnR4dADkAwIRgAYAuA0AAAEACQAAA9wGAAAAACEGAAAAAAUAAAAJAgAAAAAF +AAAAAQL///8ApQAAAEELxgCIACAAIAAAAAAAIAAgAAAAAAAoAAAAIAAAAEAAAAABAAEAAAAAAAAB +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAA/4AAAP+AAAD/gAAA/4 +AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gAAA/4AAAP+AAAD/gA +AA/4AAAP+AAAD/gAAA/4AAAP+AAAH/gAAD/4iIB/+AAA//gAAf//////////////////////IQYA +AEELRgBmACAAIAAAAAAAIAAgAAAAAAAoAAAAIAAAACAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW+fr6+fr6+fr6+fn5 ++fn5+Pn5+Pn5+Pn5+Pn5+Pj4+Pj49/j49/j49/f39vf39vf39vf39vf39vf3+/v7AAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW8Ovk4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI +4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI8OvkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAA1tbW/f39+vr6+vr6+fr6+fr6+fr6+fn5+fn5+Pn5+Pn5+Pn5+Pn5+Pj49/j49/j49/f3 +9/f39vf39vf3+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW8Ovk4NbI4NbI +4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI8OvkAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW/f39+vv7+vr6+vr6+vr6+fr6+fr6+fr6+fn5 ++fn5+Pn5+Pn5+Pn59/j49/j49/j49/j49/j49/f3+/v7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAA1tbW8Ovk4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI +4NbI4NbI4NbI4NbI8OvkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW/f39+/v7 ++vv7+vv7+vv7+vr6+vr6+vr6+fr6+fr6+fr6+fn5+fn5+Pn5+Pj49/j49/j49/j49/j4+/z8AAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW8Ovk4NbI4NbI4NbI4NbI4NbI4NbI4NbI +4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI8OvkAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAA1tbW/f7++/v7+/v7+/v7+/v7+vv7+vv7+vr6+vr6+vr6+fr6+fr6+fr6+Pn5 ++Pn5+Pn5+Pj4+Pj49/j4+/z8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW8Ovk +4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI8Ovk +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW/v7+/Pz8+/z8+/z8+/v7+/v7+/v7 ++vv7+vv7+vv7+vr6+vr6+vr6+fn5+fn5+Pn5+Pn5+Pn5+Pn5/Pz8AAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAA1tbW8Ovk4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI +4NbI4NbI4NbI4NbI4NbI4NbI8OvkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW +/v7+/Pz8/Pz8/Pz8+/z8+/z8+/v7+/v7+/v7+/v7+vv7+vv7+vr6+fr6+fr6+fn5+fn5+Pn5+Pn5 +/Pz8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1tbW8Ovk4NbI4NbI4NbI4NbI4NbI +4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI4NbI8OvkAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAA1tbW/v7+/P39/Pz8/Pz8/Pz8/Pz8/Pz8+/z8+/z8+/v7+/v7+/v7 ++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 +FAAGAAgAAAAhAN38lTdmAQAAIAUAABMACAJbQ29udGVudF9UeXBlc10ueG1sIKIEAiigAAIAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALRUy27C +MBC8V+o/RL5WiaGHqqoIHPo4tkilH2DsDVj1S/by+vtuAkRVC0Eq5RIpWe/M7OzEg9HammwJMWnv +StYveiwDJ73Sblayj8lLfs+yhMIpYbyDkm0gsdHw+mow2QRIGXW7VLI5YnjgPMk5WJEKH8BRpfLR +CqTXOONByE8xA37b691x6R2CwxxrDDYcPEElFgaz5zV93iqJYBLLHrcHa66SiRCMlgJJKV869YMl +3zEU1NmcSXMd0g3JYPwgQ105TrDreyNrolaQjUXEV2FJBl/5qLjycmFphqIb5oBOX1VaQttfo4Xo +JaREnltTtBUrtNvrP6oj4cZA+n8VW9wuetI5jj4kTns5mx/qzStQOVkRIKKGdnXHRwdEsuwSw++Q +u8ZvUoCUd+DNs3+2Bw3MScqKfomJmBo4m+9X8lrokyJWMH2/mPvfwLuEtPmTPv7BjP11UXcfSB1v +7rfhFwAAAP//AwBQSwMEFAAGAAgAAAAhAB6RGrfzAAAATgIAAAsACAJfcmVscy8ucmVscyCiBAIo +oAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AACMkttKA0EMhu8F32HIfTfbCiLS2d5IoXci6wOEmewBdw7MpNq+vaMgulDbXub058tP1puDm9Q7 +pzwGr2FZ1aDYm2BH32t4bbeLB1BZyFuagmcNR86waW5v1i88kZShPIwxq6Lis4ZBJD4iZjOwo1yF +yL5UupAcSQlTj5HMG/WMq7q+x/RXA5qZptpZDWln70C1x1g2X9YOXTcafgpm79jLiRXIB2Fv2S5i +KmxJxnKNain1LBpsMM8lnZFirAo24Gmi1fVE/1+LjoUsCaEJic/zfHWcA1peD3TZonnHrzsfIVks +Fn17+0ODsy9oPgEAAP//AwBQSwMEFAAGAAgAAAAhAGN+dp0yAQAA6AMAABwACAF3b3JkL19yZWxz +L2RvY3VtZW50LnhtbC5yZWxzIKIEASigAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +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 +59z65tr65tn65df65Nb649T64tP54NL54M/53s753cz53Mr528j0nGNeRi4AAAAAAAAAAAAAAAAA +AAAAAAAAAAC7ppf87uT77eT87eT77OT77OP86+L76+L76+D76t/76d/76d376Nz659r65tr65Nj6 +5Nb54tT64dP64NH538/53s353MrznWVeRi4AAAAAAAAAAAAAAAAAAAAAAAAAAAC7p5j87+f87+f7 +7+b87+b87+b87eX87eT87eT87OP86+L86uH86t/76t776Nz759v65tr65df65NX64tP54dH64ND6 +387ynmheRi4AAAAAAAAAAAAAAAAAAAAAAAAAAAC8qJj88er88en88er88On88On88Oj97+j87+f8 +7ub87uX87eT87OP87OHTqYvSqInRpofRpYbQpITPo4P649X64dL64NDxoGteRi4AAAAAAAAAAAAA +AAAAAAAAAAAAAAC9qZr98+398+398+z98uz98+v98uv88ur98er98en88Oj87+f87ub87eT87eP8 +6+H76t/76d376Nz65tn65Nf649b64tPwom5eRi4AAAAAAAAAAAAAAAAAAAAAAAAAAAC+qpv99e/9 +9O/jwajiv6XhvaPfu6HeuZ7dt5zbtZras5fZsZXYsJPXrpHWrI/Vq43UqYvSqInSpojRpYb759r6 +5dj649bvo3FeRi4AAAAAAAAAAAAAAAAAAAAAAAAAAAC/q5z+9vH99vH99vH99vH99vH+9fD99fD9 +9fD99O/98+798+398uz88er88On87+f87uX87eT86+L86t/76N3759r65djtpXVeRi4AAAAAAAAA +AAAAAAAAAAAAAAAAAADArJ79+PP99/Pmxa3lw6vjwajhvqXgvKLeuqDeuZ/dt5zctpratJjZspbY +sJPXrpHWrY/Vq43UqovTqIr76uD76d3759vtp3leRi4AAAAAAAAAAAAAAAAAAAAAAAAAAADBrp7+ ++fX++fX++fX++PX++PX++PX++PX99/T+9/P+9/P99/L99vH99fD99O798+388uv88en87+f87uT7 +7OL76uD76N3rqX1eRi4AAAAAAAAAAAAAAAAAAAAAAAAAAADCrp/++vf++vfoybHnx6/mxa3lw6vj +wqjiwKbhvqTgvKHeup/duJzctpratJjZspbYsJTXrpHWrY/Vq4787uX87OP76t/pq4NeRi4AAAAA +AAAAAAAAAAAAAAAAAAAAAACunI/f3Nnb2NXV0c7Qy8rJxcPFwb/KxsTOysjx7On79vP9+PX++PX+ ++PT+9/P99vH99fD99O398uv88en87+f87eT87OLorodeRi4AAAAAAAAAAAAAAAAAAAAAAAAAAACQ +gXS0sa+tq6mTemmYg3KikIK3p5nKu6zCrJm6oY/duqHgvaPgvKLeup/duJ3ctpvbtJjZspbYsJTX +r5L88en97+f87eTmr4teRi4AAAAAAABuNyNzOiVqNiJ3UkSOeG6vnZbFuLLe1tL18ez8+PP79u/5 +9Ov48ue+qZvY1tTr6Ob9+vj++/n++vj++fb++PX99/P99vH99O/98+398uv98Oj87ublsY9eRi4A +AAAAAACKSS7euaq+movRppX////////////+/vz+/Pr9+vb8+PP79u/59OvBqpy/o47Ss5zjwaji +wKfhvqTgvKLfuqDduJ3ctpvbtJjas5b98+388er88Ojls5JeRi4AAAAAAACMSjHatqmxcFbTvbT/ +///68vDoxL3////z4t3ZnpP9+vb8+PP79u/NvLDU0tLr6ej+/Pv+/Pv+/Pr++/n++vj++fb++PT9 +9/P99vH99O798u398erktZZeRi4AAAAAAACQTDTZtaakUS+4jXn////58e+3WkP37erx4NyzUjns +1M39+vb8+PPYy8HRz8/q6Oj+/Pz//fzOoYHOoYHOoYHOoYHOoYHOoYHOoYH+9fD99O798uzit5pe +Ri4AAAAAAACSUDfYtKSiTSqkZk3////+/fykRSW/e2Xv39mnSy25cFf8+PX9+vbj2NHPzs3p6Of+ +/fz//fzzyqrmvqLnw6fnv6Tis5PktpfOoYH+9vH99O/98+3huZxeRi4AAAAAAACUUzrYs6WiTSqQ +QyT///////+fRiLFkHjIl4OgSCXVsKDOoo/+/Prw6uXMy8vo5+f+/f3//v3zyqrZqYjfspLluZvg +sZLkt5nOoYH+9vL99vD98+7hup9eRi4AAAAAAACVVjvYtKWkTSuLNxTx6+n///+lUzHp1s6xaUyf +RyT+/fyvZUfv4dn7+PbJyMjm5eX9/Pz//v3zyqrpwaXow6jmvqLer47juJnOoYH+9/P99vH99e/f +u6FeRi4AAAAAAACXWEDmy8HHjnOxdV3h1c/7+PemVTTVsKDv4dymVTT////BiXC8gGX+/vzLysrl +5OT9/Pz//v3zyqr049fs2Mr79fDkwqrjwafiv6Xeu6Xeu6Xeu6XfvKNeRi4AAAAAAACZWkLp0MfP +moW9hm/Wwrr59PHr2NHs29T////////////////////////R0NDl5OT8+/v//v3zyqr9+fb+/f3r +18m+rJ2MdGGIcFyBaVV4YUxwWUNoUTpeRi4AAAAAAACTWEDn0MbXqpfIlH3Ps6j///////////// +///////////////////////g39/p6Oj9/Pz//v3zyqr////79O/049e/rZ3s0r/qzrvnyrXkxK7h +vqleRi4jIiIAAAAAAABrQjDVsKHw3dbUoo/VsaL////////////////9/Pzx6eXz7Or07+7cysL0 +8/P7+vr+/f3//v7zyqrzyqrzyqrzyqrBrp//7uT76Nz03tDu1MNeRi4jIiIWFhUAAAAAAAAgEg2o +aU3kyL7y4NrSpZTSpZTSpZTVqJfXqZjXqZjYqpjSpZTSpZS1hGz8+/v+/f3//v7//v7//v3+/v3/ +/fz//fvCsKD/7uT76Nz13tBjTDQjIiIWFhUAAAAAAAAAAAAAAABAJx2mZ07Urp/15d/05N705N70 +5N715d/15d/15d/15d/15d+7iHH+/f3//v7//v7//v7//v3//f3//fz//fvEsqP/7uT76NxqUzwj +IiIWFhUAAAAAAAAAAAAAAAAAAAAAAAAWDAlvRzeaYkyvcFWvcFWvcFWvcFWvcFWvcFWvcFWvcFW9 +i3L//v7//v7//v7//v7//v7//v3//f3//fzGtKT/7uSDbFcjIiIWFhUAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAADRv7H//////////////////////////////////////////v7///7//v7/ +/v7//f3//fzItaWchnIjIiIWFhUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADRv7HR +v7HRv7HRv7HQvrDPva/Pva/PvK7Nu63Nu6zNuazMuavLuKrKt6nKt6jJtqfItqfJtqYjIiIVFRUA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD +AAAAAADaYAIFkAYABAEAABQAAAADACAO3jUAAB4AATABAAAADAAAAEdlcm1hbi5kb2N4AAIBAjcB +AAAAAAAAAB4AAzcBAAAABgAAAC5kb2N4AAAAAwAFNwEAAAAeAAc3AQAAAAwAAABHZXJtYW4uZG9j +eAADAAs3PgAAAAMAFDcAAAAAAwD6fwAAAABAAPt/AEDdo1dFswxAAPx/AEDdo1dFswwDAP1/AAAA +AAsA/n8AAAAACwD/fwAAAAADACEO5YQAAAIB+A8BAAAAEAAAAKEZQxjQ2XpLl7QEMJ4hpikCAfoP +AQAAABAAAAChGUMY0Nl6S5e0BDCeIaYpAwD+DwcAAAADAA00/T+lBgMADzT9P6UGKzQ= + +------=_NextPart_000_003D_01CBDCBB.B59ECF30--