tdraier 2005/04/06 17:42:09 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
etc/slide data.xml defs.xml domain.xml
src/java/org/jahia/engines/filemanager
DAVFilemanager_Engine.java
src/java/org/jahia/services/database ConnectionDispenser.java
src/java/org/jahia/services/search AddedField.java
src/java/org/jahia/services/webdav/stores CachedStore.java
FileContentStore.java
JahiaJDBCAdapter.java
src/java/org/jahia/services/webdav JahiaMacroListener.java
JahiaWebdavBaseService.java
src/views/jsp/jahia/engines/filemanager error.jsp
Added files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/webdav/stores
JahiaDescriptorsStore.java
PathItem.java
Removed files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/webdav/stores
JahiaJDBCDescriptorsStore.java
UsersDescriptorsStore.java
Log:
migrated and fixed transactional stores from 4.5, merged error messages from
4.0
Revision Changes Path
1.2.6.2 +15 -64 jahia/etc/slide/data.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/slide/data.xml.diff?r1=1.2.6.1&r2=1.2.6.2&f=h
1.3.6.2 +6 -74 jahia/etc/slide/defs.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/slide/defs.xml.diff?r1=1.3.6.1&r2=1.3.6.2&f=h
1.1.2.2 +0 -0 jahia/etc/slide/domain.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/slide/domain.xml.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.20.2.3.2.4 +3 -0
jahia/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java.diff?r1=1.20.2.3.2.3&r2=1.20.2.3.2.4&f=h
1.13.2.1.2.2 +3 -1
jahia/src/java/org/jahia/services/database/ConnectionDispenser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/database/ConnectionDispenser.java.diff?r1=1.13.2.1.2.1&r2=1.13.2.1.2.2&f=h
1.14.2.8.2.2 +6 -2
jahia/src/java/org/jahia/services/search/AddedField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/AddedField.java.diff?r1=1.14.2.8.2.1&r2=1.14.2.8.2.2&f=h
1.1.2.2 +4 -4
jahia/src/java/org/jahia/services/webdav/JahiaMacroListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/JahiaMacroListener.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.30.2.3.2.2 +0 -0
jahia/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/JahiaWebdavBaseService.java.diff?r1=1.30.2.3.2.1&r2=1.30.2.3.2.2&f=h
1.7.4.5.2.2 +27 -23
jahia/src/java/org/jahia/services/webdav/stores/CachedStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/CachedStore.java.diff?r1=1.7.4.5.2.1&r2=1.7.4.5.2.2&f=h
1.4.6.2 +45 -20
jahia/src/java/org/jahia/services/webdav/stores/FileContentStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/FileContentStore.java.diff?r1=1.4.6.1&r2=1.4.6.2&f=h
1.1.2.1 +998 -0
jahia/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/JahiaDescriptorsStore.java?rev=1.1.2.1&content-type=text/plain
1.1.2.2 +34 -35
jahia/src/java/org/jahia/services/webdav/stores/JahiaJDBCAdapter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/JahiaJDBCAdapter.java.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.12.6.2 +0 -153
jahia/src/java/org/jahia/services/webdav/stores/JahiaJDBCDescriptorsStore.java
(dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/JahiaJDBCDescriptorsStore.java?rev=1.12.6.1&content-type=text/plain
1.1.2.1 +49 -0
jahia/src/java/org/jahia/services/webdav/stores/PathItem.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/PathItem.java?rev=1.1.2.1&content-type=text/plain
1.12.4.2 +0 -711
jahia/src/java/org/jahia/services/webdav/stores/UsersDescriptorsStore.java
(dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/UsersDescriptorsStore.java?rev=1.12.4.1&content-type=text/plain
1.5.4.1.2.2 +2 -2
jahia/src/views/jsp/jahia/engines/filemanager/error.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/filemanager/error.jsp.diff?r1=1.5.4.1.2.1&r2=1.5.4.1.2.2&f=h
Index: data.xml
===================================================================
RCS file: /home/cvs/repository/jahia/etc/slide/Attic/data.xml,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- data.xml 25 Mar 2005 15:10:21 -0000 1.2.6.1
+++ data.xml 6 Apr 2005 15:42:07 -0000 1.2.6.2
@@ -6,22 +6,6 @@
<objectnode classname="org.apache.slide.structure.SubjectNode" uri="/">
- <!--permission action="/actions" subject="root"/-->
- <!--permission action="/actions"
subject="+/groups/administrators"/-->
- <!--permission action="/actions/read" subject="user"
- inheritable="false"/-->
- <permission action="/actions/read" subject="nobody" />
-
- <!-- /users represents the unauthenticated user -->
-
- <objectnode classname="org.apache.slide.structure.SubjectNode"
- uri="/users">
- </objectnode>
-
- <objectnode classname="org.apache.slide.structure.SubjectNode"
- uri="/groups">
- </objectnode>
-
<objectnode classname="org.apache.slide.structure.ActionNode"
uri="/actions">
<objectnode classname="org.apache.slide.structure.ActionNode"
uri="/actions/read">
<revision>
@@ -47,55 +31,22 @@
<permission action="/actions/write" subject="user" />
</objectnode>
- <!-- /roles -->
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/roles">
- <permission action="all" subject="self" inheritable="true"/>
- <permission action="all" subject="nobody" inheritable="true"
negative="true"/>
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/roles/root">
- <revision>
- <property name="group-member-set"></property>
- </revision>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/roles/user">
- <revision>
- <property name="group-member-set"></property>
- </revision>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/roles/guest">
- <revision>
- <property name="group-member-set"></property>
- </revision>
- </objectnode>
- </objectnode>
-
<!-- DeltaV: default history and workspace paths -->
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/history">
- <permission action="all" subject="nobody" inheritable="true"/>
- <permission action="/actions/write" subject="/roles/user"
inheritable="true"/>
- <permission action="/actions/read" subject="owner"
inheritable="true"/>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/workspace">
- <permission action="all" subject="nobody" inheritable="true"/>
- <permission action="/actions/write" subject="/roles/user"
inheritable="true"/>
- <permission action="/actions/read" subject="owner"
inheritable="true"/>
- </objectnode>
- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/workingresource">
- <permission action="all" subject="nobody" inheritable="true"/>
- <permission action="/actions/write" subject="/roles/user"
inheritable="true"/>
- <permission action="/actions/read" subject="owner"
inheritable="true"/>
- </objectnode>
-
- <!--objectnode classname="org.apache.slide.structure.SubjectNode"
- uri="/pages"-->
-
- <!-- ### Give read/write/manage permission to guest ###
- Uncomment the following line to give permission to do
- all actions on /files to guest (unauthenticated users) -->
- <!-- <permission action="/actions" subject="/users/guest"/> -->
-
- <!--permission action="/actions/read" subject="nobody"/-->
-
- <!--/objectnode-->
+<!-- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/history">-->
+<!-- <permission action="all" subject="nobody"
inheritable="true"/>-->
+<!-- <permission action="/actions/write" subject="/roles/user"
inheritable="true"/>-->
+<!-- <permission action="/actions/read" subject="owner"
inheritable="true"/>-->
+<!-- </objectnode>-->
+<!-- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/workspace">-->
+<!-- <permission action="all" subject="nobody"
inheritable="true"/>-->
+<!-- <permission action="/actions/write" subject="/roles/user"
inheritable="true"/>-->
+<!-- <permission action="/actions/read" subject="owner"
inheritable="true"/>-->
+<!-- </objectnode>-->
+<!-- <objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/workingresource">-->
+<!-- <permission action="all" subject="nobody"
inheritable="true"/>-->
+<!-- <permission action="/actions/write" subject="/roles/user"
inheritable="true"/>-->
+<!-- <permission action="/actions/read" subject="owner"
inheritable="true"/>-->
+<!-- </objectnode>-->
</objectnode>
Index: defs.xml
===================================================================
RCS file: /home/cvs/repository/jahia/etc/slide/Attic/defs.xml,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- defs.xml 25 Mar 2005 15:10:21 -0000 1.3.6.1
+++ defs.xml 6 Apr 2005 15:42:07 -0000 1.3.6.2
@@ -9,54 +9,11 @@
-->
<definition>
-
-
- <store name="jdbc"
classname="org.jahia.services.webdav.stores.CachedStore">
- <nodestore
classname="org.jahia.services.webdav.stores.JahiaJDBCDescriptorsStore"/>
- <securitystore>
- <reference store="nodestore" />
- </securitystore>
- <lockstore>
- <reference store="nodestore" />
- </lockstore>
- <revisiondescriptorsstore>
- <reference store="nodestore" />
- </revisiondescriptorsstore>
- <revisiondescriptorstore>
- <reference store="nodestore" />
- </revisiondescriptorstore>
- <contentstore
classname="org.jahia.services.webdav.stores.FileContentStore">
- <parameter name="rootpath">store/content</parameter>
- <parameter name="workpath">work/content</parameter>
- </contentstore>
- </store>
-
- <store name="tx">
- <nodestore
classname="org.apache.slide.store.txfile.TxXMLFileDescriptorsStore">
- <parameter name="rootpath">store/metadata</parameter>
- <parameter name="workpath">work/metadata</parameter>
+ <store name="jahia"
classname="org.jahia.services.webdav.stores.NoCacheStore" >
+ <nodestore
classname="org.jahia.services.webdav.stores.JahiaDescriptorsStore">
+ <parameter
name="contentStore">org.jahia.services.webdav.stores.FileContentStore</parameter>
</nodestore>
<securitystore>
- <reference store="nodestore"/>
- </securitystore>
- <lockstore>
- <reference store="nodestore"/>
- </lockstore>
- <revisiondescriptorsstore>
- <reference store="nodestore"/>
- </revisiondescriptorsstore>
- <revisiondescriptorstore>
- <reference store="nodestore"/>
- </revisiondescriptorstore>
- <contentstore
classname="org.apache.slide.store.txfile.TxFileContentStore">
- <parameter name="rootpath">store/content</parameter>
- <parameter name="workpath">work/content</parameter>
- </contentstore>
- </store>
-
- <store name="users"
classname="org.jahia.services.webdav.stores.CachedStore" >
- <nodestore
classname="org.jahia.services.webdav.stores.UsersDescriptorsStore"/>
- <securitystore>
<reference store="nodestore" />
</securitystore>
<lockstore>
@@ -68,37 +25,12 @@
<revisiondescriptorstore>
<reference store="nodestore" />
</revisiondescriptorstore>
- <contentstore
classname="org.jahia.services.webdav.stores.FileContentStore">
- <parameter name="rootpath">store/content</parameter>
- <parameter name="workpath">work/content</parameter>
- </contentstore>
- </store>
-
- <!--store name="pages"
classname="org.jahia.services.webdav.stores.NoCacheStore" >
- <nodestore
classname="org.jahia.services.webdav.stores.PagesDescriptorsStore"/>
- <securitystore>
+ <contentstore>
<reference store="nodestore" />
- </securitypagesstore>
- <lockstore>
- <reference store="nodestore" />
- </lockstore>
- <revisiondescriptorsstore>
- <reference store="nodestore" />
- </revisiondescriptorsstore>
- <revisiondescriptorstore>
- <reference store="nodestore" />
- </revisiondescriptorstore>
- <contentstore
classname="org.jahia.services.webdav.stores.FileContentStore">
- <parameter name="rootpath">contentstore</parameter>
- <parameter name="version">true</parameter>
- <parameter name="resetBeforeStarting">false</parameter>
</contentstore>
- </store-->
+ </store>
- <scope match="/users" store="users" />
- <scope match="/groups" store="users" />
- <!--scope match="/pages" store="pages" /-->
- <scope match="/" store="jdbc" />
+ <scope match="/" store="jahia" />
</definition>
</namespace>
Index: DAVFilemanager_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/filemanager/Attic/DAVFilemanager_Engine.java,v
retrieving revision 1.20.2.3.2.3
retrieving revision 1.20.2.3.2.4
diff -u -r1.20.2.3.2.3 -r1.20.2.3.2.4
--- DAVFilemanager_Engine.java 1 Apr 2005 15:36:20 -0000
1.20.2.3.2.3
+++ DAVFilemanager_Engine.java 6 Apr 2005 15:42:07 -0000
1.20.2.3.2.4
@@ -84,6 +84,7 @@
private static final String FILEUSAGE_TEMPLATE_JSP =
"filemanager_fileusage";
private static final String MIGRATION_TEMPLATE_JSP =
"filemanager_migration";
private static final String RIGHTS_JSP =
"/jsp/jahia/engines/rights/manage_rights.jsp";
+ private static final String ERROR_JSP = "filemanager_error";
private static final String CLOSE_JSP = "filemanager_close";
private static DAVFilemanager_Engine instance = null;
@@ -589,6 +590,8 @@
if (theScreen.equals ("close")) {
engineMap.put ("jspSource", CLOSE_JSP);
+ } else if (theScreen.equals ("error")) {
+ engineMap.put ("jspSource", ERROR_JSP);
} else if (theScreen.equals ("createDir")) {
engineMap.put ("jspSource", CREATEDIR_TEMPLATE_JSP);
} else if (theScreen.equals ("fileUpload")) {
Index: ConnectionDispenser.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/database/Attic/ConnectionDispenser.java,v
retrieving revision 1.13.2.1.2.1
retrieving revision 1.13.2.1.2.2
diff -u -r1.13.2.1.2.1 -r1.13.2.1.2.2
--- ConnectionDispenser.java 25 Mar 2005 15:12:10 -0000 1.13.2.1.2.1
+++ ConnectionDispenser.java 6 Apr 2005 15:42:07 -0000 1.13.2.1.2.2
@@ -79,7 +79,9 @@
public void removeConnection () {
alreadyTerminated = true;
try {
- connection.setAutoCommit(true);
+ if (!connection.getAutoCommit()) {
+ connection.rollback();
+ }
((ConnectionWrapper)connection).realClose();
count--;
logger.debug("Connections still active :" + count);
Index: AddedField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/AddedField.java,v
retrieving revision 1.14.2.8.2.1
retrieving revision 1.14.2.8.2.2
diff -u -r1.14.2.8.2.1 -r1.14.2.8.2.2
--- AddedField.java 25 Feb 2005 12:48:22 -0000 1.14.2.8.2.1
+++ AddedField.java 6 Apr 2005 15:42:08 -0000 1.14.2.8.2.2
@@ -183,7 +183,7 @@
.getJahiaSitesService ().getSite
(this.getJahiaID ());
DAVFileAccess file =
JahiaWebdavBaseService.getInstance ()
.getDAVFileAccess (site, fField.getRealName
());
-
+ file.beginTransaction();
if (file.isValid () && file.hasRevisions () &&
!file.isCollection ()) {
String contentType = fField.getType (); //
(String) file.getProperty("DAV:","getcontenttype");
if (contentType != null) {
@@ -197,6 +197,7 @@
CharsetDetection charsetDet = new
CharsetDetection();
charsetDet.charsetDetection(ins);
charSet = charsetDet.getCharset();
+ ins.close();
long lastModifiedDate =
System.currentTimeMillis();
try {
lastModifiedDate =
file.getJahiaFileField()
@@ -205,9 +206,11 @@
logger.debug(t);
}
+ ins = file.downloadFile();
extDoc =
ServicesRegistry.getInstance().getFileExtractionService()
.getExtractedDocument(contentType,file.getPath(),lastModifiedDate,
-
true,file.downloadFile());
+ true,ins);
+ ins.close();
if ( extDoc != null ){
strVal =
extDoc.getContentAsString();
}
@@ -217,6 +220,7 @@
}
}
}
+ file.commitTransaction();
}
if (strVal != null) {
values = new String[1];
Index: CachedStore.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/CachedStore.java,v
retrieving revision 1.7.4.5.2.1
retrieving revision 1.7.4.5.2.2
diff -u -r1.7.4.5.2.1 -r1.7.4.5.2.2
--- CachedStore.java 25 Mar 2005 15:12:10 -0000 1.7.4.5.2.1
+++ CachedStore.java 6 Apr 2005 15:42:08 -0000 1.7.4.5.2.2
@@ -95,7 +95,7 @@
ObjectNode objectNode = super.retrieveObject (uri);
objectNode.validate (uri.toString ());
if (!isForceStoreEnlistment (uri)) {
- cacheEntry ("o", (JahiaJDBCDescriptorsStore) nodeStore,
uri, objectNode);
+ cacheEntry ("o", (JahiaDescriptorsStore) nodeStore, uri,
objectNode);
}
return objectNode;
}
@@ -119,7 +119,7 @@
throws ServiceAccessException, ObjectNotFoundException {
super.storeObject (uri, object);
if (nodeStore.cacheResults ()) {
- cacheEntry ("o", (JahiaJDBCDescriptorsStore) nodeStore, uri,
object.cloneObject ());
+ cacheEntry ("o", (JahiaDescriptorsStore) nodeStore, uri,
object.cloneObject ());
flushParentFromCache("o", uri);
}
}
@@ -141,7 +141,7 @@
throws ServiceAccessException, ObjectAlreadyExistsException {
super.createObject (uri, object);
if (nodeStore.cacheResults ()) {
- cacheEntry ("o", (JahiaJDBCDescriptorsStore) nodeStore, uri,
object.cloneObject ());
+ cacheEntry ("o", (JahiaDescriptorsStore) nodeStore, uri,
object.cloneObject ());
flushParentFromCache("o", uri);
}
}
@@ -198,7 +198,7 @@
Vector permissionsVector = new Vector ();
permissionsVector.addElement (tempPermission);
if (!isForceStoreEnlistment (uri)) {
- cacheEntry ("p", (JahiaJDBCDescriptorsStore)
securityStore, uri,
+ cacheEntry ("p", (JahiaDescriptorsStore)
securityStore, uri,
permissionsVector);
}
}
@@ -288,7 +288,7 @@
permissionsVector.addElement (tempPermission);
}
if (!isForceStoreEnlistment (uri)) {
- cacheEntry ("p", (JahiaJDBCDescriptorsStore)
securityStore, uri,
+ cacheEntry ("p", (JahiaDescriptorsStore) securityStore,
uri,
permissionsVector);
}
return ((Vector) permissionsVector.clone ()).elements ();
@@ -316,12 +316,12 @@
Vector locksVector = null;
if (value == null) {
locksVector = new Vector ();
- cacheEntry ("l", (JahiaJDBCDescriptorsStore) lockStore, uri,
locksVector);
+ cacheEntry ("l", (JahiaDescriptorsStore) lockStore, uri,
locksVector);
} else {
locksVector = (Vector) value;
}
locksVector.addElement (lock.cloneObject ());
- cacheEntry ("l", (JahiaJDBCDescriptorsStore) lockStore, uri,
locksVector);
+ cacheEntry ("l", (JahiaDescriptorsStore) lockStore, uri,
locksVector);
}
}
@@ -442,7 +442,7 @@
locksVector.addElement (tempLock);
}
if (!isForceStoreEnlistment (uri)) {
- cacheEntry ("l", (JahiaJDBCDescriptorsStore) lockStore,
uri, locksVector);
+ cacheEntry ("l", (JahiaDescriptorsStore) lockStore, uri,
locksVector);
}
} else {
locksVector = (Vector) value;
@@ -477,7 +477,7 @@
super.retrieveRevisionDescriptors (uri);
revisionDescriptors = revisionDescriptors.cloneObject ();
if (!isForceStoreEnlistment (uri)) {
- cacheEntry ("d", (JahiaJDBCDescriptorsStore)
revisionDescriptorsStore, uri,
+ cacheEntry ("d", (JahiaDescriptorsStore)
revisionDescriptorsStore, uri,
revisionDescriptors);
}
revisionDescriptors.validate (uri.toString ());
@@ -503,7 +503,7 @@
throws ServiceAccessException {
super.createRevisionDescriptors (uri, revisionDescriptors);
if (revisionDescriptorsStore.cacheResults ()) {
- cacheEntry ("d", (JahiaJDBCDescriptorsStore)
revisionDescriptorsStore, uri,
+ cacheEntry ("d", (JahiaDescriptorsStore)
revisionDescriptorsStore, uri,
revisionDescriptors.cloneObject ());
}
}
@@ -526,7 +526,7 @@
throws ServiceAccessException,
RevisionDescriptorNotFoundException {
super.storeRevisionDescriptors (uri, revisionDescriptors);
if (revisionDescriptorsStore.cacheResults ()) {
- cacheEntry ("d", (JahiaJDBCDescriptorsStore)
revisionDescriptorsStore, uri,
+ cacheEntry ("d", (JahiaDescriptorsStore)
revisionDescriptorsStore, uri,
revisionDescriptors.cloneObject ());
}
}
@@ -571,7 +571,7 @@
revisionDescriptor.validate ();
if (!isForceStoreEnlistment (uri)) {
cacheEntry ("D" + revisionNumber + "-",
- (JahiaJDBCDescriptorsStore)
revisionDescriptorStore, uri,
+ (JahiaDescriptorsStore) revisionDescriptorStore,
uri,
revisionDescriptor);
}
return revisionDescriptor;
@@ -597,7 +597,7 @@
super.createRevisionDescriptor (uri, revisionDescriptor);
if (revisionDescriptorStore.cacheResults ()) {
cacheEntry ("D" + revisionDescriptor.getRevisionNumber () + "-",
- (JahiaJDBCDescriptorsStore) revisionDescriptorStore, uri,
+ (JahiaDescriptorsStore) revisionDescriptorStore, uri,
revisionDescriptor.cloneObject ());
}
}
@@ -621,7 +621,7 @@
super.storeRevisionDescriptor (uri, revisionDescriptor);
if (revisionDescriptorStore.cacheResults ()) {
cacheEntry ("D" + revisionDescriptor.getRevisionNumber () + "-",
- (JahiaJDBCDescriptorsStore) revisionDescriptorStore, uri,
+ (JahiaDescriptorsStore) revisionDescriptorStore, uri,
revisionDescriptor.cloneObject ());
}
}
@@ -733,16 +733,20 @@
internalCache.flush ();
}
- private void cacheEntry (String keyPrefix, JahiaJDBCDescriptorsStore
store, Uri uri,
+ private void cacheEntry (String keyPrefix, JahiaDescriptorsStore store,
Uri uri,
Object object) {
- if ((store.getDirectoryType (uri) &
JahiaJDBCDescriptorsStore.TEMP_CACHEABLE) != 0) {
- CacheEntry cEntry = new CacheEntry (object);
- cEntry.setExpirationDate (new Date (System.currentTimeMillis ()
+ TEMP_CACHE_DELAY));
- internalCache.putCacheEntry (
- keyPrefix + uri.getNamespace ().getName () +
uri.toString (), cEntry, true);
- } else if ((store.getDirectoryType (uri) &
JahiaJDBCDescriptorsStore.UNCACHEABLE) == 0)
- internalCache.put (keyPrefix + uri.getNamespace ().getName () +
uri.toString (),
- object);
+ try {
+ PathItem pathItem = store.getPathItem(uri);
+ if ((pathItem.type & JahiaDescriptorsStore.TEMP_CACHEABLE) != 0)
{
+ CacheEntry cEntry = new CacheEntry (object);
+ cEntry.setExpirationDate (new Date (System.currentTimeMillis
() + TEMP_CACHE_DELAY));
+ internalCache.putCacheEntry (
+ keyPrefix + uri.getNamespace ().getName () +
uri.toString (), cEntry, true);
+ } else if ((pathItem.type & JahiaDescriptorsStore.UNCACHEABLE)
== 0)
+ internalCache.put (keyPrefix + uri.getNamespace ().getName
() + uri.toString (),
+ object);
+ } catch (ServiceAccessException e) {
+ }
}
private void flushParentFromCache(String keyPrefix, Uri uri) {
Index: FileContentStore.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/FileContentStore.java,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -u -r1.4.6.1 -r1.4.6.2
--- FileContentStore.java 25 Mar 2005 15:12:10 -0000 1.4.6.1
+++ FileContentStore.java 6 Apr 2005 15:42:08 -0000 1.4.6.2
@@ -2,6 +2,7 @@
import org.apache.slide.common.*;
import org.apache.slide.store.file.SimpleFileStore;
+import org.apache.slide.store.txfile.TxFileContentStore;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.RevisionAlreadyExistException;
@@ -16,12 +17,14 @@
* Time: 10:25:09 PM
* To change this template use Options | File Templates.
*/
-public class FileContentStore extends SimpleFileStore {
+public class FileContentStore extends TxFileContentStore {
private static String contentPath;
private String path;
+ private Hashtable parameters;
+
public static void setContentPath (String contentPath) {
FileContentStore.contentPath = contentPath;
}
@@ -29,32 +32,54 @@
public FileContentStore() {
}
+ public void setParameters(Hashtable parameters) throws
ServiceParameterErrorException, ServiceParameterMissingException {
+ this.parameters = parameters;
+ parameters.put (STORE_DIR_PARAMETER, contentPath+"/store");
+ parameters.put (WORK_DIR_PARAMETER, contentPath+"/work");
+ super.setParameters(parameters);
+ }
public synchronized void initialize (NamespaceAccessToken token)
throws ServiceInitializationFailedException {
- Hashtable parameters = new Hashtable ();
- path = contentPath + "/store_" + token.getName ();
- parameters.put ("rootpath", path);
- new File(path).mkdirs();
-// parameters.put (WORK_DIR_PARAMETER, contentPath + "/work_" +
token.getName ());
- try {
- setParameters (parameters);
-// started = false;
- } catch (Exception e) {
- e.printStackTrace();
- }
super.initialize (token);
- }
- public void createRevisionContent(Uri uri, NodeRevisionDescriptor
revisionDescriptor, NodeRevisionContent revisionContent) throws
ServiceAccessException, RevisionAlreadyExistException {
- new File(path, uri.getParentUri().getRelative()).mkdirs();
- super.createRevisionContent(uri, revisionDescriptor,
revisionContent);
- }
-
- public void setParameters(Hashtable parameters) throws
ServiceParameterErrorException, ServiceParameterMissingException {
try {
- super.setParameters(parameters);
+ Hashtable parameters = new Hashtable();
+ path = contentPath + "/" + token.getName ();
+
+ parameters.put (STORE_DIR_PARAMETER, path+"/store");
+ parameters.put (WORK_DIR_PARAMETER, path+"/work");
+
+ if (isConnected()) {
+ disconnect();
+ super.setParameters(parameters);
+ connect();
+ } else {
+ super.setParameters(parameters);
+ }
+ } catch (ServiceAccessException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ } catch (ServiceConnectionFailedException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ } catch (ServiceDisconnectionFailedException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
} catch (ServiceParameterErrorException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ } catch (ServiceParameterMissingException e) {
+ e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
}
+
}
+
+// public void createRevisionContent(Uri uri, NodeRevisionDescriptor
revisionDescriptor, NodeRevisionContent revisionContent) throws
ServiceAccessException, RevisionAlreadyExistException {
+// new File(path, uri.getParentUri().getRelative()).mkdirs();
+// super.createRevisionContent(uri, revisionDescriptor,
revisionContent);
+// }
+//
+// public void setParameters(Hashtable parameters) throws
ServiceParameterErrorException, ServiceParameterMissingException {
+// try {
+// super.setParameters(parameters);
+// } catch (ServiceParameterErrorException e) {
+// }
+// }
}
Index: JahiaJDBCAdapter.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/JahiaJDBCAdapter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JahiaJDBCAdapter.java 25 Mar 2005 15:12:10 -0000 1.1.2.1
+++ JahiaJDBCAdapter.java 6 Apr 2005 15:42:08 -0000 1.1.2.2
@@ -36,10 +36,10 @@
* Time: 17:28:45
* <p/>
* $Author: tdraier $
- * $Date: 2005/03/25 15:12:10 $
- * $Id: JahiaJDBCAdapter.java,v 1.1.2.1 2005/03/25 15:12:10 tdraier Exp $
+ * $Date: 2005/04/06 15:42:08 $
+ * $Id: JahiaJDBCAdapter.java,v 1.1.2.2 2005/04/06 15:42:08 tdraier Exp $
* $RCSfile: JahiaJDBCAdapter.java,v $
- * $Revision: 1.1.2.1 $
+ * $Revision: 1.1.2.2 $
* $Source:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/stores/Attic/JahiaJDBCAdapter.java,v
$
* $State: Exp $
*/
@@ -94,7 +94,7 @@
connection.prepareStatement(
"select 1 from JAHIA_SLIDE_OBJECT o, JAHIA_SLIDE_URI
u where o.URI_ID=u.URI_ID and u.URI_STRING=? and u.NAMESPACE=?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
if (create)
@@ -243,7 +243,7 @@
try {
statement = connection.prepareStatement("delete from
JAHIA_SLIDE_URI where URI_STRING = ? and NAMESPACE = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.executeUpdate();
} finally {
close(statement);
@@ -271,7 +271,7 @@
connection.prepareStatement(
"select o.CLASS_NAME from JAHIA_SLIDE_OBJECT o,
JAHIA_SLIDE_URI u where o.URI_ID = u.URI_ID and u.URI_STRING = ? and
u.NAMESPACE = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
className = res.getString(1);
@@ -287,7 +287,7 @@
connection.prepareStatement(
"SELECT c.NAME, cu.URI_STRING FROM JAHIA_SLIDE_URI
u, JAHIA_SLIDE_URI cu, JAHIA_SLIDE_BINDING c WHERE cu.URI_ID = c.CHILD_UURI_ID
AND c.URI_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
while (res.next()) {
children.addElement(new
ObjectNode.Binding(res.getString(1), res.getString(2)));
@@ -301,7 +301,7 @@
connection.prepareStatement(
"SELECT c.NAME, cu.URI_STRING FROM JAHIA_SLIDE_URI
u, JAHIA_SLIDE_URI cu, JAHIA_SLIDE_PARENT_BINDING c WHERE cu.URI_ID =
c.PARENT_UURI_ID AND c.URI_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE =
?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
while (res.next()) {
parents.addElement(new
ObjectNode.ParentBinding(res.getString(1), res.getString(2)));
@@ -315,7 +315,7 @@
connection.prepareStatement(
"SELECT lu.URI_STRING FROM JAHIA_SLIDE_URI u,
JAHIA_SLIDE_URI lu, JAHIA_SLIDE_LINKS l WHERE lu.URI_ID = l.URI_ID AND
l.LINK_TO_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
while (res.next()) {
links.addElement(res.getString(1));
@@ -329,7 +329,7 @@
connection.prepareStatement(
"SELECT lu.URI_STRING FROM JAHIA_SLIDE_URI u,
JAHIA_SLIDE_URI lu, JAHIA_SLIDE_LINKS l WHERE lu.URI_ID = l.LINK_TO_ID AND
l.URI_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
String linkTarget = res.getString(1);
@@ -369,7 +369,7 @@
connection.prepareStatement(
"select l.EXPIRATION_DATE, l.IS_INHERITABLE,
l.IS_EXCLUSIVE, u2.URI_STRING as LCK, u3.URI_STRING as SUBJECT, u4.URI_STRING
as TYPE, l.OWNER from JAHIA_SLIDE_LOCKS l, JAHIA_SLIDE_URI u, JAHIA_SLIDE_URI
u2, JAHIA_SLIDE_URI u3, JAHIA_SLIDE_URI u4 where l.OBJECT_ID=u.URI_ID and
u.URI_STRING=? and u.NAMESPACE=? and l.LOCK_ID=u2.URI_ID and
l.SUBJECT_ID=u3.URI_ID and l.TYPE_ID = u4.URI_ID");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
while (res.next()) {
@@ -448,7 +448,7 @@
connection.prepareStatement(
"select 1 from JAHIA_SLIDE_LOCKS l, JAHIA_SLIDE_URI
u where l.LOCK_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE=?");
statement.setString(1, lock.getLockId());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
rslt = statement.executeQuery();
if (rslt.next()) {
removeLock(connection,uri,lock);
@@ -482,7 +482,7 @@
// connection.prepareStatement(
// "delete JAHIA_SLIDE_URI from JAHIA_SLIDE_URI,
JAHIA_SLIDE_LOCKS l where URI_STRING=? and NAMESPACE=?");
// statement.setString(1, lock.getLockId());
-// statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+// statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
// statement.executeUpdate();
} finally {
close(statement);
@@ -505,7 +505,7 @@
connection.prepareStatement(
"select ou.URI_STRING, su.URI_STRING, au.URI_STRING,
p.VERSION_NO, p.IS_INHERITABLE, p.IS_NEGATIVE from JAHIA_SLIDE_PERMISSIONS p,
JAHIA_SLIDE_URI ou, JAHIA_SLIDE_URI su, JAHIA_SLIDE_URI au where p.OBJECT_ID =
ou.URI_ID and ou.URI_STRING = ? and ou.NAMESPACE = ? and p.SUBJECT_ID =
su.URI_ID and p.ACTION_ID = au.URI_ID order by SUCCESSION");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
while (res.next()) {
String object = res.getString(1);
@@ -546,7 +546,7 @@
connection.prepareStatement(
"select max(p.SUCCESSION) from JAHIA_SLIDE_URI ou,
JAHIA_SLIDE_PERMISSIONS p where p.OBJECT_ID = ou.URI_ID and ou.URI_STRING = ?
and ou.NAMESPACE = ? ");
statement.setString(1, permission.getObjectUri());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
res.next();
succession = res.getInt(1) + 1;
@@ -572,9 +572,9 @@
statement.setString(5, permission.getObjectUri());
statement.setString(6, permission.getSubjectUri());
statement.setString(7, permission.getActionUri());
- statement.setInt(8,
((JahiaJDBCDescriptorsStore)service).getSiteId());
- statement.setInt(9,
((JahiaJDBCDescriptorsStore)service).getSiteId());
- statement.setInt(10,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(8,
((JahiaDescriptorsStore)service).getSiteId());
+ statement.setInt(9,
((JahiaDescriptorsStore)service).getSiteId());
+ statement.setInt(10,
((JahiaDescriptorsStore)service).getSiteId());
if (statement.executeUpdate() != 1) {
String msg = "Failed to insert permission ("
+ permission.getObjectUri()
@@ -699,7 +699,6 @@
statement.setLong(1, s.getLong(1));
statement.executeUpdate();
}
- statement.executeUpdate();
} catch (JahiaException e) {
throw createException(e, uri.toString());
} catch (SQLException e) {
@@ -731,7 +730,7 @@
connection.prepareStatement(
"select vh.VERSION_ID, b.BRANCH_STRING from
JAHIA_SLIDE_VERSION_HISTORY vh, JAHIA_SLIDE_BRANCH b, JAHIA_SLIDE_URI u where
vh.URI_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE=? and b.BRANCH_ID =
vh.BRANCH_ID and vh.REVISION_NO = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(3, revisionNumber.toString());
res = statement.executeQuery();
if (res.next()) {
@@ -804,7 +803,7 @@
connection.prepareStatement(
"select IS_VERSIONED from JAHIA_SLIDE_VERSION v,
JAHIA_SLIDE_URI u where v.URI_ID = u.URI_ID and u.URI_STRING = ? and
u.NAMESPACE=?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
isVersioned = (res.getInt("IS_VERSIONED") == 1);
@@ -823,7 +822,7 @@
// +
convertRevisionNumberToComparable("vh.REVISION_NO"));
// todo replace sql sort by java sort
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
while (res.next()) {
NodeRevisionNumber revisionNumber = new
NodeRevisionNumber(res.getString(1));
@@ -842,7 +841,7 @@
connection.prepareStatement(
"select pvh.REVISION_NO from
JAHIA_SLIDE_VERSION_HISTORY vh, JAHIA_SLIDE_VERSION_HISTORY pvh,
JAHIA_SLIDE_VERSION_PREDS vp, JAHIA_SLIDE_URI u where pvh.VERSION_ID =
vp.VERSION_ID and vp.VERSION_ID = vh.VERSION_ID and vh.URI_ID = u.URI_ID and
u.URI_STRING = ? and u.NAMESPACE=? and vh.REVISION_NO = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(3, revisionNumber.toString());
res = statement.executeQuery();
Vector predecessors = new Vector();
@@ -885,7 +884,7 @@
connection.prepareStatement(
"SELECT 1 FROM JAHIA_SLIDE_VERSION v,
JAHIA_SLIDE_URI u WHERE v.URI_ID = u.URI_ID and u.URI_STRING = ? and
u.NAMESPACE=?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
revisionExists = res.next();
} finally {
@@ -910,7 +909,7 @@
connection.prepareStatement(
"SELECT 1 FROM JAHIA_SLIDE_VERSION_HISTORY vh,
JAHIA_SLIDE_URI u WHERE vh.URI_ID = u.URI_ID and u.URI_STRING = ? and
u.NAMESPACE=? and REVISION_NO = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(3, versionNumber.toString());
res = statement.executeQuery();
versionHistoryExists = res.next();
@@ -959,7 +958,7 @@
" and suc.REVISION_NO = ? " );
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(3,
nodeRevisionNumber.toString());
statement.setString(4, successor.toString());
statement.executeUpdate();
@@ -988,7 +987,7 @@
connection.prepareStatement(
"select vh.VERSION_ID from JAHIA_SLIDE_VERSION_HISTORY
vh, JAHIA_SLIDE_URI u where vh.URI_ID = u.URI_ID and u.URI_STRING = ? and
u.NAMESPACE=? and REVISION_NO = ?");
statement.setString(1, uri);
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(3, revNo);
res = statement.executeQuery();
if (res.next()) {
@@ -1011,7 +1010,7 @@
connection.prepareStatement(
"select 1 from JAHIA_SLIDE_VERSION v, JAHIA_SLIDE_URI u
where v.URI_ID = u.URI_ID and u.URI_STRING = ? and u.NAMESPACE=?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
revisionExists = res.next();
} finally {
@@ -1036,7 +1035,7 @@
connection.prepareStatement(
"select 1 from JAHIA_SLIDE_VERSION_HISTORY vh,
JAHIA_SLIDE_URI u where vh.URI_ID = u.URI_ID and u.URI_STRING = ? and
u.NAMESPACE=? and REVISION_NO = ?");
statement.setString(1, uri.toString());
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(3,
revisionDescriptor.getRevisionNumber().toString());
res = statement.executeQuery();
versionHistoryExists = res.next();
@@ -1097,7 +1096,7 @@
.prepareStatement("insert into
JAHIA_SLIDE_VERSION_LABELS (VERSION_ID, LABEL_ID) select VERSION_ID, ? from
JAHIA_SLIDE_VERSION_HISTORY vh, JAHIA_SLIDE_URI u where vh.URI_ID = u.URI_ID
and u.URI_STRING = ? and u.NAMESPACE=? and vh.REVISION_NO = ?");
statement.setLong(1, labelId);
statement.setString(2, uri.toString());
- statement.setInt(3,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(3,
((JahiaDescriptorsStore)service).getSiteId());
statement.setString(4,
revisionDescriptor.getRevisionNumber().toString());
statement.executeUpdate();
} finally {
@@ -1112,7 +1111,7 @@
try {
statement = connection.prepareStatement("select URI_ID from
JAHIA_SLIDE_URI where URI_STRING=? and NAMESPACE=?");
statement.setString(1, uri);
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
long id = res.getLong(1);
@@ -1130,7 +1129,7 @@
try {
statement = connection.prepareStatement("select URI_ID from
JAHIA_SLIDE_URI where URI_STRING=? and NAMESPACE=?");
statement.setString(1, uri);
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
long id = res.getLong(1);
@@ -1143,7 +1142,7 @@
statement = connection.prepareStatement("insert into
JAHIA_SLIDE_URI (URI_ID,URI_STRING,NAMESPACE) values (?,?,?)");
statement.setInt(1,
ServicesRegistry.getInstance().getJahiaIncrementorsDBService().autoIncrement("JAHIA_SLIDE_URI"));
statement.setString(2, uri);
- statement.setInt(3,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(3,
((JahiaDescriptorsStore)service).getSiteId());
statement.executeUpdate();
} finally {
close(statement);
@@ -1157,7 +1156,7 @@
try {
statement = connection.prepareStatement("select BRANCH_ID from
JAHIA_SLIDE_BRANCH where BRANCH_STRING=? and NAMESPACE=?");
statement.setString(1, branch);
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
long id = res.getLong(1);
@@ -1175,7 +1174,7 @@
try {
statement = connection.prepareStatement("select BRANCH_ID from
JAHIA_SLIDE_BRANCH where BRANCH_STRING=? and NAMESPACE=?");
statement.setString(1, branch);
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
long id = res.getLong(1);
@@ -1188,7 +1187,7 @@
statement = connection.prepareStatement("insert into
JAHIA_SLIDE_BRANCH (BRANCH_ID,BRANCH_STRING,NAMESPACE) values (?,?,?)");
statement.setInt(1,
ServicesRegistry.getInstance().getJahiaIncrementorsDBService().autoIncrement("JAHIA_SLIDE_BRANCH"));
statement.setString(2, branch);
- statement.setInt(3,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(3,
((JahiaDescriptorsStore)service).getSiteId());
statement.executeUpdate();
} finally {
close(statement);
@@ -1202,7 +1201,7 @@
try {
statement = connection.prepareStatement("select LABEL_ID from
JAHIA_SLIDE_LABEL where LABEL_STRING=? and NAMESPACE=?");
statement.setString(1, label);
- statement.setInt(2,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(2,
((JahiaDescriptorsStore)service).getSiteId());
res = statement.executeQuery();
if (res.next()) {
long id = res.getLong(1);
@@ -1215,7 +1214,7 @@
statement = connection.prepareStatement("insert into
JAHIA_SLIDE_LABEL (LABEL_ID,LABEL_STRING,NAMESPACE) values (?,?,?)");
statement.setInt(1,
ServicesRegistry.getInstance().getJahiaIncrementorsDBService().autoIncrement("JAHIA_SLIDE_LABEL"));
statement.setString(2, label);
- statement.setInt(3,
((JahiaJDBCDescriptorsStore)service).getSiteId());
+ statement.setInt(3,
((JahiaDescriptorsStore)service).getSiteId());
statement.executeUpdate();
} finally {
close(statement);
Index: JahiaMacroListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/JahiaMacroListener.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JahiaMacroListener.java 25 Mar 2005 15:12:11 -0000 1.1.2.1
+++ JahiaMacroListener.java 6 Apr 2005 15:42:09 -0000 1.1.2.2
@@ -19,10 +19,10 @@
* Time: 16:30:34
* <p/>
* $Author: tdraier $
- * $Date: 2005/03/25 15:12:11 $
- * $Id: JahiaMacroListener.java,v 1.1.2.1 2005/03/25 15:12:11 tdraier Exp $
+ * $Date: 2005/04/06 15:42:09 $
+ * $Id: JahiaMacroListener.java,v 1.1.2.2 2005/04/06 15:42:09 tdraier Exp $
* $RCSfile: JahiaMacroListener.java,v $
- * $Revision: 1.1.2.1 $
+ * $Revision: 1.1.2.2 $
* $Source:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/JahiaMacroListener.java,v
$
* $State: Exp $
*/
Index: error.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/filemanager/Attic/error.jsp,v
retrieving revision 1.5.4.1.2.1
retrieving revision 1.5.4.1.2.2
diff -u -r1.5.4.1.2.1 -r1.5.4.1.2.2
--- error.jsp 1 Apr 2005 15:36:24 -0000 1.5.4.1.2.1
+++ error.jsp 6 Apr 2005 15:42:09 -0000 1.5.4.1.2.2
@@ -42,7 +42,7 @@
<tr>
<td width="80%" class="text" valign="top" align="center">
<p class="text">
- <b><jahia:engineResourceBundle
resourceName="org.jahia.engines.filemanager.Filemanager_Engine.filemanagerError.label"/></b>
+ <b><jahia:engineResourceBundle resourceName="<%=
(String)request.getAttribute("error") %>"/></b>
</p>
</td>
</tr>
@@ -58,7 +58,7 @@
<tr>
<td align="center" class="text">
<br><br>
- <a href="#" onClick="history.back()" onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('Close','','<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.closeOn.button"/>',1)"><img name="Close"
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.closeOff.button"/>" width="69" height="17"
border="0"></a>
+ <a href="#" onClick="window.close()" onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('Close','','<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.closeOn.button"/>',1)"><img name="Close"
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.closeOff.button"/>" width="69" height="17"
border="0"></a>
</td>
</tr>
<tr>
