xwiki-devs April 2007

xwiki-devs@xwiki.org

40 participants
80 discussions

[Anti Pattern] Do not use $obj.propertyName

by Vincent Massol

Hi, I'm proposing a new category: Anti Patterns! Here's one: Instead of writing: #set($obj = $doc.getObject("XWiki.XWikiUsers")) #if ($obj.avatar == "...") ... Write: #set($obj = $doc.getObject("XWiki.XWikiUsers")) #if ($obj.getProperty("avatar") && $obj.getProperty("avatar").getValue () == "...") ... Reason: $obj.avatar actually is equivalent to: $doc.display("avatar", $obj) And the display() method renders differently when in view mode, in inline mode, etc. For example in inline mode it generates an HTML form INPUT element... WDYT? Thanks -Vincent

17 years, 8 months

[Best Practice] Test existence of properties to avoid Velocity errors in log

by Vincent Massol

Hi, Here's another one best practice I'd like to propose: Instead of writing: #set($obj = ...) #if ($obj.getSomething() == "...") Write: #if($obj && $obj.getSomething() == "...") This prevents the following error in logs: 11:54:04,777 ERROR P1-19 ... SimpleLog4JLogSystem:logVelocityMessage: 154 - Left side ($obj.getSomething()) of '==' operation has null value. If a reference, it may not be in the context. Operation not possible. [line 1, column 21] WDYT? Thanks -Vincent

17 years, 8 months

[Best practice] Test for Object in Class sheets

by Vincent Massol

Hi, I'd like to propose the following best practice: to test for Object existence in class sheets. For example: #set($obj = $doc.getObject("XWiki.XWikiUsers")) #if($obj) ... #else This stylesheet must be applied on a document containing a XWiki.XWikiUsers object. #end If you're all ok I'll add it to the dev guide on http://www.xwiki.org/ xwiki/bin/view/DevGuide/BestPractices (I'll remove what's in there and send each best practice separately to this list for agreement as this is old stuff). Thanks -Vincent

17 years, 8 months

XWiki Google Summer of Code 2007

by tharindu jayasuriya

Hi All, I'm Tharindu Jayasuriya from Sri-Lanka. My application on IDE Editor Integration project was accepted for SOC this year.I followed up the things mentioned by the The XWiki SOC mentor team, for the students who got accepted for SOC . I look forward to collaboratively work with all. Best Regards, Tharindu Jayasuriya.

17 years, 8 months

Re: [xwiki-dev] Re: [xwiki-commits] r2824 - in xwiki/branches/XWIKI_1_0: core/src/main/java/com/xpn/xwiki core/src/main/java/com/xpn/xwiki/api core/src/main/java/com/xpn/xwiki/objects/classes core/src/main/java/com/xpn/xwiki/plugin/query web/standard

by Sergiu Dumitriu

On 4/16/07, Vincent Massol <vincent(a)massol.net> wrote: > > > On Apr 16, 2007, at 10:32 AM, Ludovic Dubost wrote: [snip] > > The reason I did not propose XClass is because even though we've > agree to use this name when we talk about it, this is not a name > currently used in the code and introducing a new concept in only one > place in the code is, I think, a bad idea. If we are going to use these names, then the best places to start is in the JavaDoc and the documentation on xwiki.org. APIs should not be modified for the moment. Maybe when we define the components for the 2.0 architecture. Sergiu -- http://purl.org/net/sergiu

17 years, 8 months

Reply to "Hello XWiki Summer-of-Coders 2007" by Vincent Massol

by evelyne24＠gmail.com

Hello, My name is Evelina Slatineanu and I participate at GSoC for XWiki - Ajax Interface Improvements, mentored by Mr. Sergiu Dumitriu. 1. The address I use frequently is: Evelyne24(a)gmail.com 2. Short introduction: I am a 2nd year student at Computer Science Faculty in Iasi, Romania. I chose to participate to GSoC this summer because I am interested in Open Source community and I consider it to be a very good opportunity for people to collaborate and let other people benefit from their work and their experience. I choose XWiki because I think it has great potential and I want to take part in the development of a software that has such a promising future. More over, I was told that XWiki community is very reliable and supportive and as I am a beginner in this field, I would very much appreciate that. 3. Project milestones: - I want to completely understand and familiarize with XWiki architectural pattern (MVC) and coding rules - I want to be able to learn how XWiki classes work, its layout and structure - I already picked 3 issues on Jira and by the end of May I want to solve them all as good as possible, to prove that I am ready to move on to the next step of coding - I want to start writing the code, under the guidance of my mentor - I want to finish this project as good as possible by the end of August (including a lot of testing to make sure everything is in order) And, of course, I would very much like to become a "permanent" member of XWiki community and a happy contributor to Open Source software and to participate to the next editions of GSoC. That is all, I guess... Happy coding for all! :)

