Author: jkoster
Date: 2009-11-13 17:15:35 +0100 (Fri, 13 Nov 2009)
New Revision: 39686
Modified:
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/pom.xml
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/streams/pom.xml
mmbase/tags/MMBase-1_9_2.2009-11-04/applications/taglib/pom.xml
mmbase/tags/MMBase-1_9_2.2009-11-04/core/pom.xml
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataType.java
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataTypes.java
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/util/xml/BuilderWriter.java
Log:
MMB-1892 - Patch to get MMBase 1.9.2 of 2009-11-04 compiling; also turns off
builder writing toXml.
Modified: mmbase/tags/MMBase-1_9_2.2009-11-04/applications/pom.xml
===================================================================
--- mmbase/tags/MMBase-1_9_2.2009-11-04/applications/pom.xml 2009-11-13
15:36:51 UTC (rev 39685)
+++ mmbase/tags/MMBase-1_9_2.2009-11-04/applications/pom.xml 2009-11-13
16:15:35 UTC (rev 39686)
@@ -38,15 +38,15 @@
<module>email</module>
<module>media</module>
<module>notifications</module>
- <module>searchrelate</module>
- <module>searchrelate/example-webapp</module>
+<!-- <module>searchrelate</module>-->
+<!-- <module>searchrelate/example-webapp</module>-->
<module>richtext</module>
<module>richtext/content</module>
<module>richtext/wiki</module>
<module>rmmci</module>
- <module>rmmci/test</module>
+<!-- <module>rmmci/test</module>-->
<module>jumpers</module>
<module>xmlimporter</module>
@@ -57,8 +57,8 @@
<module>cloudsecurity</module>
<module>streams</module>
- <module>mynews</module>
- <module>vpro-wizards</module>
+<!-- <module>mynews</module>-->
+<!-- <module>vpro-wizards</module>-->
<!-- deprecated-->
Modified: mmbase/tags/MMBase-1_9_2.2009-11-04/applications/streams/pom.xml
===================================================================
--- mmbase/tags/MMBase-1_9_2.2009-11-04/applications/streams/pom.xml
2009-11-13 15:36:51 UTC (rev 39685)
+++ mmbase/tags/MMBase-1_9_2.2009-11-04/applications/streams/pom.xml
2009-11-13 16:15:35 UTC (rev 39686)
@@ -75,6 +75,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.mmbase.tests</groupId>
<artifactId>mmbase-rmmci</artifactId>
@@ -82,25 +83,18 @@
<classifier>client-skinny</classifier>
<scope>test</scope>
</dependency>
+ -->
<!-- Testing on MySQL only for now -->
+ <!--
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.6</version>
<scope>test</scope>
</dependency>
+ -->
</dependencies>
- <repositories>
- <repository>
- <id>mmbase</id>
- <url>http://www.mmbase.org/maven2</url>
- </repository>
- <repository>
- <id>snapshots</id>
- <url>http://www.mmbase.org/snapshots</url>
- </repository>
- </repositories>
<developers>
Modified: mmbase/tags/MMBase-1_9_2.2009-11-04/applications/taglib/pom.xml
===================================================================
--- mmbase/tags/MMBase-1_9_2.2009-11-04/applications/taglib/pom.xml
2009-11-13 15:36:51 UTC (rev 39685)
+++ mmbase/tags/MMBase-1_9_2.2009-11-04/applications/taglib/pom.xml
2009-11-13 16:15:35 UTC (rev 39686)
@@ -75,6 +75,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
<executions>
<execution>
<goals><goal>transform</goal></goals>
Modified: mmbase/tags/MMBase-1_9_2.2009-11-04/core/pom.xml
===================================================================
--- mmbase/tags/MMBase-1_9_2.2009-11-04/core/pom.xml 2009-11-13 15:36:51 UTC
(rev 39685)
+++ mmbase/tags/MMBase-1_9_2.2009-11-04/core/pom.xml 2009-11-13 16:15:35 UTC
(rev 39686)
@@ -190,7 +190,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
+<!--
<dependency>
<groupId>org.mmbase.tests</groupId>
<artifactId>mmbase-rmmci</artifactId>
@@ -198,7 +198,7 @@
<classifier>client-skinny</classifier>
<scope>test</scope>
</dependency>
-
+ -->
</dependencies>
<reporting>
Modified:
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
===================================================================
---
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
2009-11-13 15:36:51 UTC (rev 39685)
+++
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
2009-11-13 16:15:35 UTC (rev 39686)
@@ -75,7 +75,7 @@
private Map<String, Handler<?>> handlers = new ConcurrentHashMap<String,
Handler<?>>();
- private Element xml = null;
+// private Element xml = null;
private String[] styleClasses;
@@ -680,22 +680,18 @@
return clone;
}
- public Element toXml() {
- if (xml == null) {
- xml =
DocumentReader.getDocumentBuilder().newDocument().createElementNS(XMLNS,
"datatype");
- xml.getOwnerDocument().appendChild(xml);
- toXml(xml);
- }
- return xml;
- }
+// public Element toXml() {
+// if (xml == null) {
+// xml =
DocumentReader.getDocumentBuilder().newDocument().createElementNS(XMLNS,
"datatype");
+// xml.getOwnerDocument().appendChild(xml);
+// toXml(xml);
+// }
+// return xml;
+// }
@SuppressWarnings("fallthrough")
public void setXml(Element element) {
- if (element == null) {
- xml = null;
- return;
- }
- xml = DocumentReader.toDocument(element).getDocumentElement();
+ Element xml = DocumentReader.toDocument(element).getDocumentElement();
if (origin != null) {
xml.setAttribute("base", origin.getName());
}
Modified:
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataType.java
===================================================================
---
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataType.java
2009-11-13 15:36:51 UTC (rev 39685)
+++
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataType.java
2009-11-13 16:15:35 UTC (rev 39686)
@@ -397,12 +397,12 @@
public DataType<C> clone(String name);
- /**
- * Returns a DOM element describing this DataType.
- * @return a DOM element describing this DataType.
- * @todo EXPERIMENTAL.
- */
- public org.w3c.dom.Element toXml();
+// /**
+// * Returns a DOM element describing this DataType.
+// * @return a DOM element describing this DataType.
+// * @todo EXPERIMENTAL.
+// */
+// public org.w3c.dom.Element toXml();
/**
* Fills this datatype in another XML (for example in the xml of {...@link
#getOrigin}, to make one
Modified:
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataTypes.java
===================================================================
---
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataTypes.java
2009-11-13 15:36:51 UTC (rev 39685)
+++
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/datatypes/DataTypes.java
2009-11-13 16:15:35 UTC (rev 39686)
@@ -341,44 +341,44 @@
return dataTypeCollector;
}
+//
+// /**
+// * Returns a new XML completely describing the given DataType.
+// * This means that the XML will <em>not</em> have a base attribute.
+// */
+// public static Document toXml(DataType<?> dataType) {
+// // create an inheritance stack
+// LinkedList<DataType<?>> stack = new LinkedList<DataType<?>>();
+// stack.addFirst(dataType);
+// while (dataType.getOrigin() != null) {
+// dataType = dataType.getOrigin();
+// stack.addFirst(dataType);
+// }
+//
+// // new XML
+// Document doc = DocumentReader.getDocumentBuilder().newDocument();
+//
+// // iterate the stack to completely resolve everything.
+// Iterator<DataType<?>> i = stack.iterator();
+// dataType = i.next();
+// Element e = (Element) doc.importNode(dataType.toXml(), true);
+// doc.appendChild(e);
+// dataType.toXml(e);
+// while (i.hasNext()) {
+// dataType = i.next();
+// dataType.toXml(e);
+// }
+// DocumentReader.setPrefix(doc, DataType.XMLNS, "dt");
+// return doc;
+// }
- /**
- * Returns a new XML completely describing the given DataType.
- * This means that the XML will <em>not</em> have a base attribute.
- */
- public static Document toXml(DataType<?> dataType) {
- // create an inheritance stack
- LinkedList<DataType<?>> stack = new LinkedList<DataType<?>>();
- stack.addFirst(dataType);
- while (dataType.getOrigin() != null) {
- dataType = dataType.getOrigin();
- stack.addFirst(dataType);
- }
+// public static void main(String arg[]) throws Exception {
+// DataTypes.initialize();
+// DataType dt = DataTypes.getDataType(arg[0]);
+// if (dt == null) {
+// throw new Exception("No such datatyep " + arg[0]);
+// }
+//
System.out.println(org.mmbase.util.xml.XMLWriter.write(DataTypes.toXml(dt),
true, true));
+// }
- // new XML
- Document doc = DocumentReader.getDocumentBuilder().newDocument();
-
- // iterate the stack to completely resolve everything.
- Iterator<DataType<?>> i = stack.iterator();
- dataType = i.next();
- Element e = (Element) doc.importNode(dataType.toXml(), true);
- doc.appendChild(e);
- dataType.toXml(e);
- while (i.hasNext()) {
- dataType = i.next();
- dataType.toXml(e);
- }
- DocumentReader.setPrefix(doc, DataType.XMLNS, "dt");
- return doc;
- }
-
- public static void main(String arg[]) throws Exception {
- DataTypes.initialize();
- DataType dt = DataTypes.getDataType(arg[0]);
- if (dt == null) {
- throw new Exception("No such datatyep " + arg[0]);
- }
-
System.out.println(org.mmbase.util.xml.XMLWriter.write(DataTypes.toXml(dt),
true, true));
- }
-
}
Modified:
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/util/xml/BuilderWriter.java
===================================================================
---
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/util/xml/BuilderWriter.java
2009-11-13 15:36:51 UTC (rev 39685)
+++
mmbase/tags/MMBase-1_9_2.2009-11-04/core/src/main/java/org/mmbase/util/xml/BuilderWriter.java
2009-11-13 16:15:35 UTC (rev 39686)
@@ -213,13 +213,15 @@
addContentElement("search", "" + pos, positionsElm);
}
- Element dataTypeElm = null;
- DataType dataType = fielddef.getDataType();
- if ((parentField == null) ||
!dataType.equals(parentField.getDataType())) {
- dataTypeElm = (Element) document.importNode(dataType.toXml(),
true);
- }
+// Element dataTypeElm = null;
+// DataType dataType = fielddef.getDataType();
+// if ((parentField == null) ||
!dataType.equals(parentField.getDataType())) {
+// dataTypeElm = (Element)
document.importNode(dataType.toXml(), true);
+// }
- if ((parentField == null) || (dataTypeElm != null) ||
(descriptionsElm != null) || (guiElm != null) || (positionsElm != null)) {
+ if ((parentField == null)
+// || (dataTypeElm != null)
+ || (descriptionsElm != null) || (guiElm != null) ||
(positionsElm != null)) {
addComment("builder.field", fieldname,
""+fielddef.getStoragePosition(), fieldlist);
Element field=document.createElement("field");
fieldlist.appendChild(field);
@@ -237,10 +239,10 @@
editor.appendChild(positionsElm);
field.appendChild(editor);
}
- if (dataTypeElm != null) {
- addComment("builder.field.datatype",field);
- field.appendChild(dataTypeElm);
- }
+// if (dataTypeElm != null) {
+// addComment("builder.field.datatype",field);
+// field.appendChild(dataTypeElm);
+// }
Element db = document.createElement("db");
addComment("builder.field.db",field);
field.appendChild(db);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
