juergen 2004/04/14 04:56:02
Modified: proposals/tamino readme.txt
proposals/tamino/src/store/org/apache/slide/store/tamino/datastore
XSecurity.java XSecurityMultiUser.java
XUtilDBAccessor.java
proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/schema
XSchemaFactory.java
proposals/tamino/src/store/org/apache/slide/store/tamino/store
XSchemaStore.java XUnavailableStore.java
proposals/tamino/src/store/org/apache/slide/store/tamino/store/monitoring
Monitor.java
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/collection
Collection.java
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config
WebXml.java
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer
ContentSchemaCheck.java XRepairModeToken.java
proposals/tamino/src/urm/org/apache/slide/urm/common
URMInit.java
proposals/tamino/src/util/org/apache/slide/util JDom.java
Log:
prepare for jdom beta 10
Revision Changes Path
1.6 +1 -0 jakarta-slide/proposals/tamino/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/readme.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- readme.txt 7 Apr 2004 11:16:00 -0000 1.5
+++ readme.txt 14 Apr 2004 11:56:01 -0000 1.6
@@ -78,6 +78,7 @@
[xslt] Failed to process /home/mhm/src/projects/slide/inodav/doc/main.xml
o work-around: use Java 1.4
+o tp.functional (on 87) fails with NullPointerException in URMUserImpl if read-only
ssx is used
Running the testsuite
---------------------
1.2 +8 -8
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XSecurity.java
Index: XSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XSecurity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSecurity.java 25 Mar 2004 16:18:00 -0000 1.1
+++ XSecurity.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -33,13 +33,13 @@
import com.softwareag.tamino.db.api.objectModel.TXMLObject;
import com.softwareag.tamino.db.api.objectModel.dom.TDOMObjectModel;
import com.softwareag.tamino.db.api.response.TResponse;
-import org.apache.slide.store.tamino.common.XGlobals;
-import org.apache.slide.store.tamino.tools.stores.XNamespaceConfig;
-import org.apache.slide.store.tamino.tools.stores.XDomainFileHandler;
import java.io.StringReader;
import java.util.Iterator;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.slide.store.tamino.common.XGlobals;
+import org.apache.slide.store.tamino.tools.stores.XNamespaceConfig;
+import org.apache.slide.util.JDom;
import org.jdom.output.XMLOutputter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -602,7 +602,7 @@
*
*/
private static String getElementString (org.jdom.Element e) {
- XMLOutputter out = new XMLOutputter(" ", true);
+ XMLOutputter out = JDom.outputter();
String result = null;
try {
1.2 +6 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XSecurityMultiUser.java
Index: XSecurityMultiUser.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XSecurityMultiUser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSecurityMultiUser.java 25 Mar 2004 16:18:00 -0000 1.1
+++ XSecurityMultiUser.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -41,6 +41,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.slide.store.tamino.common.XGlobals;
import org.apache.slide.store.tamino.tools.stores.XNamespaceConfig;
+import org.apache.slide.util.JDom;
import org.jdom.output.XMLOutputter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -703,7 +704,7 @@
*
*/
private static String getElementString (org.jdom.Element e) {
- XMLOutputter out = new XMLOutputter(" ", true);
+ XMLOutputter out = JDom.outputter();
String result = null;
try {
1.2 +6 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XUtilDBAccessor.java
Index: XUtilDBAccessor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XUtilDBAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XUtilDBAccessor.java 25 Mar 2004 16:18:00 -0000 1.1
+++ XUtilDBAccessor.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -52,6 +52,7 @@
import org.apache.slide.store.tamino.common.XGlobals;
import org.apache.slide.store.tamino.datastore.schema.XSchemaFactory;
import org.apache.slide.store.tamino.datastore.schema.XSchemaKnownProperty;
+import org.apache.slide.util.JDom;
import org.apache.slide.util.XAssertionFailed;
import org.apache.slide.util.XException;
import org.jdom.Document;
@@ -282,7 +283,7 @@
Element outroot = getSchemaElement( taminoCollection, prefixedSchemaName );
if( outroot != null ) {
Document outdoc = new Document( outroot );
- XMLOutputter out = new XMLOutputter( " ", true, "UTF-8" );
+ XMLOutputter out = JDom.outputter();
result = out.outputString( outdoc );
}
return result;
1.2 +6 -6
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/schema/XSchemaFactory.java
Index: XSchemaFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/schema/XSchemaFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSchemaFactory.java 25 Mar 2004 16:18:01 -0000 1.1
+++ XSchemaFactory.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -37,6 +37,7 @@
import org.apache.slide.store.tamino.common.XGlobals;
import org.apache.slide.store.tamino.datastore.XUtilDBAccessor;
import org.apache.slide.util.ClassName;
+import org.apache.slide.util.JDom;
import org.jdom.Attribute;
import org.jdom.Document;
import org.jdom.Element;
@@ -381,8 +382,7 @@
// test only!
if( logger.isLoggable(Level.FINE) ) {
try {
- XMLOutputter xmlout = new XMLOutputter(" ", true);
- xmlout.setTextTrim( true );
+ XMLOutputter xmlout = JDom.outputter();
logger.fine( xmlout.outputString(schemaElem) );
}
catch( Exception x ) {}
1.2 +6 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XSchemaStore.java
Index: XSchemaStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XSchemaStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSchemaStore.java 25 Mar 2004 16:18:04 -0000 1.1
+++ XSchemaStore.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -78,6 +78,7 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.SubjectNode;
import org.apache.slide.util.ClassName;
+import org.apache.slide.util.JDom;
import org.apache.slide.util.Strings;
import org.apache.slide.util.XException;
import org.apache.slide.util.XUri;
@@ -753,7 +754,7 @@
*
*/
void commit() throws IOException {
- XMLOutputter xmlout = new XMLOutputter( " ", true, "UTF-8" );
+ XMLOutputter xmlout = JDom.outputter();
OutputStream outstrm = new BufferedOutputStream(new
FileOutputStream(mf));
xmlout.output( mdoc, outstrm );
outstrm.flush();
1.2 +5 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XUnavailableStore.java
Index: XUnavailableStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XUnavailableStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XUnavailableStore.java 25 Mar 2004 16:18:04 -0000 1.1
+++ XUnavailableStore.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -51,10 +51,10 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.SubjectNode;
import org.apache.slide.util.ClassName;
+import org.apache.slide.util.JDom;
import org.apache.slide.util.XUri;
import org.jdom.Document;
import org.jdom.Element;
-import org.jdom.output.XMLOutputter;
/**
@@ -123,7 +123,7 @@
root.addContent( url );
doc.setRootElement( root );
try {
- unavailContent = new XMLOutputter(" ", true).outputString(doc);
+ unavailContent = JDom.outputter().outputString(doc);
}
catch( Exception x ) {
unavailContent =
1.2 +6 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/monitoring/Monitor.java
Index: Monitor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/monitoring/Monitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Monitor.java 25 Mar 2004 16:18:04 -0000 1.1
+++ Monitor.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.Map;
import org.apache.slide.util.ClassName;
+import org.apache.slide.util.JDom;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.output.XMLOutputter;
@@ -77,7 +78,7 @@
private boolean enabled = true;
/** The XML outputter */
- private XMLOutputter xmlOut = new XMLOutputter( " ", true ); // indent: 2
spaces, newlines=true
+ private XMLOutputter xmlOut = JDom.outputter();
// -------------------------------------------------------------------------
1.2 +4 -4
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/collection/Collection.java
Index: Collection.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/collection/Collection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Collection.java 25 Mar 2004 16:18:04 -0000 1.1
+++ Collection.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -58,7 +58,7 @@
this.connection =
TConnectionFactory.getInstance().newConnection(databaseUrl);
this.schemas = SchemaAdapter.create(connection, collection);
this.content = ContentAdapter.create(connection, collection);
- this.outputter = new XMLOutputter(" ", false, ENCODING);
+ this.outputter = new XMLOutputter();
}
public void save(File dir) throws TException, IOException {
1.2 +5 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config/WebXml.java
Index: WebXml.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config/WebXml.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebXml.java 25 Mar 2004 16:18:04 -0000 1.1
+++ WebXml.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -191,7 +191,7 @@
try {
OutputStreamWriter out = new OutputStreamWriter(new
FileOutputStream(file),"ISO-8859-1");
- XMLOutputter webXmlOut = new XMLOutputter( " ", true ); // indent: 2
spaces, newlines=true
+ XMLOutputter webXmlOut = JDom.outputter();
webXmlOut.setTextNormalize ( true );
webXmlOut.setEncoding("ISO-8859-1");
webXmlOut.output( doc, out );
1.2 +6 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/ContentSchemaCheck.java
Index: ContentSchemaCheck.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/ContentSchemaCheck.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentSchemaCheck.java 25 Mar 2004 16:18:05 -0000 1.1
+++ ContentSchemaCheck.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -26,6 +26,7 @@
import java.util.List;
import org.apache.slide.store.tamino.common.XGlobals;
import org.apache.slide.store.tamino.datastore.XUtilDBAccessor;
+import org.apache.slide.util.JDom;
import org.apache.slide.util.XException;
import org.jdom.Document;
import org.jdom.Element;
@@ -194,7 +195,7 @@
}
public void apply(XTaminoClient notUsed) throws XException {
- XMLOutputter out = new XMLOutputter( " ", true, "UTF-8" );
+ XMLOutputter out = JDom.outputter();
Document schemadoc = new Document( selm );
String schemaStr = out.outputString( schemadoc );
TXMLObject schemaObj = TXMLObject.newInstance( schemaStr );
1.2 +7 -6
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/XRepairModeToken.java
Index: XRepairModeToken.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/XRepairModeToken.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XRepairModeToken.java 25 Mar 2004 16:18:05 -0000 1.1
+++ XRepairModeToken.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -30,6 +30,7 @@
import java.util.Iterator;
import org.apache.slide.store.tamino.common.XGlobals;
import org.apache.slide.util.ClassName;
+import org.apache.slide.util.JDom;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -169,7 +170,7 @@
* @return document as a string
*/
public String outputDocument() throws IOException {
- XMLOutputter outputter = new XMLOutputter( " ", true ); //indent=" ",
newlines=true
+ XMLOutputter outputter = JDom.outputter();
return outputter.outputString( doc );
}
@@ -179,7 +180,7 @@
* @param out outputstream
*/
public void outputDocument( OutputStream out ) throws IOException {
- XMLOutputter outputter = new XMLOutputter( " ", true ); //indent=" ",
newlines=true
+ XMLOutputter outputter = JDom.outputter();
outputter.output( doc, out );
}
1.2 +7 -8
jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMInit.java
Index: URMInit.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/urm/org/apache/slide/urm/common/URMInit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URMInit.java 25 Mar 2004 16:18:09 -0000 1.1
+++ URMInit.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -426,8 +426,7 @@
// parse the template
SAXBuilder sax = new SAXBuilder();
Document template = sax.build( in );
- Element elem = template.getRootElement();
- result = TXMLObject.newInstance(new DOMOutputter().output(elem));
+ result = TXMLObject.newInstance(new DOMOutputter().output(template));
result.setCollection(collection);
}
catch (IOException e) {
@@ -484,7 +483,7 @@
}
}
}
- result = TXMLObject.newInstance(new DOMOutputter().output(elem));
+ result = TXMLObject.newInstance(new DOMOutputter().output(template));
result.setCollection(collection);
}
@@ -565,7 +564,7 @@
}
// create schema instance
- result = TXMLObject.newInstance(new DOMOutputter().output(schemaElem));
+ result = TXMLObject.newInstance(new DOMOutputter().output(template));
return result;
}
@@ -715,7 +714,7 @@
}
// create schema instance
- result = TXMLObject.newInstance(new DOMOutputter().output(schemaElem));
+ result = TXMLObject.newInstance(new DOMOutputter().output(template));
return result;
}
1.2 +4 -16
jakarta-slide/proposals/tamino/src/util/org/apache/slide/util/JDom.java
Index: JDom.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/util/org/apache/slide/util/JDom.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDom.java 25 Mar 2004 16:18:11 -0000 1.1
+++ JDom.java 14 Apr 2004 11:56:02 -0000 1.2
@@ -120,18 +120,6 @@
return outputter().outputString( ele );
}
- public static String toTrimmedString (Element ele) {
-
- XMLOutputter out = outputter ();
- out.setTextTrim (true);
- out.setTextNormalize (false);
-
- out.setIndent ("");
- out.setNewlines(false);
-
- return out.outputString( ele );
- }
-
public static Document forString(String str) throws JDOMException, IOException {
SAXBuilder builder;
Document doc;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