17 years, 8 months

Using SVN and Eclipse for Groovy development

by François Déchelle

Hello, Following the recent discussion on using SVN as a backend for Xwiki, I'd like to discuss something symetrical, i.e. to use SVN and Eclipse as a front-end. The idea is to write Xwiki pages containing Groovy code in Eclipse (or Emacs), store it in SVN and deploy it automatically on an Xwiki. My idea is to use Ant as a deployment tool, with the Ant POST task for instance: http://antelope.tigris.org/nonav/docs/manual/bk03ch17.html This way, the project can be easily integrated into Eclipse. I'm wondering how the Groovy Eclipse plug-in can be used: http://groovy.codehaus.org/Eclipse+Plugin My guess is that the editing part can be usefull, but that running Groovy inside Eclipse wont do it for now. Best, François

17 years, 8 months

Re: [xwiki-commits] r2824 - in xwiki/branches/XWIKI_1_0: core/src/main/java/com/xpn/xwiki core/src/main/java/com/xpn/xwiki/api core/src/main/java/com/xpn/xwiki/objects/classes core/src/main/java/com/xpn/xwiki/plugin/query web/standard/src/main/webapp/skins/albatross web/standard/src/main/webapp/skins/dodo web/standard/src/main/webapp/skins/finch web/standard/src/main/webapp/templates

by Vincent Massol

