- xwiki-devs@xwiki.org - lists.xwiki.org

Re: [xwiki-devs] [xwiki-notifications] r11629 - in sandbox/xwiki-webdav: database src/main/java/com/xpn/xwiki/plugin/webdav src/main/java/com/xpn/xwiki/plugin/webdav/resources/domain src/main/resources src/main/webapp/WEB-INF
by Vincent Massol 01 Aug '08

01 Aug '08

Hi Asiri, You shouldn't have plexus.xml and plexus.properties files in your svn tree. If what you want to do is create a WAR you should do as it's done in enterprise/ or workspaces/ or watch/, etc and do an overlay of the platform war. That said we need to discuss the webdav integration into xwiki (see my several emails on the topic but I think we had a problem to understand each other...). I learnt today from Ludovic that the webdav feature has a servlet so we need to think about how we can integrate that. The first question is why do you need a servlet from the main one? Thanks -Vincent On Aug 1, 2008, at 9:08 PM, asiri (SVN) wrote: > Author: asiri > Date: 2008-08-01 21:08:36 +0200 (Fri, 01 Aug 2008) > New Revision: 11629 > > Added: > sandbox/xwiki-webdav/src/main/webapp/WEB-INF/plexus.properties > sandbox/xwiki-webdav/src/main/webapp/WEB-INF/plexus.xml > Removed: > sandbox/xwiki-webdav/src/main/resources/plexus.xml > Modified: > sandbox/xwiki-webdav/database/xwiki_db.properties > sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/ > XWikiDavServlet.java > sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/ > resources/domain/XWikiDavPage.java > sandbox/xwiki-webdav/src/main/webapp/WEB-INF/ > sandbox/xwiki-webdav/src/main/webapp/WEB-INF/web.xml > Log: > Removed plexus init code from XWikiDavServlet. Changed rename page > code (not fully complete yet). > > Modified: sandbox/xwiki-webdav/database/xwiki_db.properties > =================================================================== > --- sandbox/xwiki-webdav/database/xwiki_db.properties 2008-08-01 > 18:09:23 UTC (rev 11628) > +++ sandbox/xwiki-webdav/database/xwiki_db.properties 2008-08-01 > 19:08:36 UTC (rev 11629) > @@ -1,5 +1,5 @@ > #HSQL Database Engine 1.8.0.5 > -#Sun Jun 29 23:14:58 LKT 2008 > +#Sat Aug 02 00:18:58 LKT 2008 > hsqldb.script_format=0 > runtime.gc_interval=0 > sql.enforce_strict_size=false > > Modified: sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/ > webdav/XWikiDavServlet.java > =================================================================== > --- sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/ > XWikiDavServlet.java 2008-08-01 18:09:23 UTC (rev 11628) > +++ sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/ > XWikiDavServlet.java 2008-08-01 19:08:36 UTC (rev 11629) > @@ -20,31 +20,25 @@ > import org.apache.jackrabbit.webdav.WebdavRequest; > import org.apache.jackrabbit.webdav.WebdavRequestImpl; > import org.apache.jackrabbit.webdav.WebdavResponse; > -import org.apache.jackrabbit.webdav.WebdavResponseImpl; > import org.apache.jackrabbit.webdav.lock.LockManager; > import org.apache.jackrabbit.webdav.lock.SimpleLockManager; > import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet; > import org.apache.jackrabbit.webdav.simple.DavSessionProviderImpl; > import org.apache.jackrabbit.webdav.simple.LocatorFactoryImplEx; > -import org.codehaus.plexus.DefaultContainerConfiguration; > -import org.codehaus.plexus.DefaultPlexusContainer; > -import org.codehaus.plexus.PlexusContainerException; > -import > org > .codehaus > .plexus.personality.plexus.lifecycle.phase.PlexusContainerLocator; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > import org.xwiki.component.manager.ComponentManager; > -import org.xwiki.plexus.manager.PlexusComponentManager; > import org.xwiki.container.Container; > -import org.xwiki.container.servlet.ServletContainerInitializer; > import org.xwiki.container.servlet.ServletContainerException; > +import org.xwiki.container.servlet.ServletContainerInitializer; > import org.xwiki.context.Execution; > > +import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.plugin.webdav.resources.XWikiDavResource; > import com.xpn.xwiki.plugin.webdav.utils.XWikiDavSessionProvider; > import com.xpn.xwiki.plugin.webdav.utils.XWikiResourceConfig; > import com.xpn.xwiki.plugin.webdav.utils.XWikiResourceFactory; > import com.xpn.xwiki.web.Utils; > -import com.xpn.xwiki.XWikiContext; > > /** > * {@link XWikiDavServlet} implements DAV functionalities into XWiki. > @@ -276,26 +270,6 @@ > this.resourceConfig = resourceConfig; > } > > - /** > - * Initializes and returns the {@link ComponentManager}. > - * > - * @return a configured Component Manager (which uses the > plexus.xml file in the resources > - * directory) which can then be put in the XWiki > Context for testing. > - */ > - /* > - private ComponentManager getComponentManager() throws > PlexusContainerException > - { > - if (this.componentManager == null) { > - DefaultContainerConfiguration configuration = new > DefaultContainerConfiguration(); > - configuration.setContainerConfiguration("/plexus.xml"); > - DefaultPlexusContainer container = new > DefaultPlexusContainer(configuration); > - PlexusContainerLocator locator = new > PlexusContainerLocator(container); > - this.componentManager = new > PlexusComponentManager(locator); > - } > - return this.componentManager; > - } > - */ > - > protected void initializeContainerComponent(XWikiContext context) > throws ServletException > { > @@ -336,17 +310,7 @@ > */ > public void init() throws ServletException > { > - super.init(); > - > - // Initialize the componentManager (Required by XWiki). > - /* try { > - > getServletContext().setAttribute(ComponentManager.class.getName(), > - getComponentManager()); > - } catch (PlexusContainerException e) { > - throw new ServletException(e); > - } > - */ > - > + super.init(); > resourcePathPrefix = > getInitParameter(INIT_PARAM_RESOURCE_PATH_PREFIX); > if (resourcePathPrefix == null) { > this.resourcePathPrefix = ""; > > Modified: sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/ > webdav/resources/domain/XWikiDavPage.java > =================================================================== > --- sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/ > resources/domain/XWikiDavPage.java 2008-08-01 18:09:23 UTC (rev 11628) > +++ sandbox/xwiki-webdav/src/main/java/com/xpn/xwiki/plugin/webdav/ > resources/domain/XWikiDavPage.java 2008-08-01 19:08:36 UTC (rev 11629) > @@ -316,7 +316,20 @@ > List<String> childDocNames = > > xwikiContext.getWiki().getStore().searchDocumentsNames(sql, 0, 0, > xwikiContext); > - doc.rename(newDocName, xwikiContext); > + // TODO : XWikiDocument.rename() seems to be > broken. This code will be soon replaced > + // to use XWiki.renameDocument() JIRA : http://jira.xwiki.org/jira/browse/XWIKI-2600 > + // following is a (partial) hack. > + // 1. Extract the original content. > + String content = doc.getContent(); > + // 2. Rename the document. > + doc.rename(newDocName, xwikiContext); > + // Change this instances name (not required). > + this.name = newDocName; > + // 3. Reload the renamed page > + doc = xwikiContext.getWiki().getDocument(this.name, > xwikiContext); > + // 4. Set the old content. > + doc.setContent(content); > + // 5. Save the new document back. > xwikiContext.getWiki().saveDocument(doc, > xwikiContext); > for (String childDocName : childDocNames) { > XWikiDocument childDoc = > > Deleted: sandbox/xwiki-webdav/src/main/resources/plexus.xml > =================================================================== > --- sandbox/xwiki-webdav/src/main/resources/plexus.xml 2008-08-01 > 18:09:23 UTC (rev 11628) > +++ sandbox/xwiki-webdav/src/main/resources/plexus.xml 2008-08-01 > 19:08:36 UTC (rev 11629) > @@ -1,54 +0,0 @@ > - > -<plexus> > - > -  > - <lifecycle-handler-manager > implementation > ="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager"> > - <lifecycle-handlers> > - <lifecycle-handler > implementation="org.xwiki.plexus.lifecycle.XWikiLifecycleHandler"> > - <id>xwiki</id> > - <name>XWiki Lifecycle Handler</name> > - <begin-segment> > -  > - <phase > implementation="org.xwiki.plexus.lifecycle.phase.LogEnablePhase"/> > - <phase > implementation > = > "org > .codehaus > .plexus.personality.plexus.lifecycle.phase.CompositionPhase"/> > - <phase > implementation > = > "org > .codehaus > .plexus.personality.plexus.lifecycle.phase.AutoConfigurePhase"/> > -  > -  > - <phase > implementation="org.xwiki.plexus.lifecycle.phase.ComposePhase"/> > - <phase > implementation="org.xwiki.plexus.lifecycle.phase.InitializePhase"/> > - </begin-segment> > - <suspend-segment/> > - <resume-segment/> > - <end-segment/> > - </lifecycle-handler> > - </lifecycle-handlers> > - <default-lifecycle-handler-id>xwiki</default-lifecycle-handler- > id> > - </lifecycle-handler-manager> > - > - <components> > -  > -  > - </components> > - > -</plexus> > - > - > > > Property changes on: sandbox/xwiki-webdav/src/main/webapp/WEB-INF > ___________________________________________________________________ > Name: svn:ignore > + lib > > > Added: sandbox/xwiki-webdav/src/main/webapp/WEB-INF/plexus.properties > =================================================================== > --- sandbox/xwiki-webdav/src/main/webapp/WEB-INF/ > plexus.properties (rev 0) > +++ sandbox/xwiki-webdav/src/main/webapp/WEB-INF/plexus.properties > 2008-08-01 19:08:36 UTC (rev 11629) > @@ -0,0 +1,4 @@ > +# Plexus configuration file. It's required by some part of Plexus > +# that we don't use. It's a bug that Plexus makes it mandatory. > +# In the future, remove it once Plexus doesn't give a warning > +# when this file isn't present. > > Added: sandbox/xwiki-webdav/src/main/webapp/WEB-INF/plexus.xml > =================================================================== > --- sandbox/xwiki-webdav/src/main/webapp/WEB-INF/ > plexus.xml (rev 0) > +++ sandbox/xwiki-webdav/src/main/webapp/WEB-INF/plexus.xml > 2008-08-01 19:08:36 UTC (rev 11629) > @@ -0,0 +1,54 @@ > + > +<plexus> > + > +  > + <lifecycle-handler-manager > implementation > ="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager"> > + <lifecycle-handlers> > + <lifecycle-handler > implementation="org.xwiki.plexus.lifecycle.XWikiLifecycleHandler"> > + <id>xwiki</id> > + <name>XWiki Lifecycle Handler</name> > + <begin-segment> > +  > + <phase > implementation="org.xwiki.plexus.lifecycle.phase.LogEnablePhase"/> > + <phase > implementation > = > "org > .codehaus > .plexus.personality.plexus.lifecycle.phase.CompositionPhase"/> > + <phase > implementation > = > "org > .codehaus > .plexus.personality.plexus.lifecycle.phase.AutoConfigurePhase"/> > +  > +  > + <phase > implementation="org.xwiki.plexus.lifecycle.phase.ComposePhase"/> > + <phase > implementation="org.xwiki.plexus.lifecycle.phase.InitializePhase"/> > + </begin-segment> > + <suspend-segment/> > + <resume-segment/> > + <end-segment/> > + </lifecycle-handler> > + </lifecycle-handlers> > + <default-lifecycle-handler-id>xwiki</default-lifecycle-handler- > id> > + </lifecycle-handler-manager> > + > + <components> > +  > +  > + </components> > + > +</plexus> > + > + > > Modified: sandbox/xwiki-webdav/src/main/webapp/WEB-INF/web.xml > =================================================================== > --- sandbox/xwiki-webdav/src/main/webapp/WEB-INF/web.xml 2008-08-01 > 18:09:23 UTC (rev 11628) > +++ sandbox/xwiki-webdav/src/main/webapp/WEB-INF/web.xml 2008-08-01 > 19:08:36 UTC (rev 11629) > @@ -1,17 +1,20 @@ > <?xml version="1.0" encoding="UTF-8"?> > -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee > " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd > "> > - <display-name> > - xwiki-webdav-servlet > - </display-name> > +<web-app id="WebApp_ID" version="2.4" > + xmlns="http://java.sun.com/xml/ns/j2ee" > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd > "> > + <display-name>xwiki-webdav-servlet</display-name> > +  > + <listener> > + <listener-class> > + org.xwiki.plexus.XWikiPlexusServletContextListener > + </listener-class> > + </listener> > <servlet> > - <description> > - </description> > - <display-name> > - DAVServlet > - </display-name> > - <servlet-name> > - DAVServlet > - </servlet-name> > + <description></description> > + <display-name>DAVServlet</display-name> > + <servlet-name>DAVServlet</servlet-name> > <servlet-class> > com.xpn.xwiki.plugin.webdav.XWikiDavServlet > </servlet-class>

