Author: michiel
Date: 2009-10-20 22:10:34 +0200 (Tue, 20 Oct 2009)
New Revision: 39257
Added:
mmbase/trunk/applications/resources/src/test/resources/
mmbase/trunk/applications/resources/src/test/resources/org/
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
Removed:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
Modified:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/INDEX
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/INDEX
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datetime.xml
Log:
moved 'resources' builders to resources
Copied:
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
(from rev 39230,
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml)
===================================================================
---
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
(rev 0)
+++
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<builder
+ xmlns="http://www.mmbase.org/xmlns/builder";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
+ http://www.mmbase.org/xmlns/builder.xsd";
+ name="blob_on_disk" maintainer="mmbase.org" version="0" extends="object">
+ <names>
+ <singular xml:lang="en">blob_on_disk</singular>
+ <plural xml:lang="en">blobs_on_disk</plural>
+ </names>
+
+ <descriptions>
+ </descriptions>
+
+ <fieldlist>
+
+ <field name="url">
+ <editor><positions><list>1</list></positions></editor>
+ <datatype base="file" xmlns="http://www.mmbase.org/xmlns/datatypes"; />
+ </field>
+
+ <field name="filesize" state="system">
+ <editor><positions><list>2</list></positions></editor>
+ <datatype base="filesize" xmlns="http://www.mmbase.org/xmlns/datatypes";
/>
+ </field>
+
+ </fieldlist>
+</builder>
Property changes on:
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
(from rev 39230,
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml)
===================================================================
---
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
(rev 0)
+++
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<builder
+ xmlns="http://www.mmbase.org/xmlns/builder";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
+ http://www.mmbase.org/xmlns/builder.xsd";
+ name="extends_blob_on_disk" maintainer="mmbase.org" version="0"
extends="blob_on_disk">
+ <names>
+ <singular xml:lang="en">blob_on_disk</singular>
+ <plural xml:lang="en">blobs_on_disk</plural>
+ </names>
+
+ <descriptions>
+ </descriptions>
+
+ <fieldlist>
+
+
+
+ </fieldlist>
+</builder>
Property changes on:
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied:
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
(from rev 39230,
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml)
===================================================================
---
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
(rev 0)
+++
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<builder
+ xmlns="http://www.mmbase.org/xmlns/builder";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
+ http://www.mmbase.org/xmlns/builder.xsd";
+ name="extends_images" maintainer="mmbase.org" version="0" extends="images">
+
+</builder>
Property changes on:
mmbase/trunk/applications/resources/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:mergeinfo
+
Modified: mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/INDEX
===================================================================
--- mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/INDEX
2009-10-20 20:09:38 UTC (rev 39256)
+++ mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/INDEX
2009-10-20 20:10:34 UTC (rev 39257)
@@ -7,11 +7,8 @@
./tests/cc.xml
./tests/dd.xml
./tests/xx.xml
-./tests/extends_blob_on_disk.xml
./tests/mustbechanged.xml
./tests/aaerrors.xml
./tests/legacy_types.xml
-./tests/blob_on_disk.xml
-./tests/extends_images.xml
./tests/invalid_defaults.xml
./tests/processors.xml
Modified:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/INDEX
===================================================================
--- mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/INDEX
2009-10-20 20:09:38 UTC (rev 39256)
+++ mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/INDEX
2009-10-20 20:10:34 UTC (rev 39257)
@@ -5,11 +5,8 @@
./cc.xml
./dd.xml
./xx.xml
-./extends_blob_on_disk.xml
./mustbechanged.xml
./aaerrors.xml
./legacy_types.xml
-./blob_on_disk.xml
-./extends_images.xml
./invalid_defaults.xml
./processors.xml
Deleted:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
===================================================================
---
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
2009-10-20 20:09:38 UTC (rev 39256)
+++
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/blob_on_disk.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<builder
- xmlns="http://www.mmbase.org/xmlns/builder";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
- http://www.mmbase.org/xmlns/builder.xsd";
- name="blob_on_disk" maintainer="mmbase.org" version="0" extends="object">
- <names>
- <singular xml:lang="en">blob_on_disk</singular>
- <plural xml:lang="en">blobs_on_disk</plural>
- </names>
-
- <descriptions>
- </descriptions>
-
- <fieldlist>
-
- <field name="url">
- <editor><positions><list>1</list></positions></editor>
- <datatype base="file" xmlns="http://www.mmbase.org/xmlns/datatypes"; />
- </field>
-
- <field name="filesize" state="system">
- <editor><positions><list>2</list></positions></editor>
- <datatype base="filesize" xmlns="http://www.mmbase.org/xmlns/datatypes";
/>
- </field>
-
- </fieldlist>
-</builder>
Modified:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
===================================================================
---
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
2009-10-20 20:09:38 UTC (rev 39256)
+++
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
<builder
xmlns="http://www.mmbase.org/xmlns/builder";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
Modified:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datetime.xml
===================================================================
---
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datetime.xml
2009-10-20 20:09:38 UTC (rev 39256)
+++
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/datetime.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<builder
+<builder
xmlns="http://www.mmbase.org/xmlns/builder";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
- http://www.mmbase.org/xmlns/builder.xsd";
- name="datatypes" maintainer="mmbase.org" version="0" extends="object">
+ xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
+ http://www.mmbase.org/xmlns/builder.xsd";
+ name="datetime" maintainer="mmbase.org" version="0" extends="object">
<names>
<singular xml:lang="en">datetimes</singular>
<plural xml:lang="en">datatimes</plural>
Deleted:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
===================================================================
---
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
2009-10-20 20:09:38 UTC (rev 39256)
+++
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_blob_on_disk.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<builder
- xmlns="http://www.mmbase.org/xmlns/builder";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
- http://www.mmbase.org/xmlns/builder.xsd";
- name="extends_blob_on_disk" maintainer="mmbase.org" version="0"
extends="blob_on_disk">
- <names>
- <singular xml:lang="en">blob_on_disk</singular>
- <plural xml:lang="en">blobs_on_disk</plural>
- </names>
-
- <descriptions>
- </descriptions>
-
- <fieldlist>
-
-
-
- </fieldlist>
-</builder>
Deleted:
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
===================================================================
---
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
2009-10-20 20:09:38 UTC (rev 39256)
+++
mmbase/trunk/core/src/test/resources/org/mmbase/config/builders/tests/extends_images.xml
2009-10-20 20:10:34 UTC (rev 39257)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<builder
- xmlns="http://www.mmbase.org/xmlns/builder";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
- http://www.mmbase.org/xmlns/builder.xsd";
- name="extends_images" maintainer="mmbase.org" version="0" extends="images">
-
-</builder>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
