pnever 2005/01/19 07:24:35
Modified:
proposals/tamino/src/store/org/apache/slide/store/tamino/datastore
Tag: TWS421_BRANCH XDescriptorsAccessor.java
proposals/tamino/src/store/org/apache/slide/store/tamino/servlet
Tag: TWS421_BRANCH XWebdavServlet.java
Log:
Fixed some problems for Linux-Version of TWS
Revision Changes Path
No revision
No revision
1.1.4.2 +18 -14
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XDescriptorsAccessor.java
Index: XDescriptorsAccessor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/datastore/XDescriptorsAccessor.java,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- XDescriptorsAccessor.java 3 Dec 2004 17:32:55 -0000 1.1.4.1
+++ XDescriptorsAccessor.java 19 Jan 2005 15:24:35 -0000 1.1.4.2
@@ -45,6 +45,7 @@
import org.apache.slide.store.tamino.jdomobjects.XJdom;
import org.apache.slide.store.tamino.jdomobjects.XUuri;
import org.apache.slide.store.tamino.jdomobjects.XmlStream;
+import org.apache.slide.store.ResourceId;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.util.XException;
import org.apache.slide.util.XUri;
@@ -78,18 +79,21 @@
this.tsdLanguage = tsdLanguage;
}
- public String getSchemaVersion() throws XDatastoreException {
- Element el;
+ public String getSchemaVersion() throws XException {
+ Element el = null;
+ try {
+ el = doReadDescriptorsDocument("/"+contentCollection+"/");
+ } catch (XException e) {}
- el = xqueryOptElement("(input()/" + contentCollection + ")[1]");
if (el == null) {
- System.out.println("TODO: schema version unkown");
- // TODO: version is unkown?!
- // check SchemaDocument instead of instances?
- return XGlobals.SCHEMA_VERSION;
- } else {
- return el.getAttributeValue (XJdom.A_DTD_VERSION);
+ try {
+ el =
doReadDescriptorsDocument(ResourceId.RESOURCE_ID_SCHEMA+"/"+contentCollection+"/");
+ } catch (XException e) {}
}
+
+ return (el != null
+ ? el.getAttributeValue(XJdom.A_DTD_VERSION)
+ : XGlobals.SCHEMA_VERSION);
}
//-- crud, without read/query
@@ -212,7 +216,7 @@
XUri storeUri = XUuri.extractStoreUri(xUri);
XUri xPath = xUri.suburi(storeUri.size());
String storeUuri = XUuri.getStoreUuri(useBinding, storeUri);
-
+
XUri currentUri = storeUri;
String currentUuri = storeUuri;
XDescriptors currentDesc = readDescriptorsByUuri(currentUuri);
No revision
No revision
1.1.4.1 +8 -5
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/servlet/XWebdavServlet.java
Index: XWebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/servlet/XWebdavServlet.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- XWebdavServlet.java 25 Mar 2004 16:18:03 -0000 1.1
+++ XWebdavServlet.java 19 Jan 2005 15:24:35 -0000 1.1.4.1
@@ -114,7 +114,10 @@
printVersion();
- XUuri.initStoreScopes(getInitParameter("namespace"));
+ if (XUuri.getScopes() == null) {
+ XUuri.initStoreScopes(getInitParameter("namespace"));
+ }
+
super.init();
if( logger.isLoggable(Level.FINE) )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