Hi Ludovic, I have some questions/remarks: 1) The 1090 JIRA issue seems planned for 1.1 B1 but you've still committed stuff in the 1.0 branch so we need a JIRA issue that'll be closed for 1.0 RC1 2) You've added a new getClass API in api.XWiki: 2.1) There's no JIRA issue for this and that's important for end users 2.2) The method name is not good I think as it hides the Object.getClass() method and in any case is confusing. I would suggest getDocumentClass() 2.3) It seems to me this method should be on the Document class rather than on the XWiki class, no? 3) APIs are the most sensitive part of any application and need to be handled with care as it's almost impossible to undo them as they're set in stone and used by end users. As such I think we really need to discuss any API change on the list before we go ahead with changes on them. I'd like that we take this habit of doing so because otherwise: 3.1) API proliferates and goes out of control (as shown in XWiki/ Document/Context) 3.2) All developers are not aware of the new API, why they are there, they may not agree on the names, locations, etc 3.3) More heads is better to really make sure the API is needed and thus open it up as it's an almost irreversible modification WDYT? Thanks -Vincent On Apr 16, 2007, at 1:17 AM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-04-16 01:17:41 +0200 (Mon, 16 Apr 2007) > New Revision: 2824 > > Modified: > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > XWiki.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/api/ > XWiki.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > objects/classes/BaseClass.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/plugin/ > query/DefaultQuery.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/plugin/ > query/HibernateQuery.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/plugin/ > query/IQuery.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/plugin/ > query/JcrQuery.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/plugin/ > query/SecHibernateQuery.java > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/plugin/ > query/XWikiQuery.java > xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > albatross/registerinline.vm > xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/dodo/ > register.vm > xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > finch/register.vm > xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/templates/ > registerinline.vm > Log: > XWIKI-985 Allow register to work even if wiki is completely > protected but register right is given to anonymous users. Update > all register page for older skins. > XWIKI-1090 Added displaySearchOrder API for Query Plugin > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > XWiki.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > XWiki.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > XWiki.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -3697,23 +3697,30 @@ > } > > public boolean prepareDocuments(XWikiRequest request, > XWikiContext context, > - VelocityContext vcontext) throws XWikiException > + VelocityContext vcontext) > throws XWikiException > { > XWikiDocument doc; > String docName = getDocumentName(request, context); > - try { > - doc = getDocument(docName, context); > - } catch (XWikiException e) { > - doc = context.getDoc(); > - if (context.getAction().equals("delete")) { > - if (doc == null) { > - setPhonyDocument(docName, context, vcontext); > - } > - if (!checkAccess("admin", doc, context)) { > + if (context.getAction().equals("register")) { > + setPhonyDocument(docName, context, vcontext); > + context.getWiki().prepareResources(context); > + doc = context.getDoc(); > + } else { > + > + try { > + doc = getDocument(docName, context); > + } catch (XWikiException e) { > + doc = context.getDoc(); > + if (context.getAction().equals("delete")) { > + if (doc == null) { > + setPhonyDocument(docName, context, vcontext); > + } > + if (!checkAccess("admin", doc, context)) { > + throw e; > + } > + } else { > throw e; > } > - } else { > - throw e; > } > } > > @@ -3723,19 +3730,21 @@ > Object[] args = {doc.getFullName(), context.getUser()}; > setPhonyDocument(docName, context, vcontext); > throw new XWikiException > (XWikiException.MODULE_XWIKI_ACCESS, > - XWikiException.ERROR_XWIKI_ACCESS_DENIED, > - "Access to document {0} has been denied to user {1}", > - null, > - args); > + XWikiException.ERROR_XWIKI_ACCESS_DENIED, > + "Access to document {0} has been denied to > user {1}", > + null, > + args); > } else if (checkActive(context) == 0) { > Object[] args = {context.getUser()}; > setPhonyDocument(docName, context, vcontext); > throw new XWikiException > (XWikiException.MODULE_XWIKI_USER, > - XWikiException.ERROR_XWIKI_USER_INACTIVE, > - "User {0} account is inactive", > - null, > - args); > + XWikiException.ERROR_XWIKI_USER_INACTIVE, > + "User {0} account is inactive", > + null, > + args); > } > + > + > context.put("doc", doc); > vcontext.put("doc", doc.newDocument(context)); > vcontext.put("cdoc", vcontext.get("doc")); > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > api/XWiki.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/api/ > XWiki.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/api/ > XWiki.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -2351,6 +2351,37 @@ > } > > /** > + * API to display a select box for the list of available field > for a specific class This field > + * data can then be used to generate the order element of an > XWiki Query showing a table with the relevant data > + * > + * @param className XWiki Class Name to display the list of > columns for > + * @param query Query to pre-select the currently selected > columns > + * @return text of the select field > + * @throws XWikiException exception is a failure occured > + */ > + public String displaySearchOrder(String className, XWikiQuery > query) throws XWikiException > + { > + return xwiki.displaySearchOrder(className, "", query, > getXWikiContext()); > + } > + > + /** > + * API to display a select box for the list of available field > for a specific class, optionally > + * adding a prefix This field data can then be used to > generate the order element of an XWiki Query showing a table > + * with the relevant data > + * > + * @param className XWiki Class Name to display the list of > columns for > + * @param prefix Prefix to add to the field name > + * @param query Query to pre-select the currently selected > columns > + * @return text of the select field > + * @throws XWikiException exception is a failure occured > + */ > + public String displaySearchOrder(String className, String > prefix, XWikiQuery query) > + throws XWikiException > + { > + return xwiki.displaySearchOrder(className, prefix, query, > getXWikiContext()); > + } > + > + /** > * API to display a field in search mode for a specific class > without preselected values This > * field data can then be used to generate an XWiki Query > showing a table with the relevant data > * > @@ -2535,4 +2566,17 @@ > public String clearAccents(String text) { > return Util.noaccents(text); > } > + > + /** > + * Get a Class > + * > + * @return class object > + * @throws XWikiException > + */ > + public Class getClass(String name) throws XWikiException > + { > + return new Class(xwiki.getDocument(name, > context).getxWikiClass(), context); > + } > + > + > } > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > objects/classes/BaseClass.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > objects/classes/BaseClass.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > objects/classes/BaseClass.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -49,6 +49,7 @@ > import com.xpn.xwiki.objects.PropertyInterface; > import com.xpn.xwiki.plugin.query.XWikiCriteria; > import com.xpn.xwiki.plugin.query.XWikiQuery; > +import com.xpn.xwiki.plugin.query.OrderClause; > import com.xpn.xwiki.validation.XWikiValidationInterface; > import com.xpn.xwiki.validation.XWikiValidationStatus; > > @@ -686,6 +687,39 @@ > return select.toString(); > } > > + public String displaySearchOrder(String prefix, XWikiQuery > query, XWikiContext context) { > + select select = new select(prefix + "searchorder", 5); > + select.setMultiple(true); > + select.setName(prefix + "searchorder"); > + select.setID(prefix + "searchorder"); > + > + List list = Arrays.asList(getPropertyNames()); > + Map prettynamesmap = new HashMap(); > + for (int i=0;i<list.size();i++) { > + String propname = (String) list.get(i); > + list.set(i, prefix + propname); > + prettynamesmap.put(prefix + propname, ((PropertyClass) > get(propname)).getPrettyName()); > + } > + > + OrderClause order = null; > + if ((query!=null)&&(query.getOrderProperties()!=null)&& > (query.getOrderProperties().size()>0)) > + order = (OrderClause) query.getOrderProperties().get(0); > + > + // Add options from Set > + for (Iterator it=list.iterator();it.hasNext();) { > + String value = it.next().toString(); > + String displayValue = (String) prettynamesmap.get(value); > + option option = new option(displayValue, displayValue); > + option.addElement(displayValue); > + option.setValue(value); > + if ((order!=null)&&(value.equals(order.getProperty()))) > + option.setSelected(true); > + select.addElement(option); > + } > + > + return select.toString(); > + } > + > public void setValidationScript(String validationScript) { > this.validationScript = validationScript; > } > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/DefaultQuery.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/DefaultQuery.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/DefaultQuery.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -42,7 +42,11 @@ > return null; > } > > - protected int _fetchSize=-1; > + public String getNativeQuery() { > + return null; > + } > + > + protected int _fetchSize=-1; > protected int _firstResult=-1; > protected boolean _isdistinct=false; > public IQuery setMaxResults(int fs) { _fetchSize = fs; return > this; } > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/HibernateQuery.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/HibernateQuery.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/HibernateQuery.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -88,28 +88,34 @@ > } > return true; > } > - public List list() throws XWikiException { > - if (translator==null) > - translator = new XWikiHibernateQueryTranslator( getQueryTree() ); > - StringBuffer _result = new StringBuffer(); > - if (_select.length()>0) > - _result.append("select ").append(_select); > - _result.append(" from ").append(_from); > - > - constructWhere(_result); > - > - if (_order.length()>0) > - _result.append(" order by ").append(_order); > - > - String hql = _result.toString(); > - > - if (log.isDebugEnabled()) > - log.debug("hql: "+hql); > - > + > + public List list() throws XWikiException { > + String hql = getNativeQuery(); > return hqlexec(hql, _hqlparams, _fetchSize, _firstResult); > } > - > - protected SepStringBuffer _select = new SepStringBuffer(","); > + > + public String getNativeQuery() { > + if (translator==null) > + translator = new XWikiHibernateQueryTranslator > ( getQueryTree() ); > + StringBuffer _result = new StringBuffer(); > + if (_select.length()>0) > + _result.append("select ").append(_select); > + _result.append(" from ").append(_from); > + > + constructWhere(_result); > + > + if (_order.length()>0) > + _result.append(" order by ").append(_order); > + > + String hql = _result.toString(); > + > + if (log.isDebugEnabled()) > + log.debug("hql: "+hql); > + > + return hql; > + } > + > + protected SepStringBuffer _select = new SepStringBuffer(","); > protected SepStringBuffer _from = new SepStringBuffer(","); > protected SepStringBuffer _where = new SepStringBuffer(" and "); > protected SepStringBuffer _userwhere = new SepStringBuffer(" and "); > @@ -807,8 +813,8 @@ > translator = null; > return super.setDistinct(d); > } > - > - Map _hqlparams = new HashMap(); > + > + Map _hqlparams = new HashMap(); > protected void _addHqlParam(String pn, Object v) { > _hqlparams.put(pn, v); > } > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/IQuery.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/IQuery.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/IQuery.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -33,4 +33,5 @@ > public IQuery setMaxResults(int fs); > public IQuery setFirstResult(int fr); > public IQuery setDistinct(boolean d); > + public String getNativeQuery(); > } > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/JcrQuery.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/JcrQuery.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/JcrQuery.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -28,12 +28,16 @@ > return (XWikiJcrStore) ((XWikiJcrBaseStore)qf.getContext > ().getWiki().getNotCacheStore()); > } > > - public List list() throws XWikiException { > + public String getNativeQuery() { > + return "store"+query; > + } > + > + public List list() throws XWikiException { > final List result = new ArrayList(); > try { > getStore().executeRead(qf.getContext(), new JcrCallBack() { > public Object doInJcr(XWikiJcrSession session) throws Exception { > - Query q = session.getQueryManager().createQuery > ("store"+query, language); > + Query q = session.getQueryManager().createQuery(getNativeQuery > (), language); > QueryResult qr = q.execute(); > RowIterator ri = qr.getRows(); > if (ri!=null) { > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/SecHibernateQuery.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/SecHibernateQuery.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/SecHibernateQuery.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -94,8 +94,28 @@ > if (PasswordClass.class.equals(class1)) > isAllow = false; > } > - > - public List list() throws XWikiException { > + > + public String getNativeQuery() { > + _allowdocs.clear(); > + String docname = translator.getLastNameClass > (qn_xwiki_document); > + if (docname==null) { > + QName lclass = translator.getLastQNClass(); > + if (qn_xwiki_object.equals(lclass)) { > + final String objname = translator.getLastNameClass > (lclass); > + docname = translator.newXWikiObj(qn_xwiki_document); > + _where.appendWithSep(docname).append > (".fullName=").append(objname).append(".name"); > + } else if (qn_xwiki_attachment.equals(lclass)) { > + final String attname = translator.getLastNameClass > (lclass); > + docname = translator.newXWikiObj(qn_xwiki_document); > + _where.appendWithSep(docname).append(".id=").append > (attname).append(".docId"); > + } else > + throw new TranslateException("Class not exist"); > + } > + _select = new SepStringBuffer(docname+".id,"+docname > +".fullName", null); > + return super.getNativeQuery(); > + } > + > + public List list() throws XWikiException { > if (translator==null) > translator = new XWikiHibernateQueryTranslator(getQueryTree()); > if (!isAllowed()) > @@ -106,23 +126,6 @@ > > final SepStringBuffer _real_select = _select; > try { > - _allowdocs.clear(); > - String docname = translator.getLastNameClass(qn_xwiki_document); > - if (docname==null) { > - QName lclass = translator.getLastQNClass(); > - if (qn_xwiki_object.equals(lclass)) { > - final String objname = translator.getLastNameClass(lclass); > - docname = translator.newXWikiObj(qn_xwiki_document); > - _where.appendWithSep(docname).append(".fullName=").append > (objname).append(".name"); > - } else if (qn_xwiki_attachment.equals(lclass)) { > - final String attname = translator.getLastNameClass(lclass); > - docname = translator.newXWikiObj(qn_xwiki_document); > - _where.appendWithSep(docname).append(".id=").append > (attname).append(".docId"); > - } else > - throw new TranslateException("Class not exist"); > - } > - _select = new SepStringBuffer(docname+".id,"+docname > +".fullName", null); > - > security = false; > int fr = _firstResult; _firstResult = -1; > int fs = _fetchSize; _fetchSize = -1; > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/XWikiQuery.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/XWikiQuery.java 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > plugin/query/XWikiQuery.java 2007-04-15 23:17:41 UTC (rev 2824) > @@ -31,6 +31,8 @@ > super(); > String[] columns = request.getParameterValues(className + > "_" + "searchcolumns"); > setDisplayProperties(columns); > + String[] order = request.getParameterValues(className + > "_" + "searchorder"); > + setOrderProperties(order); > BaseClass bclass = context.getWiki().getDocument > (className, context).getxWikiClass(); > Set properties = bclass.getPropertyList(); > Iterator propid = properties.iterator(); > @@ -41,6 +43,16 @@ > } > } > > + private void setOrderProperties(String[] order) { > + orderProperties.clear(); > + if (order!=null) { > + for (int i=0;i<order.length;i++) { > + OrderClause oclause = new OrderClause(order[i], > OrderClause.ASC); > + orderProperties.add(oclause); > + } > + } > + } > + > public void reset() { > displayProperties = new ArrayList(); > addProperties = new ArrayList(); > > Modified: xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/ > skins/albatross/registerinline.vm > =================================================================== > --- xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > albatross/registerinline.vm 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > albatross/registerinline.vm 2007-04-15 23:17:41 UTC (rev 2824) > @@ -1,4 +1,4 @@ > -#if($xwiki.getDocument("XWiki.Registration").isNew()) > +#if(!$xwiki.hasAccessLevel("view","XWiki.Registration")|| > $xwiki.getDocument("XWiki.Registration").isNew()) > <h1>$msg.get("Registration")</h1> > #if(!$reg||$reg<0 ) > <p>$msg.get("registerwelcome")</p> > @@ -22,8 +22,7 @@ > <div> > <input type="hidden" name="template" > value="XWiki.XWikiUserTemplate" /> > <input type="hidden" name="register" value="1"> > - #set( $class = $xwiki.getDocument > ("XWiki.XWikiUsers").xWikiClass) > - #set( $serverclass = $xwiki.getDocument > ("XWiki.XWikiServerClass").xWikiClass) > + #set( $class = $xwiki.getClass("XWiki.XWikiUsers")) > #set( $obj = $class.newObject() ) > #set( $serverobj = $class.newObject() ) > #set( $ok = $doc.use("XWiki.XWikiUsers")) > > Modified: xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/ > skins/dodo/register.vm > =================================================================== > --- xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > dodo/register.vm 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > dodo/register.vm 2007-04-15 23:17:41 UTC (rev 2824) > @@ -1,78 +1 @@ > -#set ($register = $request.getParameter("register")) > -#if ($register) > -Registration of *$request.getParameter("register_first_name") > $request.getParameter("register_last_name")* > - > -#set( $reg= $xwiki.createUser(false)) > -#if ($reg>0) > -The user [$request.getParameter("xwikiname")] has been registered. > -#else > -An error occured during the registration. > -#end > -#else > -#set($reg=0) > -#end > - > -#if ($reg<=0) > -Welcome to the registration form. This will allow you to edit > pages, once the admin gives you appropriate rights > - > -1.1 Register > - > -<form id="register" name="register" action="" method="post"> > -#includeTopic("xwiki:XWiki.RegisterJS") > -<p> > -<input type="hidden" name="template" > value="XWiki.XWikiUserTemplate" /> > -<input type="hidden" name="register" value="1"> > -#set( $class = $xwiki.getDocument("XWiki.XWikiUsers").xWikiClass) > -#set( $serverclass = $xwiki.getDocument > ("XWiki.XWikiServerClass").xWikiClass) > -#set( $obj = $class.newObject() ) > -#set( $serverobj = $class.newObject() ) > -</p> > -<table class="block" cellspacing="5px"> > - <tbody> > - <tr> > -#set($prop = $class.first_name) > - <td>First name > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > -#set($prop = $class.last_name) > - <td>Last name > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - </tr> > -<tr> > -#set($prop = $class.email) > - <td>e-Mail Address > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - </tr> > -<tr> > -</tr> > -<td></td> > - <tr> > -#set($prop = $class.password) > - <td>Password > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - <td>Password (again) > - </td> > - <td>$doc.displayEdit($prop, "register2_", $obj) > - </td> > - </tr> > -<tr><td></td></tr> > - <tr> > - <td>Wiki username</td> > - <td> > - <input name="xwikiname" type="text" size="20" onfocus=" > prepareName(document.forms.register);" /> > - </td> > - </tr> > - </tbody> > - </table> > -<center> > -<input type="submit" value="Register me"> > -</center> > -</form> > -#end > \ No newline at end of file > +#template("registerinline.vm") > \ No newline at end of file > > Modified: xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/ > skins/finch/register.vm > =================================================================== > --- xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > finch/register.vm 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/skins/ > finch/register.vm 2007-04-15 23:17:41 UTC (rev 2824) > @@ -1,78 +1 @@ > -#set ($register = $request.getParameter("register")) > -#if ($register) > -Registration of *$request.getParameter("register_first_name") > $request.getParameter("register_last_name")* > - > -#set( $reg= $xwiki.createUser(false)) > -#if ($reg>0) > -The user [$request.getParameter("xwikiname")] has been registered. > -#else > -An error occured during the registration. > -#end > -#else > -#set($reg=0) > -#end > - > -#if ($reg<=0) > -Welcome to the registration form. This will allow you to edit > pages, once the admin gives you appropriate rights > - > -1.1 Register > - > -<form id="register" name="register" action="" method="post"> > -#includeTopic("xwiki:XWiki.RegisterJS") > -<p> > -<input type="hidden" name="template" > value="XWiki.XWikiUserTemplate" /> > -<input type="hidden" name="register" value="1"> > -#set( $class = $xwiki.getDocument("XWiki.XWikiUsers").xWikiClass) > -#set( $serverclass = $xwiki.getDocument > ("XWiki.XWikiServerClass").xWikiClass) > -#set( $obj = $class.newObject() ) > -#set( $serverobj = $class.newObject() ) > -</p> > -<table class="block" cellspacing="5px"> > - <tbody> > - <tr> > -#set($prop = $class.first_name) > - <td>First name > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > -#set($prop = $class.last_name) > - <td>Last name > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - </tr> > -<tr> > -#set($prop = $class.email) > - <td>e-Mail Address > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - </tr> > -<tr> > -</tr> > -<td></td> > - <tr> > -#set($prop = $class.password) > - <td>Password > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - <td>Password (again) > - </td> > - <td>$doc.displayEdit($prop, "register2_", $obj) > - </td> > - </tr> > -<tr><td></td></tr> > - <tr> > - <td>Wiki username</td> > - <td> > - <input name="xwikiname" type="text" size="20" onfocus=" > prepareName(document.forms.register);" /> > - </td> > - </tr> > - </tbody> > - </table> > -<center> > -<input type="submit" value="Register me"> > -</center> > -</form> > -#end > \ No newline at end of file > +#template("registerinline.vm") > \ No newline at end of file > > Modified: xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/ > templates/registerinline.vm > =================================================================== > --- xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/templates/ > registerinline.vm 2007-04-15 23:14:37 UTC (rev 2823) > +++ xwiki/branches/XWIKI_1_0/web/standard/src/main/webapp/templates/ > registerinline.vm 2007-04-15 23:17:41 UTC (rev 2824) > @@ -1,83 +1,62 @@ > -<h1>$msg.get("Registration")</h1> > -#if(!$reg||$reg<0 ) > -$msg.get("registerwelcome") > -<br /><br /> > -#end > -#if($reg<=0) > -<span class="registrationerror" style="color: red"> > -#if($reg==-2) > -$msg.get("passwordmismatch") > -#elseif($reg==-3) > -$msg.get("useralreadyexists") > +#if(!$xwiki.hasAccessLevel("view","XWiki.Registration")|| > $xwiki.getDocument("XWiki.Registration").isNew()) > + <h1>$msg.get("Registration")</h1> > + #if(!$reg||$reg<0 ) > + <p>$msg.get("registerwelcome")</p> > + #end > + #if($reg && $reg<=0) > + #if($reg==-2) > + #error("$msg.get('passwordmismatch').") > + #elseif($reg==-3) > + #error("$msg.get('useralreadyexists').") > + #elseif($reg==-4) > + #error("$msg.get('invalidusername').") > + #else > + #error("$msg.get('registerfailed') ($msg.get > ('registerfailedcode') $reg).") > + #end > + #elseif($reg) > + #set($xwname = "XWiki.${request.xwikiname}") > + #info("$xwiki.getUserName($xwname) ($request.xwikiname): > $msg.get('registersuccessful').") > + #end > + #if(!$reg||$reg<0 ) > + <form id="register" name="register" action="" action="" > method="post"> > + <div> > + <input type="hidden" name="template" > value="XWiki.XWikiUserTemplate" /> > + <input type="hidden" name="register" value="1"> > + #set( $class = $xwiki.getClass("XWiki.XWikiUsers")) > + #set( $obj = $class.newObject() ) > + #set( $serverobj = $class.newObject() ) > + #set( $ok = $doc.use("XWiki.XWikiUsers")) > + #if($request.register_first_name) > + $doc.set("first_name", $request.register_first_name) > + #end > + #if($request.register_last_name) > + $doc.set("last_name", $request.register_last_name) > + #end > + <dl> > + #set($prop = $class.first_name) > + <dt>$msg.get("firstname"):</dt> > + <dd>$doc.displayEdit($prop, "register_", $obj)</dd> > + > + #set($prop = $class.last_name) > + <dt>$msg.get("lastname"):</dt> > + <dd>$doc.displayEdit($prop, "register_", $obj)</dd> > + <dt>$msg.get("loginid"):</dt> > + <dd><input name="xwikiname" type="text" size="20" > onfocus=" prepareName(document.forms.register);" /></dd> > + > + #set($prop = $class.password) > + <dt>$msg.get("password"):</dt> > + <dd>$doc.displayEdit($prop, "register_", $obj)</dd> > + <dt>$msg.get("passwordrepeat"):</dt> > + <dd>$doc.displayEdit($prop, "register2_", $obj)</dd> > + > + #set($prop = $class.email) > + <dt>$msg.get("email"):</dt> > + <dd>$doc.displayEdit($prop, "register_", $obj)</dd> > + </dl> > + <span class="buttonwrapper"><input type="submit" > value="$msg.get("iregister")"></span> > + </div> > + </form> > + #end > #else > -$msg.get("registerfailed") ($msg.get("registerfailedcode) $reg) > -#end > -<br /><br /> > -</span> > -#elseif($reg) > -$msg.get("registersuccessful") > -#end > -#if(!$reg||$reg<0 ) > -<form id="register" name="register" action="" action="" > method="post"> > -<p> > -<input type="hidden" name="template" > value="XWiki.XWikiUserTemplate" /> > -<input type="hidden" name="register" value="1"> > -#set( $class = $xwiki.getDocument("XWiki.XWikiUsers").xWikiClass) > -#set( $serverclass = $xwiki.getDocument > ("XWiki.XWikiServerClass").xWikiClass) > -#set( $obj = $class.newObject() ) > -#set( $serverobj = $class.newObject() ) > -#set( $ok = $doc.use("XWiki.XWikiUsers")) > -#if($request.register_first_name) > -$doc.set("first_name", $request.register_first_name) > -#end > -#if($request.register_last_name) > -$doc.set("last_name", $request.register_last_name) > -#end > -</p> > -<table class="block" cellspacing="5px"> > - <tbody> > - <tr> > -#set($prop = $class.first_name) > - <td>$msg.get("firstname") > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > -#set($prop = $class.last_name) > - <td>$msg.get("lastname") > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - </tr> > -<tr> > -#set($prop = $class.email) > - <td>$msg.get("email") > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - </tr> > -<tr> > -</tr> > -<td></td> > - <tr> > -#set($prop = $class.password) > - <td>$msg.get("password") > - </td> > - <td>$doc.displayEdit($prop, "register_", $obj) > - </td> > - <td>$msg.get("passwordrepeat") > - </td> > - <td>$doc.displayEdit($prop, "register2_", $obj) > - </td> > - </tr> > -<tr><td></td></tr> > - <tr> > - <td>$msg.get("loginid")</td> > - <td> > - <input name="xwikiname" type="text" size="20" onfocus=" > prepareName(document.forms.register);" /> > - </td> > - </tr> > - </tbody> > - </table> > -<input type="submit" value="$msg.get("iregister")"> > -</form> > + $xwiki.getDocument("XWiki.Registration").getTranslatedDocument > ().getRenderedContent() > #end > \ No newline at end of file > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:xwiki-commits-unsubscribe@objectweb.org > For general help: mailto:sympa@objectweb.org?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

