mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merge V1.3 to HEAD (2976:3004)
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@2976 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3004 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -217,7 +217,7 @@
|
||||
<value>imconvert "${source}" ${options} "${target}"</value>
|
||||
</entry>
|
||||
<entry key=".*">
|
||||
<value>imconvert ${source} ${options} ${target}</value>
|
||||
<value>convert ${source} ${options} ${target}</value>
|
||||
</entry>
|
||||
</map>
|
||||
</property>
|
||||
|
@@ -76,6 +76,7 @@
|
||||
<value>alfresco.messages.template-service</value>
|
||||
<value>alfresco.messages.lock-service</value>
|
||||
<value>alfresco.messages.patch-service</value>
|
||||
<value>alfresco.messages.webdav-messages</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
@@ -49,7 +49,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 25MB memory required -->
|
||||
<!-- approx 15MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.aspects"
|
||||
maxElementsInMemory="10000"
|
||||
@@ -58,7 +58,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 50MB memory required -->
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.properties"
|
||||
maxElementsInMemory="10000"
|
||||
@@ -67,7 +67,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 50MB memory required -->
|
||||
<!-- approx 20MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.childAssocs"
|
||||
maxElementsInMemory="10000"
|
||||
@@ -76,7 +76,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 50MB memory required -->
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs"
|
||||
maxElementsInMemory="10000"
|
||||
@@ -85,7 +85,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 70MB memory required -->
|
||||
<!-- approx 250MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.ChildAssocImpl"
|
||||
maxElementsInMemory="200000"
|
||||
@@ -94,7 +94,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 20MB memory required -->
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.sourceNodeAssocs"
|
||||
maxElementsInMemory="10000"
|
||||
@@ -103,7 +103,7 @@
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- approx 20MB memory required -->
|
||||
<!-- approx 10MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.NodeImpl.targetNodeAssocs"
|
||||
maxElementsInMemory="10000"
|
||||
@@ -150,19 +150,19 @@
|
||||
overflowToDisk="false"
|
||||
/>
|
||||
<!-- Permission related caches -->
|
||||
<!-- approx 10MB memory required -->
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"/>
|
||||
<!-- approx 10MB memory required -->
|
||||
<!-- approx 1MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries"
|
||||
maxElementsInMemory="1000"
|
||||
eternal="true"
|
||||
overflowToDisk="false"/>
|
||||
<!-- approx 30MB memory required -->
|
||||
<!-- approx 5MB memory required -->
|
||||
<cache
|
||||
name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"
|
||||
maxElementsInMemory="5000"
|
||||
|
@@ -0,0 +1,9 @@
|
||||
A license is installed by placing the license file (.lic) within this directory.
|
||||
|
||||
Only one license file may exist within this directory.
|
||||
|
||||
Upon restarting the Alfresco server, the license file is read and installed.
|
||||
If installed successfully, the license file is renamed by adding ".installed"
|
||||
to the end of the filename.
|
||||
|
||||
|
13
config/alfresco/messages/webdav-messages.properties
Normal file
13
config/alfresco/messages/webdav-messages.properties
Normal file
@@ -0,0 +1,13 @@
|
||||
# webdav HTML page messages
|
||||
|
||||
webdav.repository_title=Alfresco Content Repository
|
||||
webdav.directory_listing=Directory listing for
|
||||
webdav.column.name=Name
|
||||
webdav.column.size=Size
|
||||
webdav.column.type=Type
|
||||
webdav.column.modifieddate=Modified Date
|
||||
webdav.column.navigate_up=Up a level
|
||||
webdav.err.dir=An error occurred whilst generating the directory listing, please contact the system administrator.
|
||||
webdav.size.bytes=bytes
|
||||
webdav.size.kilobytes=Kb
|
||||
webdav.size.megabytes=Mb
|
@@ -230,21 +230,25 @@
|
||||
<title>Created</title>
|
||||
<type>d:datetime</type>
|
||||
<protected>true</protected>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
</property>
|
||||
<property name="cm:creator">
|
||||
<title>Creator</title>
|
||||
<type>d:text</type>
|
||||
<protected>true</protected>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
</property>
|
||||
<property name="cm:modified">
|
||||
<title>Modified</title>
|
||||
<type>d:datetime</type>
|
||||
<protected>true</protected>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
</property>
|
||||
<property name="cm:modifier">
|
||||
<title>Modifier</title>
|
||||
<type>d:text</type>
|
||||
<protected>true</protected>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
</property>
|
||||
<property name="cm:accessed">
|
||||
<title>Accessed</title>
|
||||
|
Reference in New Issue
Block a user