You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/12/02 08:33:32 UTC
cvs commit: jakarta-slide/src/examples/xml Domain.xml Import.xml Test.java XML.xml XMLBase.xml
remm 00/12/01 23:33:31
Modified: src/examples example.bat example.sh
src/examples/xml Domain.xml Import.xml Test.java
Removed: src/examples/xml XML.xml XMLBase.xml
Log:
- Fix for the XML example (but export still doesn't work).
Revision Changes Path
1.3 +2 -2 jakarta-slide/src/examples/example.bat
Index: example.bat
===================================================================
RCS file: /home/cvs/jakarta-slide/src/examples/example.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- example.bat 2000/09/21 23:37:24 1.2
+++ example.bat 2000/12/02 07:33:30 1.3
@@ -1,8 +1,8 @@
@echo off
-REM $Id: example.bat,v 1.2 2000/09/21 23:37:24 remm Exp $
+REM $Id: example.bat,v 1.3 2000/12/02 07:33:30 remm Exp $
set JAVA=%JAVA_HOME%\bin\java
set _OLD=%_CLASSPATH%
-set _CLASSPATH=..\..\classes;..\..\lib\slide.jar;..\;%CLASSPATH%
+set _CLASSPATH=..\..\classes;..\..\lib\slide.jar;..\..\lib\slidestores.jar;..\;%CLASSPATH%
cd %1
%JAVA% -classpath %_CLASSPATH% %1.Test %2 %3 %4 %5 %6
1.3 +2 -2 jakarta-slide/src/examples/example.sh
Index: example.sh
===================================================================
RCS file: /home/cvs/jakarta-slide/src/examples/example.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- example.sh 2000/09/21 23:37:24 1.2
+++ example.sh 2000/12/02 07:33:30 1.3
@@ -1,6 +1,6 @@
#! /bin/sh
-# $Id: example.sh,v 1.2 2000/09/21 23:37:24 remm Exp $
+# $Id: example.sh,v 1.3 2000/12/02 07:33:30 remm Exp $
if [ -z "$JAVA_HOME" ] ; then
JAVA=`which java`
@@ -14,7 +14,7 @@
JAVA=$JAVA_HOME/bin/java
-TEMPCLASSPATH=../../classes:../../lib/slide.jar:../:$CLASSPATH
+TEMPCLASSPATH=../../classes:../../lib/slide.jar:../../lib/slidestores.jar:../:$CLASSPATH
if [ -z $1 ] ; then
echo "Usage: example <pkg>";
1.2 +61 -5 jakarta-slide/src/examples/xml/Domain.xml
Index: Domain.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/examples/xml/Domain.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Domain.xml 2000/05/25 22:54:05 1.1
+++ Domain.xml 2000/12/02 07:33:30 1.2
@@ -1,7 +1,63 @@
<?xml version="1.0"?>
-<s:domain xmlns:s="http://jakarta.apache.org/slide/Slide.xsd">
-
- <S:namespace-def initfile="XML.xml"/>
-
-</s:domain>
\ No newline at end of file
+<slide>
+
+ <namespace name="xmltest">
+
+ <definition>
+
+ <store name="memory">
+ <contentstore name="file"
+ classname="slidestore.file.FileContentStoreNoVersioning">
+ <parameter name="rootpath">files</parameter>
+ </contentstore>
+ </store>
+
+ <scope match="/" store="memory" />
+
+ </definition>
+
+ <configuration>
+ <default-action>/actions</default-action>
+ <userspath>/users</userspath>
+ <filespath></filespath>
+ <parameter name="dav">true</parameter>
+ <parameter name="standalone">true</parameter>
+ </configuration>
+
+ <data>
+
+ <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/">
+
+ <permission action="/actions" subject="/users/root"/>
+
+ <!-- /users represents the unauthenticated user -->
+
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/users">
+
+ <!-- /users/root represents the administrator -->
+
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/users/root">
+ </objectnode>
+
+ <!-- /users/guest represents an authenticated guest user -->
+
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/users/guest">
+ </objectnode>
+
+ </objectnode>
+
+ <objectnode classname="org.apache.slide.structure.ActionNode"
+ uri="/actions">
+ </objectnode>
+
+ </objectnode>
+
+ </data>
+
+ </namespace>
+
+</slide>
1.2 +46 -65 jakarta-slide/src/examples/xml/Import.xml
Index: Import.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/examples/xml/Import.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Import.xml 2000/05/09 02:47:17 1.1
+++ Import.xml 2000/12/02 07:33:31 1.2
@@ -1,66 +1,47 @@
<?xml version="1.0"?>
-<S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/">
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/users">
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/users/remm.user">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/users/dave.user">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/toto">
- <S:permission action="/actions/lock.action" subject="/users"/>
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/toto/2">
- <S:slideobject
- classname="org.exolab.slide.data.SlideSubject" uri="/toto/2/3">
- <S:slideobject
- classname="org.exolab.slide.data.SlideSubject" uri="/toto/2/3/4">
- <S:slideobject
- classname="org.exolab.slide.data.SlideSubject" uri="/toto/2/3/4/5">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/toto/2.txt">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideLink" uri="/toto/test.lnk">
- <S:metadata xmlns:S="SLIDE:"/>
- <S:target xmlns:S="SLIDE:">/toto</S:target>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/toto/1.txt">
- <S:properties contenttype="TEXT/ASCII"
- latestrevisionid="1.0.1" creationdate="949259073661"
- contentlanguage="" name="Properties Test">
- <S:revision author="/users/remm.user"
- creationdate="949259073681" id="1.0.0"
- content="[B@1246b46c" name="First"/>
- <S:revision author="/users/remm.user"
- creationdate="949259073741" id="1.0.1"
- content="[B@2eb46c" name="Second"/>
- </S:properties>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:properties contenttype="" latestrevisionid="1.0.0"
- creationdate="949259071148" contentlanguage="" name="Big test"/>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideSubject" uri="/actions">
- <S:slideobject classname="org.exolab.slide.data.SlideAction" uri="/actions/killlock.action">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideAction" uri="/actions/read.action">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:slideobject classname="org.exolab.slide.data.SlideAction" uri="/actions/lock.action">
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:metadata xmlns:S="SLIDE:"/>
- </S:slideobject>
- <S:metadata xmlns:S="SLIDE:"/>
-</S:slideobject>
+
+<data>
+
+<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/">
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/users">
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/users/remm.user" />
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/users/dave.user" />
+ </objectnode>
+ <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/toto">
+ <permission action="/actions" subject="/users" />
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/toto/2">
+ <objectnode
+ classname="org.apache.slide.structure.SubjectNode"
+ uri="/toto/2/3">
+ <objectnode
+ classname="org.apache.slide.structure.SubjectNode"
+ uri="/toto/2/3/4">
+ <objectnode
+ classname="org.apache.slide.structure.SubjectNode"
+ uri="/toto/2/3/4/5" />
+ </objectnode>
+ </objectnode>
+ </objectnode>
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/toto/2.txt" />
+ <objectnode classname="org.apache.slide.structure.LinkNode"
+ uri="/toto/test.lnk" linkedUri="/toto" />
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/toto/1.txt" />
+ </objectnode>
+ <objectnode classname="org.apache.slide.structure.SubjectNode"
+ uri="/actions">
+ <objectnode classname="org.apache.slide.structure.ActionNode"
+ uri="/actions/killlock.action" />
+ <objectnode classname="org.apache.slide.structure.ActionNode"
+ uri="/actions/read.action" />
+ <objectnode classname="org.apache.slide.structure.ActionNode"
+ uri="/actions/lock.action" />
+ </objectnode>
+</objectnode>
+
+</data>
1.4 +10 -7 jakarta-slide/src/examples/xml/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/examples/xml/Test.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Test.java 2000/11/25 01:38:48 1.3
+++ Test.java 2000/12/02 07:33:31 1.4
@@ -40,7 +40,7 @@
*
* Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
*
- * $Id: Test.java,v 1.3 2000/11/25 01:38:48 remm Exp $
+ * $Id: Test.java,v 1.4 2000/12/02 07:33:31 remm Exp $
*/
package xml;
@@ -83,7 +83,7 @@
System.out.println("Loading objects from XML file");
- //token.importData(slideToken, new FileReader("Import.xml"));
+ token.importData(slideToken, new FileReader("Import.xml"));
System.out.println("Creating some subjects");
@@ -116,6 +116,9 @@
structure.create(slideToken, subject2, "/toto");
structure.create(slideToken, subject3, "/toto/1.txt");
structure.create(slideToken, subject4, "/toto/2.txt");
+ structure.create(slideToken, subject5, "/toto/2");
+ structure.create(slideToken, subject5, "/toto/2/3");
+ structure.create(slideToken, subject5, "/toto/2/3/4");
structure.create(slideToken, subject5, "/toto/2/3/4/5");
structure.createLink(slideToken, link, "/toto/test.lnk",
subject2);
@@ -200,7 +203,7 @@
long date1 = (new Date()).getTime();
- int nbcheck = 10000;
+ int nbcheck = 100000;
for (int i=0; i<nbcheck; i++) {
structure.retrieve(slideToken, "/toto/2/3/4/5");
@@ -281,13 +284,13 @@
} catch (SlideException e) {
System.out.println("Lock test2 - correct");
}
+ lock.lock(slideToken, token3);
+ System.out.println("Lock test3 - correct");
try {
- lock.lock(slideToken, token3);
+ lock.lock(slideToken, token4);
} catch (SlideException e) {
- System.out.println("Lock test3 - correct");
+ System.out.println("Lock test4 - correct");
}
- lock.lock(slideToken, token4);
- System.out.println("Lock test4 - correct");
/*
System.out.println("Testing Version service");