1 0

[xwiki-devs] Comments and Rating plugin step 1
by Ludovic Dubost 01 Aug '08

01 Aug '08

Hi devs, Raluca has worked on a new plugin to manage comments and ratings. The objective of this plugin is to allow the comments and rating to be more modular. This way we can use different type of implementation and still have some common APIs work even though comments or rating information are stored differently. For example this new plugin would allow to decide if we store comments as XWiki Object or as separate Pages. The experience of usage of XWiki has shown that depending on the usage both cases are actually interesting to use. This plugin also allows to apply a comment more precisly. We can assign a comment to a part of a page, or to another comment. This is why a "Container" has been created which can define precisly the parent of a comment. The initial design proposal is here: http://dev.xwiki.org/xwiki/bin/view/Design/RatingSystem http://dev.xwiki.org/xwiki/bin/view/Design/NewCommentsPlugin Raluca has started coding by reimplementing the current behavior in the plugin. It still needs to be wired to the current code to maintain compatibility. The code is in the sandbox http://svn.xwiki.org/svnroot/xwiki/sandbox/plugins/comments/ Feedback welcome Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

1 0

[xwiki-devs] Need to know the path of : xwikilogintable class ..file(.java)
by Deepak24 S 01 Aug '08

01 Aug '08

Hi I gone through the code of xwiki_workspaces.war file and get to know thngs: 1.On first login page the username and verfication is done through login.vm which will call to xwikilogintable class for uservalidation. My query is where this file is located?. Whether it is a java file ornsumthing else. second thng ---Is this file make a link with hibernate and fire query into the database for accessing stored records?. Please reply me! with suggestion Regards, Deepak Sharma Assistant Software Engineer-T Tata Consultancy Services Cell:- 9911502444 Mailto: deepak24.s(a)tcs.com Website: http://www.tcs.com ____________________________________________ Experience certainty. IT Services Business Solutions Outsourcing ____________________________________________ =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