17 years, 8 months

xwiki build.508 Build Successful

by ludovic＠xwiki.org

View results here -> http://build.xpertnet.biz/cc/buildresults/xwiki?log=log20070416100111Lbuild…

17 years, 8 months

Re: [xwiki-commits] r2817 - xwiki-sandbox

by Vincent Massol

Hi Stephane, This sounds cool. Could you please send a short email explaining what this is for, what you're planning to do with this, who's going to work on this, architecture decisions taken, etc? Also I've see you've imported sources from org.semanticdesktop.*. I have some questions regarding this: 1) Why do we need this library? 2) Why don't we depend on a JAR version of it rather than on source? 3) What is the license of it? 4) It looks like JDK 1.5 code... but I guess we're going to standardize on JDK 1.5 now... A general comment: while this sounds cool, I think you're dumping a LOT of files and this makes it almost impossible for anyone else to participate in this refactoring which isn't good for you as it may mean you'll have to do the whole coding yourself... ;-) I would have rather had a discussion first explaining what you wanted to do, what architecture, how does it fit with the 2.0 architecture, etc. Of course we can and should do that now but still it's hard to review that huge commit... at least for anyone not having 3-4 full days ahead of him... :) All that said, I'm happy we're getting traction on this :) Thanks -Vincent On Apr 15, 2007, at 10:10 PM, St??phane Lauri??re wrote: > Author: slauriere > Date: 2007-04-15 22:10:22 +0200 (Sun, 15 Apr 2007) > New Revision: 2817 > > Added: > xwiki-sandbox/com.xpn.xwiki.wikimodel/ > Log: > XWIKI-1088: Put wikimodel integration prototype available in the > xwiki-sandbox > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:xwiki-commits-unsubscribe@objectweb.org > For general help: mailto:sympa@objectweb.org?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

17 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs April 2007