This is a patch to integrate existing Webadmin code from scratchpad to main codebase. Changes include removing avalon/excalibur libraries, adding multiple database support, cleanup. WebAdmin code was moved from scratchpad to java/src, new files were added, several files were removed... This makes it difficult to create a patch, instead I will attach archive with all files that are related to WebAdmin + patch to existing code. If there is a better way, please let me know.
Created attachment 20230 [details] webdav.patch
Created attachment 20231 [details] webadmin.tgz This is an archive with all files that are new/moved to a new location.
I see that in the patch, there are changes to the filer interface and its implementations. Can you summarize non trivial changes to core code - what is the change and what is the desired effect. Thanks!
(In reply to comment #3) > I see that in the patch, there are changes to the filer interface and its > implementations. Can you summarize non trivial changes to core code - what is > the change and what is the desired effect. Thanks! Sure. The changes were discussed on dev list [1] and include the following: 1. Collection's insert and set are separated. 2. Collection getEntry() method returns Entry class that holds object, its record-level meta and key. This change triggered additional changes in DocumentCache class to store Entries instead of objects. 3. As you noticed, Filer interface was modified and method writeRecord() returns Record instead of boolean. This was done to allow Collection to cache just written record, as it was done before with a plain object, and required meta information to be returned. Also, as a side effect, it allows to store same creation/modification time for the record in meta collection. The previously returned boolean was only actually used in one Filer implementation, FSFiler, but returned value was never checked by Collection anyway, so xml-rpc client would never get any indication that something failed. 4. Filer's readRecord() method got an additional parameter to instruct it to read record metadata only. [1] http://marc.info/?l=xindice-dev&m=117875003317965&w=2
patch applied. please verify!
(In reply to comment #5) > patch applied. please verify! Couple of files should be deleted as they are no longer needed: java/src/org/apache/xindice/webadmin/util/MimeTypes.xml java/src/org/apache/xindice/webadmin/WebAdmin.xconf java/src/org/apache/xindice/webadmin/WebAdmin.xlog Other than that, everything looks OK.
There are some build issues. Is there a jar that didn't get checked in or some extra classes? Following is the compile output. [javac] location: class org.apache.xindice.webadmin.viewer.components.MetadataResourceViewer [javac] FileItem item = (FileItem) iter.next(); [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java:112: cannot find symbol [javac] symbol : class FileItem [javac] location: class org.apache.xindice.webadmin.viewer.components.MetadataResourceViewer [javac] FileItem item = (FileItem) iter.next(); [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java:114: cannot find symbol [javac] symbol : class FileItem [javac] location: class org.apache.xindice.webadmin.viewer.components.MetadataResourceViewer [javac] FileItem uploadFile = null; [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/MetadataResourceViewer.java:125: cannot find symbol [javac] symbol : class FileUploadException [javac] location: class org.apache.xindice.webadmin.viewer.components.MetadataResourceViewer [javac] } catch (FileUploadException e) { [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java:72: cannot find symbol [javac] symbol : class DiskFileUpload [javac] location: class org.apache.xindice.webadmin.viewer.components.UploadCollectionViewer [javac] DiskFileUpload upload = new DiskFileUpload(); [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java:72: cannot find symbol [javac] symbol : class DiskFileUpload [javac] location: class org.apache.xindice.webadmin.viewer.components.UploadCollectionViewer [javac] DiskFileUpload upload = new DiskFileUpload(); [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java:85: cannot find symbol [javac] symbol : class FileUploadException [javac] location: class org.apache.xindice.webadmin.viewer.components.UploadCollectionViewer [javac] } catch (FileUploadException e) { [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java:113: cannot find symbol [javac] symbol : class FileItem [javac] location: class org.apache.xindice.webadmin.viewer.components.UploadCollectionViewer [javac] FileItem item = (FileItem) iter.next(); [javac] ^ [javac] /x1/gump/public/workspace/xml-xindice/java/src/org/apache/xindice/webadmin/viewer/components/UploadCollectionViewer.java:113: cannot find symbol [javac] symbol : class FileItem [javac] location: class org.apache.xindice.webadmin.viewer.components.UploadCollectionViewer [javac] FileItem item = (FileItem) iter.next();
Todd - do you refer to gump build errors or you are seeing it locally on your box?
(In reply to comment #8) > Todd - do you refer to gump build errors or you are seeing it locally on your box? Gump build errors from the last few days. Todd
(In reply to comment #9) > (In reply to comment #8) > > Todd - do you refer to gump build errors or you are seeing it locally on your box? > > Gump build errors from the last few days. > > Todd SVN trunk builds so its just Gump thats having issues. Todd
Stefan fixed gump so we are cool.