[xwiki-devs] Document copy
by raja raja 01 Aug '08

01 Aug '08

Hai When i try to use copy document it shows following error, how to solve this error Or how copy a document to another space [http-8088-Processor22] ERROR log.SimpleLog4JLogSystem - Left side ($request.sendbye mail) of '==' operation has null value. If a reference, it may not be in the con text. Operation not possible. Main.WebHome [line 39, column 28] Thanks Rajasekar

2 2

[xwiki-devs] [ANN] XWiki Workspaces 1.1 Release Candidate 1 released
by Jerome Velociter 01 Aug '08

01 Aug '08

The XWiki development team is pleased to announce the release of XWiki Workspaces 1.1 Release Candidate 1, Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This is the first Release Candidate for the 1.1 cycle, and is a bug fix release. You can find out more reading the full releases notes at http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesWorkspaces11RC1 <http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesWorkspaces10M2>, including installation and upgrade instructions. Thanks, -The XWiki dev team

1 0

[xwiki-devs] [New rendering] new implementation of parseContent()
by Vincent Massol 01 Aug '08

01 Aug '08

Hi devs, I need to take a decision on this. Right now parseContent() is used to render some text using only Velocity and Groovy renderers. This is used in several places: * resource properties values * TextArea class rendering if the type is "velocitycode" * in sendValidationEmail() for rendering the content extracted from an object property * in the TOC generation for rendering the section titles -- BTW this means no wiki syntax in section titles right now * more... The decision: 1) either I wrap the content passed to parseContent() in {{velocity}} {{groovy}}{{nowiki}}...{{/nowiki}}{{/groovy}}{{/velocity}} 2) either I render it normally but in this case we change the values used. For examples in ApplicationResources.propeties this mean changing: viewcodetitle=Wiki code for <em>$doc.displayTitle</em> to: viewcodetitle=Wiki code for ~~{{velocity}}$doc.displayTitle{{/ velocity}}~~ It also means removing the difference between "velocitycode" and "fullyrendered" for TextAreas since they would be the same. Would remain only "puretext" and "fullyrendered". This means that if you have some TextArea for which you wish velocity rendering but no wiki syntax rendering you would write: {{velocity}}{{nowiki}}...{{/nowiki}} {{/velocity}}. Basically it means deprecating parseContent() in favor of getRenderedContent() since they would have the same behavior. My preference goes to 2) but I'm not sure how to make that work during the transition period where we have the 2 renderings. So I think we don't have the choice and for the moment we should do 1). WDYT? Thanks -Vincent

