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

Re: [xwiki-devs] [xwiki-notifications] r9953 - xwiki-platform/xwiki-plugins/tags/xwiki-plugin-spacemanager-1.0
by Vincent Massol 29 May '08

29 May '08

Hi Ludovic, Some questions for you: * Why are you re-releasing the SM 1.0 version? (was this an error?). Did you rollback (I didn't see a rollback message)? Has your change overriden the existing 1.0 tag? * Why are you creating a 1.0 branch? Why your change cannot go in 1.1 instead? * Did you create a jira version for 1.0.1? Thanks -Vincent On May 27, 2008, at 9:16 PM, ludovic (SVN) wrote: > Author: ludovic > Date: 2008-05-27 21:16:09 +0200 (Tue, 27 May 2008) > New Revision: 9953 > > Modified: > xwiki-platform/xwiki-plugins/tags/xwiki-plugin-spacemanager-1.0/ > pom.xml > Log: > [maven-release-plugin] prepare release xwiki-plugin-spacemanager-1.0 > > Modified: xwiki-platform/xwiki-plugins/tags/xwiki-plugin- > spacemanager-1.0/pom.xml > =================================================================== > --- xwiki-platform/xwiki-plugins/tags/xwiki-plugin-spacemanager-1.0/ > pom.xml 2008-05-27 19:16:06 UTC (rev 9952) > +++ xwiki-platform/xwiki-plugins/tags/xwiki-plugin-spacemanager-1.0/ > pom.xml 2008-05-27 19:16:09 UTC (rev 9953) > @@ -62,8 +62,8 @@ > </dependencies> > > <scm> > - <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-plugins/bra… > </connection> > - <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-plugins/br… > </developerConnection> > - <url>http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-plugins/branches/xw… > </url> > + <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-plugins/tag… > </connection> > + <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-plugins/ta… > </developerConnection> > + <url>http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/xwiki-plugins/tags/xwiki-… > </url> > </scm> > </project>

3 3

Re: [xwiki-devs] [xwiki-notifications] r9964 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/impl/xwiki
by Vincent Massol 29 May '08

29 May '08

Maybe this code could be put in some releaseLocks() method(s) for now? Thanks -Vincent On May 29, 2008, at 1:24 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2008-05-29 01:24:11 +0200 (Thu, 29 May 2008) > New Revision: 9964 > > Modified: > xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > user/impl/xwiki/XWikiAuthServiceImpl.java > Log: > XWIKI-2191: When user logout, his pages locks should be removed > Fixed. > - When a local user logs out, his locks are removed. > - When a global user logs out, his locks in the current and main > wiki are removed. > > Patch submitted by Asiri Rathnayake, applied with a few changes > > > Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ > xwiki/user/impl/xwiki/XWikiAuthServiceImpl.java > =================================================================== > --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > user/impl/xwiki/XWikiAuthServiceImpl.java 2008-05-28 20:18:19 UTC > (rev 9963) > +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > user/impl/xwiki/XWikiAuthServiceImpl.java 2008-05-28 23:24:11 UTC > (rev 9964) > @@ -31,6 +31,8 @@ > import org.apache.commons.lang.StringUtils; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > +import org.hibernate.Query; > +import org.hibernate.Session; > import org.securityfilter.config.SecurityConfig; > import org.securityfilter.filter.SecurityRequestWrapper; > import org.securityfilter.realm.SimplePrincipal; > @@ -200,8 +202,66 @@ > wrappedRequest.setUserPrincipal(null); > > try { > + if (auth.processLogin(wrappedRequest, response, > context)) { > + return null; > + } > > - // Process login out (this only works with FORMS > + // TODO : This code need to be moved elsewhere > (appropriately). > + Principal user = wrappedRequest.getUserPrincipal(); > + if (context.getAction().equals("logout") && user != > null) { > + // Release all active locks on current wiki. > + try { > + > xwiki.getHibernateStore().beginTransaction(context); > + Session session = > xwiki.getHibernateStore().getSession(context); > + String sql = "delete from XWikiLock as lock > where lock.userName=:userName"; > + Query query = session.createQuery(sql); > + query.setString("userName", user.getName()); > + query.executeUpdate(); > + } catch (Exception e) { > + throw new > XWikiException(XWikiException.MODULE_XWIKI_STORE, > + > XWikiException.ERROR_XWIKI_STORE_HIBERNATE_DELETING_LOCK, > + "Error while deleting active locks held by > logging out user."); > + } finally { > + try { > + > xwiki.getHibernateStore().endTransaction(context, true); > + } catch (Exception e) { > + > + } > + } > + // If we're in a non-main wiki & the user is global, > + // switch to the global wiki and delete locks held > there. > + if (xwiki.isVirtualMode() > + && ! > context.getMainXWiki().equals(context.getDatabase()) > + && > user.getName().startsWith(context.getMainXWiki() + ":")) { > + String cdb = context.getDatabase(); > + // switch to main wiki. > + context.setDatabase(context.getMainXWiki()); > + try { > + > xwiki.getHibernateStore().beginTransaction(context); > + Session session = > xwiki.getHibernateStore().getSession(context); > + String sql = > + "delete from XWikiLock as lock where > lock.userName=:userName"; > + Query query = session.createQuery(sql); > + String localName = > user.getName().substring(user.getName().indexOf(":") + 1); > + query.setString("userName", localName); > + query.executeUpdate(); > + } catch (Exception e) { > + throw new > XWikiException(XWikiException.MODULE_XWIKI_STORE, > + > XWikiException.ERROR_XWIKI_STORE_HIBERNATE_DELETING_LOCK, > + "Error while deleting active locks held > by logging out user."); > + } finally { > + try { > + > xwiki.getHibernateStore().endTransaction(context, true); > + } catch (Exception e) { > + > + } > + // switch back to original wiki. > + context.setDatabase(cdb); > + } > + } > + } > + > + // Process logout (this only works with Forms) > if (auth.processLogout(wrappedRequest, response, > xwiki.getUrlPatternMatcher())) { > if (log.isInfoEnabled()) { > log.info("User " + context.getUser() + " has > been logged-out"); > @@ -210,11 +270,6 @@ > return null; > } > > - if (auth.processLogin(wrappedRequest, response, > context)) { > - return null; > - } > - > - Principal user = wrappedRequest.getUserPrincipal(); > if (log.isInfoEnabled()) { > if (user != null) { > log.info("User " + user.getName() + " is > authentified");

1 0

[xwiki-devs] [Proposal] QueryManager in store
by Artem Melentyev 28 May '08

28 May '08

Hi, devs. I would like to propose new QueryManager which will deprecate our store.search(* methods This proposal is based on Vincent ideas at http://markmail.org/message/mjgg52coupsmfomg and QueryManager from JCR v2 QueryManager is designed for low-level querying in Java code. (QueryPlugin for high-level and velocity) The main idea is support of multiple languages and easy to add new languages. This is needed for JCRStore. Here is interfaces: public interface QueryManager { Query createQuery(String statement, String language); Query getNamedQuery(String qname); String[] getLanguages(); boolean hasLanguage(String language); } public interface Query { enum Language { HQL, XPATH, JCRSQL } <T> List<T> execute(); Query bindValue(String var, Object val); Query setLimit(int limit); Query setOffset(int offset); } Here is abstract usecase: QueryManager qm = xwiki.getStore().getQueryManager(); Query q = qm.getNamedQuery("SomeNameOfQuery"); if (q==null && qm.hasLanguage(Query.Language.HQL.name())) { q = qm.createQuery("from XWikiDocument where author=:var", Language.HQL.name()); } else if (q==null && qm.hasLanguage(Language.XPATH.name())) { q = qm.createQuery("/*/*[@author=:var]", Language.XPATH.name()); } else throw new RuntimeException(); List<XWikiDocument> res = q.setLimit(10).setOffset(10) .bindValue("var", "Some.Author").execute(); notes: I'm not sure we need getNamedQuery right now. But it can be useful for move some complicated queries to store level (to some QueryHolders) or overriding queries. Queries are detached from store session. So session isn't opened until Query#execute(). WDYT? -- Artem Melentyev

2 6

Re: [xwiki-devs] [xwiki-notifications] r9958 - xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/client/app
by Vincent Massol 28 May '08

28 May '08

Hi Anca, A possible improvement below. On May 28, 2008, at 12:47 PM, lucaa (SVN) wrote: > Author: lucaa > Date: 2008-05-28 12:47:56 +0200 (Wed, 28 May 2008) > New Revision: 9958 > > Modified: > xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/ > client/app/XWikiGWTDefaultApp.java > Log: > XWIKI-2408: Default XWikiService URL not created correctly in hosted > mode in XWikiGWTDefaultApp > > * added a test for the ending character of the module base URL > returned by GWT > > > Modified: xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/ > gwt/api/client/app/XWikiGWTDefaultApp.java > =================================================================== > --- xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/ > client/app/XWikiGWTDefaultApp.java 2008-05-28 10:40:44 UTC (rev 9957) > +++ xwiki-platform/web/trunk/gwt/src/main/java/com/xpn/xwiki/gwt/api/ > client/app/XWikiGWTDefaultApp.java 2008-05-28 10:47:56 UTC (rev 9958) > @@ -181,10 +181,15 @@ > if (serviceInstance == null) { > serviceInstance = (XWikiServiceAsync) > GWT.create(XWikiService.class); > String defaultXWikiService; > - if (GWT.isScript()) > + if (GWT.isScript()) { > defaultXWikiService = > XWikiGWTAppConstants.XWIKI_DEFAULT_BASE_URL + > XWikiGWTAppConstants.XWIKI_DEFAULT_SERVICE; > - else > - defaultXWikiService = GWT.getModuleBaseURL() + > XWikiGWTAppConstants.XWIKI_DEFAULT_SERVICE; > + } else { > + String moduleBaseURL = GWT.getModuleBaseURL(); > + if (moduleBaseURL.endsWith("/")) { > + moduleBaseURL = moduleBaseURL.substring(0, > moduleBaseURL.length() - 1); > + } // Here, explain why we need to remove the last "/" if it's there and why it's not deterministic String moduleBaseURL = StringUtils.chomp(GWT.getModuleBaseURL(), "/"); > > + defaultXWikiService = moduleBaseURL + > XWikiGWTAppConstants.XWIKI_DEFAULT_SERVICE; > + } > ((ServiceDefTarget) > serviceInstance).setServiceEntryPoint(getParam("xwikiservice" , > defaultXWikiService)); > } > return serviceInstance; Thanks -Vincent

2 4

Re: [xwiki-devs] [xwiki-notifications] r9956 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki
by Vincent Massol 28 May '08

28 May '08

Thomas, does this mean it's now set in 2 places? If so I think that's not correct. Thanks -Vincent On May 27, 2008, at 10:58 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2008-05-27 22:58:40 +0200 (Tue, 27 May 2008) > New Revision: 9956 > > Modified: > xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > XWiki.java > Log: > XWIKI-2367: Makes ComponentManager getable without the XWikiContext > * Reset ComponentManager in XWiki.initXWiki as shared-test can't > call Utils.setComponentManager > > Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ > xwiki/XWiki.java > =================================================================== > --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > XWiki.java 2008-05-27 19:37:05 UTC (rev 9955) > +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > XWiki.java 2008-05-27 20:58:40 UTC (rev 9956) > @@ -737,6 +737,11 @@ > public void initXWiki(XWikiConfig config, XWikiContext context, > XWikiEngineContext engine_context, boolean noupdate) throws > XWikiException > { > + // Statically store the component manager in {@link Utils} > to be able to access it without > + // the context. > + Utils.setComponentManager((ComponentManager) context > + .get(ComponentManager.class.getName())); > + > setEngineContext(engine_context); > context.setWiki(this);

2 6

[xwiki-devs] Choosing a JIRA issue ...
by Asiri Rathnayake 28 May '08

28 May '08

Hi Devs, I've gone through xwiki-core JIRA list and i selected following three issues out of which i wish to pick a one. But before jumping in, i need some guidance on which one to select. I thought it's best to ask from the list since i might not be aware of the severity of these issues. * XWIKI-2191 <http://jira.xwiki.org/jira/browse/XWIKI-2191> - (When user logout, his pages locks should be removed - Reported by Thomas Mortagne) * XWIKI-1538 <http://jira.xwiki.org/jira/browse/XWIKI-1538> - (Improve performance by efficiently using synchronized code - Reported by Sergiu Dumitriu) * XWIKI-671 <http://jira.xwiki.org/jira/browse/XWIKI-671> - (Refactor the code using deprecated API - Reported by Sergiu Dumitriu) Thank you very much for your time. - Asiri

4 11

[xwiki-devs] XWiki crashes on high load?
by Squirrel 27 May '08

27 May '08

Hi guys, Some days ago may server got some high CPU load and was unavailable to any web-request. When I checked what causes it I found out it was Tomcat5.5. So I did run some benchmark tests with ab (Apache Benchmark) and found out that I can repeatedly crash Tomcat5.5 with some 'high' concurrent values (ab -n 400 -c 100 http://domain.com/xwiki/bin/view/Main/) In some posts it was hinted that not Tomcat itself crashs, but the webapp itself and the developers may be able to track what causes the loop. Are you able to reproduce that? Is it really a XWiki issue or is it indeed a Java/Tomcat issue? Can I help in someway? Cheers My system ---------------- Dedicated Server running Debian 4 1024MB RAM 100Mbit/s Tomcat5.5 Java JDK 1.5 Apache2 XWiki 1.3.1.8931

2 1

Re: [xwiki-devs] [xwiki-notifications] r9945 - xwiki-extensions/xwiki-eclipse/trunk
by Vincent Massol 27 May '08

27 May '08

Hi Fabio, In the new instructions below I don't see how we can build the RCP version. Thanks -Vincent On May 27, 2008, at 5:25 PM, fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2008-05-27 17:25:07 +0200 (Tue, 27 May 2008) > New Revision: 9945 > > Modified: > xwiki-extensions/xwiki-eclipse/trunk/README > Log: > Updated build instructions > > Modified: xwiki-extensions/xwiki-eclipse/trunk/README > =================================================================== > --- xwiki-extensions/xwiki-eclipse/trunk/README 2008-05-27 15:07:43 > UTC (rev 9944) > +++ xwiki-extensions/xwiki-eclipse/trunk/README 2008-05-27 15:25:07 > UTC (rev 9945) > @@ -1,6 +1,39 @@ > The directory structure may appear strange but it's required by the > Maven PDE plugin. > See http://mojo.codehaus.org/pde-maven-plugin/usage.html for more > details. > > +A new, refactored and improved version of XWiki Eclipse is now > available in the repository. > +This version has a new architecture and a better integration with > the Eclipse platform. > + > +This new version is made of the following plugins and features: > + * org.xwiki.eclipse.core > + * org.xwiki.eclipse.ui > + * org.xwiki.eclipse.xmlrpc > + * org.xwiki.eclipse.feature > + > +In order to build: > + > +1) Checkout the trunk: "svn co http://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk/ > " > +2) cd to trunk/features/org.xwiki.eclipse.feature. > +3) Do a "mvn -DeclipseInstall=/AbsolutePath/To/Your/Eclipse/ > Installation" compile. > +4) You should now have a > org.xwiki.eclipse.feature_1.2.0.SNAPSHOT.bin.dist.zip file in this > directory. > + > +In order to install: > + > +1) Unzip org.xwiki.eclipse.feature_1.2.0.SNAPSHOT.bin.dist.zip into > your Eclipse directory. > +2) Run Eclipse. > +2.1) If XWiki Eclipse doesn't show up anywhere (for example when > you open the Window->Show view->Other... dialog) > + then you might need to re-run Eclipse by specifying the -clean > switch on the command line. > + > +You can start using XWiki Eclipse by creating a connection using > the File->New->Other... menu command. > +XWiki connections will be accessible from the Project Explorer and > XWiki Navigator. > + > +Enjoy. > + > + > + > + > ------------------------------------------------------------------------------------------------------------------------ > +* This refers to the previous version of XWiki Eclipse still > available on the SVN but deprecated. > + > ------------------------------------------------------------------------------------------------------------------------ > There are 2 builds: > > * The plugin build which generates an Eclipse plugin for XEclipse. > It's located in plugins/org.xwiki.eclipse

2 1

Re: [xwiki-devs] [xwiki-notifications] r9932 - xwiki-platform/web/trunk/standard/src/main/webapp/templates
by Vincent Massol 27 May '08

27 May '08

On May 27, 2008, at 3:10 PM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2008-05-27 15:10:39 +0200 (Tue, 27 May 2008) > New Revision: 9932 > > Modified: > xwiki-platform/web/trunk/standard/src/main/webapp/templates/ > historyinline.vm > Log: > XWIKI-2405: The history page displays dates in the 12 hours format > > > Modified: xwiki-platform/web/trunk/standard/src/main/webapp/ > templates/historyinline.vm > =================================================================== > --- xwiki-platform/web/trunk/standard/src/main/webapp/templates/ > historyinline.vm 2008-05-27 11:20:25 UTC (rev 9931) > +++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/ > historyinline.vm 2008-05-27 13:10:39 UTC (rev 9932) > @@ -66,7 +66,7 @@ > <td><input type="radio" name="rev2" value="$version" /></td> > <td><a href="$tdoc.getURL("viewrev","rev=$version")"> > $version</a></td> > <td>$xwiki.getLocalUserName($revinfo.author)</td> > - <td>$xwiki.formatDate($revinfo.date, "dd/MM/yyyy hh:mm")</ > td> > + <td>$xwiki.formatDate($revinfo.date, "dd/MM/yyyy HH:mm")</ > td> Shouldn't this use the default format instead? public String formatDate(Date date) This format is defined in the wiki preferences. Thanks -Vincent

2 1

[xwiki-devs] XEclipse committed to trunk
by Fabio Mancinelli 27 May '08

27 May '08

Dear all, I have just committed the new XEclipse infrastructure to the trunk. For building and installation instruction you can go to http://svn.xwiki.org/svnroot/xwiki/xwiki-extensions/xwiki-eclipse/trunk/REA… As I have said in a previous message this version has a new architecture and a better integration with the Eclipse platform and has a more stable and flexible caching system that can be easily extended. It is almost feature equivalent with the previous one: I only need to figure out how to integrate Eclipse working sets and to re-integrate RCP (so at the moment the new XEclipse is only available as a platform plugin). I am working on this. The most important new feature, though, is object edition. XEclipse works fine with both Eclipse 3.3.x and 3.4Mx and can be compiled with one of these two platforms. I encourage you to install and try it. For GSoCers: 1) Malaka, editors are located in the org.xwiki.eclipse.ui plugins in the org.xwiki.eclipse.ui.editors.* packages. As you will notice these are full fledged editors that are not configured for any content- assist, syntax highlighting support (which you are going to write soon :)) At some point you will need to plug your infrastructure to the org.xwiki.eclipse.ui.editors.PageEditor and org.xwiki.eclipse.ui.editors.propertyEditors.TextAreaPropertyEditor. We will talk about this later. 2) As far as I understood, Enygma is working on the Eclipse-offline project that eventually will be integrated into XWiki Eclipse. It could be interesting for him to have a look at the org.xwiki.eclipse.core.storage.IDataStorage interface. This is an interface that is currently used by the DataManager for handling data exchange between a "master" and "slave" XWiki storages (i.e., a remote XWiki and a local Cache). The DataManager should be fully configurable so, for example, it should be possible to use two remote XWikis as master and slave. The only problem, right now, is that the slave data storage semantics should preserve the version number at each save, and the RemoteXWikiDataStorage does not have such a semantics right now. Cheers, Fabio

1 0