Author: nico
Date: 2009-05-18 13:22:31 +0200 (Mon, 18 May 2009)
New Revision: 35236
Added:
CMSContainer/trunk/CMSContainer/cmsc/utilities/config/storage/databases/mysql-cmsc-disk.xml
Modified:
CMSContainer/trunk/CMSContainer/.classpath
CMSContainer/trunk/CMSContainer/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Modules/.classpath
CMSContainer/trunk/CMSContainer_Modules/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Portlets/.classpath
CMSContainer/trunk/CMSContainer_Portlets/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.properties
CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.properties
Log:
CMSC-1404 Large binaries are slow to upload
Modified: CMSContainer/trunk/CMSContainer/.classpath
===================================================================
--- CMSContainer/trunk/CMSContainer/.classpath 2009-05-18 10:45:25 UTC (rev
35235)
+++ CMSContainer/trunk/CMSContainer/.classpath 2009-05-18 11:22:31 UTC (rev
35236)
@@ -89,7 +89,7 @@
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-descriptors-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
@@ -99,32 +99,32 @@
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-email-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-email-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
Added:
CMSContainer/trunk/CMSContainer/cmsc/utilities/config/storage/databases/mysql-cmsc-disk.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/config/storage/databases/mysql-cmsc-disk.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/config/storage/databases/mysql-cmsc-disk.xml
2009-05-18 11:22:31 UTC (rev 35236)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE storage PUBLIC "-//MMBase//DTD storage config 1.0//EN"
"http://www.mmbase.org/dtd/storage_1_0.dtd"; >
+<storage>
+ <!-- MySQLdb configuration resource. -->
+ <!--
+ This storage definition is different from the MMbase mysql.xml definition
+ 1. it forces all storage identifiers to be lowercase (including the
numbertable)
+ 2. it forces all tables to be created in utf8 even when the database is
set to latin1
+ 3. it only defines disallowed fields which are not defined in the MMBASE
STANDARD or driver keywords
+ -->
+
+ <storagemanagerfactory
classname="org.mmbase.storage.implementation.database.DatabaseStorageManagerFactory"
version="0.1" />
+
+ <!-- use the manager for relational databases -->
+ <storagemanager
classname="org.mmbase.storage.implementation.database.RelationalDatabaseStorageManager"
version="0.1" />
+
+ <searchqueryhandler
classname="org.mmbase.storage.search.implementation.database.MySqlSqlHandler" />
+
+ <attributes>
+ <!-- Automatically prefix reserved words with "m_" -->
+ <attribute name="default-storage-identifier-prefix">m</attribute>
+
+ <!-- all storage identifiers for builders and fieldnames are converted to
lowercase -->
+ <attribute name="storage-identifier-case">lower</attribute>
+
+ <!-- MySQL does not default support transactions, but it's Metadata object
claims that it does
+ So set support to false.
+ -->
+ <option name="database-supports-transactions" value="false" />
+
+ <!-- Use Blobs -->
+ <option name="database-supports-blob" />
+
+ <!-- uses different syntax for creating unique key constraints -->
+ <scheme name="create-unique-key-scheme" >UNIQUE INDEX {2} ({2})</scheme>
+ <!-- MySQL does not properly support foreign keys, Still create a least an
index -->
+ <scheme name="create-foreign-key-scheme" >INDEX {2} ({2})</scheme>
+
+ <!-- uses different syntax for composite keys -->
+ <scheme name="create-unique-index-scheme" >ALTER TABLE {1} ADD UNIQUE
INDEX {3} ({2})</scheme>
+ <scheme name="delete-unique-index-scheme" >ALTER TABLE {1} DROP INDEX
{2}</scheme>
+
+ <!-- index -->
+ <scheme name="create-index-scheme" >ALTER TABLE {1} ADD INDEX {3}
({2})</scheme>
+ <scheme name="delete-index-scheme" >ALTER TABLE {1} DROP INDEX {2}</scheme>
+
+ <!-- Add utf8 to all tables even when database is latin1. CMSc uses utf8
everywhere -->
+ <scheme name="create-table-scheme">CREATE TABLE {1} ({2} {3} {5})
character set utf8</scheme>
+ <scheme name="create-object-table-scheme">CREATE TABLE {1} ({2} {3} {5})
character set utf8</scheme>
+
+ <scheme name="create-sequence-scheme">CREATE TABLE {0}_numbertable
({1})</scheme>
+ <scheme name="init-sequence-scheme">INSERT INTO {0}_numbertable ({1})
VALUES ({2,number,##########})</scheme>
+ <scheme name="update-sequence-scheme">UPDATE {0}_numbertable SET {1} = {1}
+ {2}</scheme>
+ <scheme name="read-sequence-scheme">SELECT {1} FROM
{0}_numbertable</scheme>
+ </attributes>
+
+ <!-- List of MMBase objects where the binary data should not be stored in
the database but as a
+ file. This option is only available if by default the database support BLOBs
and the default
+ configuration stores binary data in the database.
+ Of the objects listed here, the binary data is stored as file rather than as
BLOB in the database.
+ The name used here is the name of the table in which the objects of this
type are stored. For example
+ 'images' or 'icaches'.
+ -->
+
+ <store-binary-as-file-objects>
+ <store-binary-as-file-object name="icaches" />
+ <store-binary-as-file-object name="images" />
+ <store-binary-as-file-object name="attachments" />
+ </store-binary-as-file-objects>
+
+
+ <!-- MySQL type mappings -->
+ <type-mappings>
+ <type-mapping name="DOUBLE" type="double" />
+ <type-mapping name="LONG" type="bigint" />
+ <type-mapping name="FLOAT" type="float" />
+ <type-mapping name="INTEGER" type="integer" />
+ <type-mapping name="NODE" type="integer" />
+ <type-mapping name="STRING" min-size="1" max-size="255"
type="varchar({0})" />
+ <type-mapping name="STRING" min-size="256" max-size="65535" type="text" />
+ <type-mapping name="STRING" min-size="65536" max-size="16777216"
type="mediumtext" />
+ <type-mapping name="XML" min-size="1" max-size="255" type="varchar({0})" />
+ <type-mapping name="XML" min-size="256" max-size="65535" type="text" />
+ <type-mapping name="XML" min-size="65536" max-size="16777216"
type="mediumtext" />
+ <type-mapping name="BINARY" min-size="1" max-size="65535" type="blob" />
+ <type-mapping name="BINARY" min-size="65536" max-size="16777216"
type="mediumblob" />
+ <type-mapping name="BINARY" min-size="16777217" max-size="4294967296"
type="longblob" />
+ <type-mapping name="DATETIME" type="DATETIME" />
+ <type-mapping name="BOOLEAN" type="BIT" />
+ </type-mappings>
+
+ <!-- MySQL disallowed fields are retrieved from the database -->
+ <disallowed-fields>
+ <!-- These keywards are not in the STANDARD_SQL_KEYWORDS of mmbase and not
returned by the driver -->
+ <disallowed-field name="columns" replacement="m_columns"/>
+ <disallowed-field name="comment" replacement="m_comment"/>
+ <disallowed-field name="data" replacement="m_data"/>
+ <disallowed-field name="fields" replacement="m_fields"/>
+ <disallowed-field name="hosts" replacement="m_hosts"/>
+ <disallowed-field name="parent" replacement="m_parent"/>
+ <disallowed-field name="status" replacement="m_status"/>
+ <disallowed-field name="text" replacement="m_text"/>
+ <disallowed-field name="type" replacement="m_type"/>
+ <disallowed-field name="index" replacement="m_index"/>
+ </disallowed-fields>
+
+</storage>
Modified: CMSContainer/trunk/CMSContainer/maven-base/project.properties
===================================================================
--- CMSContainer/trunk/CMSContainer/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++ CMSContainer/trunk/CMSContainer/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -8,7 +8,7 @@
maven.multiproject.type=mmbase-module
cmsc.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
pluto.version=1.0.1
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -10,7 +10,7 @@
cmsc.version=1.7-SNAPSHOT
cmscportlets.version=1.7-SNAPSHOT
cmscmodules.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
Modified:
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/maven-base/project.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++
CMSContainer/trunk/CMSContainer_Demo/i18n-demo/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -10,7 +10,7 @@
cmsc.version=1.7-SNAPSHOT
cmscportlets.version=1.7-SNAPSHOT
cmscmodules.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
Modified:
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++
CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -12,7 +12,7 @@
cmscmodules.version=1.7-SNAPSHOT
luceus.version=0.42
lucene.version=2.3.2
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
Modified: CMSContainer/trunk/CMSContainer_Modules/.classpath
===================================================================
--- CMSContainer/trunk/CMSContainer_Modules/.classpath 2009-05-18 10:45:25 UTC
(rev 35235)
+++ CMSContainer/trunk/CMSContainer_Modules/.classpath 2009-05-18 11:22:31 UTC
(rev 35236)
@@ -103,7 +103,7 @@
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-descriptors-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
@@ -113,27 +113,27 @@
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
Modified: CMSContainer/trunk/CMSContainer_Modules/maven-base/project.properties
===================================================================
--- CMSContainer/trunk/CMSContainer_Modules/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++ CMSContainer/trunk/CMSContainer_Modules/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -9,7 +9,7 @@
cmscmodules.version=1.7-SNAPSHOT
cmsc.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
Modified: CMSContainer/trunk/CMSContainer_Portlets/.classpath
===================================================================
--- CMSContainer/trunk/CMSContainer_Portlets/.classpath 2009-05-18 10:45:25 UTC
(rev 35235)
+++ CMSContainer/trunk/CMSContainer_Portlets/.classpath 2009-05-18 11:22:31 UTC
(rev 35236)
@@ -89,7 +89,7 @@
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/org.apache.pluto/jars/pluto-descriptors-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-taglib-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
@@ -99,27 +99,27 @@
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-editwizard-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-dove-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-crontab-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-cloudcontext-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
</classpathentry>
- <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090402.jar">
+ <classpathentry kind="var"
path="MAVEN_REPO/mmbase/jars/mmbase-1.8.7-20090515.jar">
<attributes>
<attribute name="javadoc_location"
value="http://www.mmbase.org/development/api/1.8/"/>
</attributes>
Modified: CMSContainer/trunk/CMSContainer_Portlets/maven-base/project.properties
===================================================================
--- CMSContainer/trunk/CMSContainer_Portlets/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++ CMSContainer/trunk/CMSContainer_Portlets/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -10,7 +10,7 @@
cmscportlets.version=1.7-SNAPSHOT
cmsc.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090103
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
Modified:
CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++
CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -11,7 +11,7 @@
cmscportlets.version=1.7-SNAPSHOT
cmscmodules.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
Modified:
CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.properties
===================================================================
---
CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.properties
2009-05-18 10:45:25 UTC (rev 35235)
+++
CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.properties
2009-05-18 11:22:31 UTC (rev 35236)
@@ -10,7 +10,7 @@
cmsc.version=1.7-SNAPSHOT
cmscportlets.version=1.7-SNAPSHOT
cmscmodules.version=1.7-SNAPSHOT
-mmbase.version=1.8.7-20090402
+mmbase.version=1.8.7-20090515
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