2 3

[xwiki-devs] [GSoc] [WebDAV] Creating an installation documentation
by Ludovic Dubost 01 Aug '08

01 Aug '08

Hi Asiri, Could you write a installation documentation of the webdav component on xwiki.org. I'd like to create an interoperability page afterwards to tell people how to use it in different platforms. Some more interop news: it works on Vista and Gnome/Nautilus ! Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

4 3

[xwiki-devs] LDAP account info problem
by petr＠imaturita.cz 01 Aug '08

01 Aug '08

Hi all, I found out, that Xwiki 1.5 doesn't load LDAP connection info from xwiki.cfg: xwiki.authentication.ldap.bind_DN=xxx xwiki.authentication.ldap.bind_pass=xxx I had to put these details directly into code (into bind method), recompile core class and then it works. Any solution? Thanks Petr

2 1

[xwiki-devs] XWIKI - Duplicating of space docs to another space
by Prathap Pandian 01 Aug '08

01 Aug '08

Hi, How can i copy all the space docs to another space. I tried with *CopyDocument* option, but i didn't work for me. -- Prathap

2 1

[xwiki-devs] building of xwiki enterprise
by rssh 31 Jul '08

31 Jul '08

Good day. Anybody know, how to build xwiki-enterprise.war after svn reordering ? (xwiki-platform-enterprise directory, mention in documentation is missing in repo now.) -- Ruslan Shevchenko GradSoft. http://www.gradsoft.ua

3 3