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

Merge branch 'develop' into feature/REPO-2626_HB2.0

Browse Source
This commit is contained in:
Ancuta Morarasu
2017-09-14 10:41:43 +03:00
parent a51b5f10a1 5826673b67
commit 7814bf18f6
9 changed files with 116 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -32,3 +32,6 @@ target
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
alf_data
/src/main/resources/alfresco-global.properties
/src/main/resources/alfresco/extension/custom-log4j.properties

2
pom.xml
View File

@@ -40,7 +40,7 @@
<dependency.alfresco-mbeans.version>6.0</dependency.alfresco-mbeans.version>
<dependency.alfresco-core.version>6.13</dependency.alfresco-core.version>
<dependency.alfresco-greenmail.version>6.0</dependency.alfresco-greenmail.version>
<dependency.alfresco-data-model.version>6.17</dependency.alfresco-data-model.version>
<dependency.alfresco-data-model.version>6.18</dependency.alfresco-data-model.version>
<dependency.alfresco-jlan.version>6.3</dependency.alfresco-jlan.version>
<dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version>

5
src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -1283,11 +1283,6 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
throw new CmisConstraintException("This document type does requires content!");
}
if (docType.isVersionable() && (versioningState == VersioningState.NONE))
{
throw new CmisConstraintException("This document type is versionable!");
}
if (!docType.isVersionable() && (versioningState != VersioningState.NONE))
{
throw new CmisConstraintException("This document type is not versionable!");

1
src/main/resources/alfresco-global.properties.sample
View File

@@ -29,7 +29,6 @@
#
#img.coders=${img.root}/modules/coders
#img.config=${img.root}/config
#img.gslib=${img.root}/lib
#
# Property to control whether schema updates are performed automatically.

6
src/main/resources/alfresco/subsystems/thirdparty/default/alfresco-pdf-renderer-transform-context.xml vendored
View File

@@ -20,7 +20,7 @@
</entry>
</map>
</property>
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'processPropertiesWindows' : 'processPropertiesUnix'}" />
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesWindows' : 'transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesUnix'}" />
<property name="defaultProperties">
<props>
<prop key="options"></prop>
@@ -47,7 +47,7 @@
</property>
</bean>
<bean id="processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="ALFRESCO-PDF-RENDERER_HOME">
@@ -57,7 +57,7 @@
</property>
</bean>
<bean id="processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.subsys.alfresco-pdf-renderer.processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="ALFRESCO-PDF-RENDERER_HOME">

9
src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform-context.xml vendored
View File

@@ -22,7 +22,7 @@
</entry>
</map>
</property>
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'processPropertiesWindows' : 'processPropertiesUnix'}" />
<property name="processProperties" ref="#{systemProperties['os.name'].contains('Windows') ? 'transformer.worker.ImageMagick.processPropertiesWindows' : 'transformer.worker.ImageMagick.processPropertiesUnix'}" />
<property name="defaultProperties">
<props>
<prop key="options"></prop>
@@ -50,7 +50,7 @@
</property>
</bean>
<bean id="processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.ImageMagick.processPropertiesWindows" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="MAGICK_HOME">
@@ -62,9 +62,6 @@
<entry key="MAGICK_CONFIGURE_PATH">
<value>${img.config}</value>
</entry>
<entry key="GS_LIB">
<value>${img.gslib}</value>
</entry>
<entry key="DYLD_FALLBACK_LIBRARY_PATH">
<value>${img.dyn}</value>
</entry>
@@ -75,7 +72,7 @@
</property>
</bean>
<bean id="processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<bean id="transformer.worker.ImageMagick.processPropertiesUnix" class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="MAGICK_HOME">

1
src/main/resources/alfresco/subsystems/thirdparty/default/imagemagick-transform.properties vendored
View File

@@ -4,4 +4,3 @@ img.dyn=${img.root}/lib
img.exe=${img.root}/bin/convert
img.coders=${img.root}/modules/coders
img.config=${img.root}/config
img.gslib=

58
src/test/java/org/alfresco/opencmis/CMISTest.java
View File

@@ -3669,6 +3669,64 @@ public class CMISTest
}
}
@Test
public void testCreateDocWithVersioningStateNone() throws Exception
{
AuthenticationUtil.pushAuthentication();
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
try
{
// get repository id
final String repositoryId = withCmisService(new CmisServiceCallback<String>()
{
@Override
public String execute(CmisService cmisService)
{
List<RepositoryInfo> repositories = cmisService.getRepositoryInfos(null);
assertTrue(repositories.size() > 0);
RepositoryInfo repo = repositories.get(0);
final String repositoryId = repo.getId();
return repositoryId;
}
}, CmisVersion.CMIS_1_1);
final NodeRef documentNodeRef = withCmisService(new CmisServiceCallback<NodeRef>()
{
@Override
public NodeRef execute(CmisService cmisService)
{
final PropertiesImpl properties = new PropertiesImpl();
String objectTypeId = "cmis:document";
properties.addProperty(new PropertyIdImpl(PropertyIds.OBJECT_TYPE_ID, objectTypeId));
String fileName = "textFile" + GUID.generate();
properties.addProperty(new PropertyStringImpl(PropertyIds.NAME, fileName));
final ContentStreamImpl contentStream = new ContentStreamImpl(fileName, MimetypeMap.MIMETYPE_TEXT_PLAIN, "Simple text plain document");
String nodeId = cmisService.create(repositoryId, properties, repositoryHelper.getCompanyHome().getId(), contentStream, VersioningState.NONE, null, null);
return new NodeRef(nodeId.substring(0, nodeId.indexOf(';')));
}
}, CmisVersion.CMIS_1_1);
// check versioning properties
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<List<Void>>()
{
@Override
public List<Void> execute() throws Throwable
{
assertTrue(nodeService.exists(documentNodeRef));
assertFalse(nodeService.hasAspect(documentNodeRef, ContentModel.ASPECT_VERSIONABLE));
return null;
}
});
}
finally
{
AuthenticationUtil.popAuthentication();
}
}
/**
* MNT-14951: Test that the list of parents can be retrieved for a folder.
*/

12
src/test/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java
View File

@@ -120,6 +120,18 @@ public class ImageMagickContentTransformerTest extends AbstractContentTransforme
}
}
public void testGifToPng() throws Exception
{
ImageTransformationOptions options = new ImageTransformationOptions();
transform(MimetypeMap.MIMETYPE_IMAGE_GIF, MimetypeMap.MIMETYPE_IMAGE_PNG, options);
}
public void testJpegToPng() throws Exception
{
ImageTransformationOptions options = new ImageTransformationOptions();
transform(MimetypeMap.MIMETYPE_IMAGE_JPEG, MimetypeMap.MIMETYPE_IMAGE_PNG, options);
}
public void testPageSourceOptions() throws Exception
{
// Test empty source options