juergen 2004/04/14 05:12:32
Modified: proposals/tamino build.properties.sample readme.txt
proposals/tamino/src/store/org/apache/slide/store/tamino/security/report
XPrincipalHasPrivilegeReport.java
XPrincipalPrivilegeSetReport.java
proposals/tamino/src/store/org/apache/slide/store/tamino/store
XDescriptorsStore.java
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/config
WebXml.java
proposals/tamino/src/util/org/apache/slide/util JDom.java
Log:
switch to slide 2/jdom beta 10
Revision Changes Path
1.6 +12 -12 jakarta-slide/proposals/tamino/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/build.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 13 Apr 2004 12:36:21 -0000 1.5
+++ build.properties.sample 14 Apr 2004 12:12:32 -0000 1.6
@@ -7,17 +7,17 @@
# Slide 2 binary distribution bundled with tomcat, install directory.
# Download from http://jakarta.apache.org/slide
-slide.bindist=x:\\ehm\\inodavext\\Slide 2.0b1 Tomcat 5.0.16
+slide.dist=${basedir}\\..\\..\\dist\\slide
# Jar files from binary distribution. Usually no need to change this.
-slide.kernel.jar=${slide.bindist}\\common\\lib\\slide-kernel-bundle-${slide.version}.jar
-slide.stores.jar=${slide.bindist}\\common\\lib\\slide-stores-${slide.version}.jar
-slide.webdavservlet.jar=${slide.bindist}\\common\\lib\\slide-webdavservlet-${slide.version}.jar
-slide.log4j.jar=${slide.bindist}\\common\\lib\\slide-log4jlogger-${slide.version}.jar
-jta.jar=${slide.bindist}\\common\\lib\\geronimo-jta.jar
-jdom.jar=${slide.bindist}\\common\\lib\\jdom-b9.jar
-log4j.jar=${slide.bindist}\\common\\lib\\log4j-1.2.8.jar
-servlet.jar=${slide.bindist}\\common\\lib\\servlet-api.jar
+slide.kernel.jar=${slide.dist}\\lib\\slide-kernel-${slide.version}.jar
+slide.stores.jar=${slide.dist}\\lib\\slide-stores-${slide.version}.jar
+slide.webdavservlet.jar=${slide.dist}\\lib\\slide-webdavservlet-${slide.version}.jar
+slide.log4j.jar=${slide.dist}\\lib\\slide-log4jlogger-${slide.version}.jar
+jta.jar=${slide.dist}\\lib\\geronimo-jta.jar
+jdom.jar=${basedir}\\..\\..\\lib\\jdom-20040226-.jar
+log4j.jar=${basedir}\\..\\..\\lib\\log4j-1.2.8.jar
+servlet.jar=${slide.dist}\\lib\\servlet-2.3.jar
#
@@ -26,11 +26,11 @@
# Slide 2 webdav client library, install directory.
# Download from http://jakarta.apache.org/slide
-slide.clientbindist=x:\\ehm\\inodavext\\jakarta-slide-webdavclient-bin-2.0beta1
+slide.clientdist=${basedir}\\..\\..\\webdavclient/dist
# Jar files from client library. Usually no need to change this.
-slide.webdavlib.jar=${slide.clientbindist}\\lib\\jakarta-slide-webdavlib-2.0beta1.jar
-commons-httpclient.jar=${slide.clientbindist}\\lib\\commons-httpclient.jar
+slide.webdavlib.jar=${slide.clientdist}\\lib\\jakarta-slide-webdavlib-${slide.version}.jar
+commons-httpclient.jar=${slide.clientdist}\\lib\\commons-httpclient.jar
#
1.7 +18 -14 jakarta-slide/proposals/tamino/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/readme.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- readme.txt 14 Apr 2004 11:56:01 -0000 1.6
+++ readme.txt 14 Apr 2004 12:12:32 -0000 1.7
@@ -3,6 +3,13 @@
TWS is a slide-based WebDAV server that stores content in the Tamino XML database.
+CAUTION:
+ This is Tamino WebDAV Server for Slide HEAD, it doesn't work until SAG released
+ TaminoAPI4J with JDom Beta 10 support.
+
+ If you want to build a version for slide 2, check out with
+ cvs -d [EMAIL PROTECTED]:/home/cvs -q co -P -r TAMINOWEBDAVSERVER_4_2_1
jakarta-slide/proposals/tamino
+
Build instructions
------------------
@@ -17,10 +24,17 @@
ant uses CLASSPATH which might result in obsure problems (like
log4j.ConsoleAppender class
not found)
+o You need a properly built Slide HEAD to run tws:
+ o adjust jakarta-slide/build.properties
+ o run
+ cd jakarta-slide
+ ant dist
+ cd jakarta-slide/webdavclient
+ ant dist-clientlib
+ cd jakarta-slide/testsuite
+ ant make
+
o Build tws:
- o checkout Slide HEAD, it contains tws at jakarta-slide/proposals/tamino
- o note: tws is *not* in the slide 2 release branch!
- caution: to build tws, you'll need the slide 2 release, you cannot build tws
with slide HEAD
o Change to the Tamino WebDAV Server directory
cd jakarta-slide/proposals/tamino
o Create a properties file
@@ -83,16 +97,6 @@
Running the testsuite
---------------------
-o You need a properly built Slide HEAD to run the testsuite:
- o adjust jakarta-slide/build.properties
- o run
- cd jakarta-slide
- ant dist
- cd jakarta-slide/webdavclient
- ant dist-clientlib
- cd jakarta-slide/testsuite
- ant make
-
o Enter Tamino WebDAV Server directory
cd jakarta-slide/proposals/tamino
@@ -134,5 +138,5 @@
o release branch:
cvs -d [EMAIL PROTECTED]:/home/cvs -q co -P -r SLIDE_2_0_RELEASE_BRANCH -d
jakarta-slide-release jakarta-slide
o head
- cvs -d [EMAIL PROTECTED]:/home/cvs -q co -P -d jakarta-slide-head
jakarta-slide
+ cvs -d [EMAIL PROTECTED]:/home/cvs -q co -P jakarta-slide
1.2 +5 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/security/report/XPrincipalHasPrivilegeReport.java
Index: XPrincipalHasPrivilegeReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/security/report/XPrincipalHasPrivilegeReport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPrincipalHasPrivilegeReport.java 25 Mar 2004 16:18:03 -0000 1.1
+++ XPrincipalHasPrivilegeReport.java 14 Apr 2004 12:12:32 -0000 1.2
@@ -129,7 +129,7 @@
multistatusElm.addContent(responseElm);
responseElm.addContent(hrefElm);
- String absUri = WebdavUtils.getAbsolutePath (resourcePath, contextPath,
serverUrl, config);
+ String absUri = WebdavUtils.getAbsolutePath (resourcePath, contextPath,
servletPath, config);
hrefElm.setText(absUri);
responseElm.addContent(propstatElm);
propstatElm.addContent(propElm);
1.2 +5 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/security/report/XPrincipalPrivilegeSetReport.java
Index: XPrincipalPrivilegeSetReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/security/report/XPrincipalPrivilegeSetReport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPrincipalPrivilegeSetReport.java 25 Mar 2004 16:18:03 -0000 1.1
+++ XPrincipalPrivilegeSetReport.java 14 Apr 2004 12:12:32 -0000 1.2
@@ -113,7 +113,7 @@
multistatusElm.addContent(responseElm);
responseElm.addContent(hrefElm);
- hrefElm.setText (WebdavUtils.getAbsolutePath (resourcePath, contextPath,
serverUrl, config));
+ hrefElm.setText (WebdavUtils.getAbsolutePath (resourcePath, contextPath,
servletPath, config));
responseElm.addContent(propstatElm);
propstatElm.addContent(propElm);
propElm.addContent(principalPrivilegeSetElm);
1.2 +6 -8
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XDescriptorsStore.java
Index: XDescriptorsStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/store/XDescriptorsStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XDescriptorsStore.java 25 Mar 2004 16:18:03 -0000 1.1
+++ XDescriptorsStore.java 14 Apr 2004 12:12:32 -0000 1.2
@@ -45,6 +45,7 @@
import org.apache.slide.lock.LockTokenNotFoundException;
import org.apache.slide.lock.NodeLock;
import org.apache.slide.search.basic.IBasicExpressionFactory;
+import org.apache.slide.search.basic.IBasicExpressionFactoryProvider;
import org.apache.slide.store.LockStore;
import org.apache.slide.store.NodeStore;
import org.apache.slide.store.RevisionDescriptorStore;
@@ -83,10 +84,7 @@
*/
public class XDescriptorsStore extends XChildStore
implements LockStore, NodeStore,
- RevisionDescriptorsStore, RevisionDescriptorStore
- /* TODO: needed for slide-head:
- , org.apache.slide.search.basic.IBasicExpressionFactoryProvider
- */
+ RevisionDescriptorsStore, RevisionDescriptorStore,
IBasicExpressionFactoryProvider
{
1.3 +8 -8
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebXml.java 14 Apr 2004 11:56:02 -0000 1.2
+++ WebXml.java 14 Apr 2004 12:12:32 -0000 1.3
@@ -45,7 +45,7 @@
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-
+import org.jdom.output.Format;
/**
** Utility to handle security specific configuration information contained in the
Web.XML
@@ -192,9 +192,9 @@
try {
OutputStreamWriter out = new OutputStreamWriter(new
FileOutputStream(file),"ISO-8859-1");
XMLOutputter webXmlOut = JDom.outputter();
- webXmlOut.setTextNormalize ( true );
- webXmlOut.setEncoding("ISO-8859-1");
- webXmlOut.output( doc, out );
+ webXmlOut.getFormat().setTextMode(Format.TextMode.NORMALIZE);
+ webXmlOut.getFormat().setEncoding("ISO-8859-1");
+ webXmlOut.output(doc, out);
out.flush();
out.close();
if( logger.isLoggable(Level.INFO) )
1.3 +13 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDom.java 14 Apr 2004 11:56:02 -0000 1.2
+++ JDom.java 14 Apr 2004 12:12:32 -0000 1.3
@@ -30,6 +30,7 @@
import java.io.OutputStream;
import java.io.StringReader;
import java.util.List;
+import org.apache.slide.util.os.Platform;
import org.jdom.Attribute;
import org.jdom.Comment;
import org.jdom.Document;
@@ -38,6 +39,7 @@
import org.jdom.ProcessingInstruction;
import org.jdom.Text;
import org.jdom.input.SAXBuilder;
+import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
/**
@@ -104,12 +106,14 @@
}
public static XMLOutputter outputter() {
- XMLOutputter out;
+ Format fmt;
- out = new XMLOutputter(" ", true); // indent: 2 spaces, newlines=true
- out.setEncoding(JDom.UTF_8);
- out.setTextNormalize ( true );
- return out;
+ fmt = Format.getPrettyFormat();
+ fmt.setIndent(" ");
+ fmt.setEncoding(JDom.UTF_8);
+ fmt.setTextMode(Format.TextMode.NORMALIZE);
+ fmt.setLineSeparator(Platform.CURRENT.lineSeparator);
+ return new XMLOutputter(fmt);
}
public static String toString(Document doc) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
