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

[xwiki-devs] [ANN] XWiki Enterprise and XWiki Enterprise Manager 2.2.3 Released

by Thomas Mortagne

The XWiki development team is pleased to announce the release of XWiki Enterprise and XWiki Enterprise Manager 2.2.3. This is a bug fix release for the 2.2 branches. It fixes mainly one important regression around documents objects and references handling so if you are using a previous 2.2.x version you should really upgrade to 2.2.3. New features: * XWIKI-4983 - Add Reference Resolver for resolving string representations of references as a relative reference * XWIKI-4899 - Add Model API to get default Entity Reference values Improvements: * XWIKI-5003 - Add optional parameter support for Reference Resolvers and Serializers * XWIKI-5002 - Implement Explicit Reference Resolver and Serializer * XWIKI-4995 - Introduce duplicate() method in BaseObject and XWiiDocument to clone a document but with new GUIDs * XWIKI-4921 - LiveTable improvement to remember filter even in case of shift-reload or with Internet Explorer * XWIKI-4606 - Statistics exclusions by user * XWIKI-5028 - Improve the performance and functionality of the whatever:hover behavior * XAADMINISTRATION-114 - Extract successful registration message to a new page for easier customization and link to it from admin UI * Updated translations Important Bugs fixed: * XWIKI-4996 - Statistics broken in Oracle * XWIKI-5006 - Wiki Copy doesn't work anymore with relative references * XWIKI-5007 - BaseElement#setWiki produce nullpointerexception when called before setName * XWIKI-4987 - Cannot import as backup pack any longer * XWIKI-4992 - Counting documents using parametrized HQL query fails * XWIKI-4946 - Default values for the required macro parameters should be send to the server by the WYSIWYG * XWIKI-5016 - Display a message in place of the livetable infinitely loading in a environment where its JS can't be executed (example : noJS or in the WYSIWYG) * XWIKI-5013 - HTML code visible when inserting velocity macro displaying a property * XWIKI-5000 - Image links of office imports gets broken when using an OpenOffice 3.2 back-end * XWIKI-4994 - Invalid document references for Cloned and Merged Objects in Documents * XWIKI-4973 - Live table sort does not work for anything else than StringProperty fields * XWIKI-5009 - Saving a xwiki/1.0 document from another wiki can produce error or wrong backlinks * XWIKI-4130 - Three closing parenthesis, ))), are evaluated even though no open equivalence exists * XWIKI-4988 - After deleting an imported attachment the user is redirected to the Global Administration * XWIKI-5023 - Impossible to properly install XE from scratch * XWIKI-5026 - Wrong codes in ApplicationResources_pt * XE-620 - A double quote contained in a field listed in the livetable break the livetable * XE-623 - Live Table filtering does not work on fields with "Multiple Select" (but without Relational Storage) * XE-621 - Live table does not show if some fields value of type "StringProperty" contain carriage return * XE-616 - LiveTable impacted by velocity set to null option * XE-619 - Several bugs and improvements of the LiveTableResults macros * XE-614 - Errors in UI for deleted documents & attachments * XAADMINISTRATION-120 - SQL injection via "Forgot username" page * XAADMINISTRATION-119 - Exception displayed when entering an invalid email address in the ForgotUsername form * XATAG-36 - Inconsitent management of tags case For more information see the Releases notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise223 and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM223 Thanks -The XWiki dev team

15 years, 6 months

2
5
0 0

[xwiki-devs] [Proposal] New configuration strategy

by Vincent Massol

Hi devs, I've been wanting to make it easy to upgrade XWiki from one version to another for some time (I'm not talking about XAR upgrade here, that's the extension manager). I'm talking about XWiki configuration files. Here are the use cases I'd like to solve: UC1: Easy install: no need to explode the XAR to install XWiki. See also the comment about xwiki on http://java.dzone.com/articles/file-system-storage-and UC2: Easy upgrade: no need to take care about saving the configuration so that it's not overwritten by an upgrade UC3: Should be possible to have multiple installs on the same machine and running at the same time UC4: Should be possible to control the location of the configuration files for our automated functional tests (so that we control the configuration used) The configuration files I'm talking about are: * xwiki.cfg * hibernate.cfg.xml * xwiki.properties Proposed Solution: =============== 1) Look for a system property (e.g. xwiki.config.dir) defining a directory location and if defined look for the files in it using File IO (I know it's not JEE kosher but it's acceptable IMO). Could be relative or absolute. 2) If not found, look for a JNDI property that gives the location of the config directory 3) If not found, look for config files in [user.home]/.xwiki 4) If not found, emit an error explaining how to configure xwiki 1) solves UC3 and UC4 2) solves UC3 3) solves UC1 and UC2 Note ==== I'm not suggesting any backward compatibility here since it's a new way of configuring XWiki. It means upgraders will need to read the release notes/doc to understand how to configure XWiki. If really needed, we could devise a backward compat strategy, but I'm not sure we absolutely need that. WDYT? Thanks -Vincent

15 years, 6 months

4
14
0 0

[xwiki-devs] HtmlUnit 2.4 released + some ideas for speeding up our functional tests

by Vincent Massol

FYI: http://bit.ly/9UmUis The part that is interesting: "Improved JavaScript support, now all jQuery and Mochikit tests pass, adding to already supported GWT and Sarissa" Since we're moving to Selenium2 and Selenium2 has a driver for HtmlUnit, we should try and see if using it would be good enough to detect JS problems in various browsers. The advantage of it over real browser drivers is that it runs much faster. Or we could imagine a scenario where we would use the HtmlUnit driver for standard functional tests and then use the real browser driver once per day to provide additional warranties, thus providing the best of both worlds. -Vincent

15 years, 6 months

1
0
0 0

Re: [xwiki-devs] DNSSEC update and client side certificates

by Story Henry

In an interview of Dan Kaminsky last year he says the following: [[ Kaminsky: DNSSEC is interesting not because it fixes DNS. DNSSEC is interesting because it allows us to start addressing core problems we have on the Internet in a systematic and scalable way. The reality is: Trust is not selling across organizational boundaries. We have lots and lots systems that allow companies to authenticate their own people, manage and monitor their own people and interact with their own people. In a world where companies only deal with themselves, that's great. We don't live in that world and we haven't for many years. Q: How does DNSSEC help fix that? Kaminsky: One of the fascinating elements of the Verizon Data Breach Investigations Report is that if there was a hack, 40% of the time it was an implementation flaw, and 60% of the time it was an authentication flaw -- something happened with authentication credentials and everything blew up. At the end day, why do we use passwords? It's the only authentication technology that we have that even remotely works across organizational boundaries, and the only thing that scales today. Our existing ways of doing trust across organizational boundaries don't work. Passwords are failures; certificates that were supposed to replace passwords are not working -- period, end of discussion. DNS has been doing cross-organizational address management for 25 years; it works great. DNS is the world's largest PKI without the 'K.'All DNSSEC does is add keys. It takes this system that scales wonderfully and has been a success for 25 years, and says our trust problems are cross-organizational, and takes best technology on the Internet for cross-organizational operations and gives it trust. And if we do this right, we'll see every single company with new products and services around the fact that there's one trusted root, and one trusted delegating proven system doing security across organizational boundaries. ]] http://bit.ly/19P188 I came across this from the very interesting Wikipedia article http://fr.wikipedia.org/wiki/DNSSEC On 20 Mar 2010, at 19:44, Henry Story wrote: > Hi, > > Here are two issues with X509 that were hindrances for a solution like foaf+ssl to be deployed, but which can and are being fixed: > > 1. Client Side Certificate selection > ------------------------------------ > > Browsers currently do a very bad job of allowing the user to choose his certificate (Safari being the absolute worse). As a result I posted "Firefox Hackers Needed" > > http://bit.ly/cQ5f48 > > earlier this week. @snej who is working at Google put up a picture of a solution for this in Chrome using a foaf+ssl certificate created by http://webid.myxwiki.org/ > > http://bit.ly/azCXTU > > Vote for it! > > 2. Server side certificates > --------------------------- > > One factor that people mention often with foaf+ssl is that the server has to have his own certificate. This means registration with a CA which is costly and tedious and it does not really solve the problems of server authentication as Dan Kaminsky shows ruthlessly in "Black Ops of PKI" http://bit.ly/4Uwb2K . > > To summarise his talk, server security is in a double bind: > > 1- Dan Kaminsky's DNS poisoning attack which is very well explained by Rick Van Rein's presentation "Cracking Internet: the urgency of DNSSEC" ( http://bit.ly/2darr8 view with FFox > 3.5 as it uses ogg video) means that a DNS easily be hacked in 6 weeks, and a lot of money poured into the wrong people's pockets. So there is a financial incentive to break DNS. > > 2. The solution of using https with X.509 public key cryptography's backing cannot work because there is a race to the bottom in the way CA's issue certificates. For enough money it is not that difficult to become God and to pretend you are anyone. > > Given the above DNSsec has become urgent enough, that it is being deployed. > > - verisign will put .com in July http://bit.ly/dyd54E > - .org will be available in June http://bit.ly/abEJ28 > - .gov went dnssec in March 2009 http://bit.ly/bH27b0 > - The root will be signed July 2010 http://bit.ly/9YQMDJ > - a map of dnssec deployment http://www.xelerance.com/dnssec/ > > So listening to Dan Kaminsky you would think that he is against X509. Well certainly it could be improved a lot, but he is not quite as negative as one may think. X.509 with DNSsec seems to be something he thinks can work. > > What he told me after his CCC and HAR talks and what you can see in the last few minutes of the HAR talk "X509 considered Harmful" http://bit.ly/2darr8 is that once DNS is secure one could put the X509 (self signed even) certs into the DNS records. This would bypass the need for CAs. [ I hope I understood him correctly ]. I am not sure what needs to be done to make this possible with the browser vendors, but it would massively improve security on the web. > > As a result I have fait that the global situation on the internet will only make foaf+ssl solutions easier and more secure to deploy, enabling a completely distributed social network to emerge, free and without the spying, as Eben Moglen author of the GPL said so well recently http://bit.ly/brQmJz > > Henry >

15 years, 6 months

1
0
0 0

[xwiki-devs] DNSSEC update and client side certificates

by Story Henry

Hi, Here are two issues with X509 that were hindrances for a solution like foaf+ssl to be deployed, but which can and are being fixed: 1. Client Side Certificate selection ------------------------------------ Browsers currently do a very bad job of allowing the user to choose his certificate (Safari being the absolute worse). As a result I posted "Firefox Hackers Needed" http://bit.ly/cQ5f48 earlier this week. @snej who is working at Google put up a picture of a solution for this in Chrome using a foaf+ssl certificate created by http://webid.myxwiki.org/ http://bit.ly/azCXTU Vote for it! 2. Server side certificates --------------------------- One factor that people mention often with foaf+ssl is that the server has to have his own certificate. This means registration with a CA which is costly and tedious and it does not really solve the problems of server authentication as Dan Kaminsky shows ruthlessly in "Black Ops of PKI" http://bit.ly/4Uwb2K . To summarise his talk, server security is in a double bind: 1- Dan Kaminsky's DNS poisoning attack which is very well explained by Rick Van Rein's presentation "Cracking Internet: the urgency of DNSSEC" ( http://bit.ly/2darr8 view with FFox > 3.5 as it uses ogg video) means that a DNS easily be hacked in 6 weeks, and a lot of money poured into the wrong people's pockets. So there is a financial incentive to break DNS. 2. The solution of using https with X.509 public key cryptography's backing cannot work because there is a race to the bottom in the way CA's issue certificates. For enough money it is not that difficult to become God and to pretend you are anyone. Given the above DNSsec has become urgent enough, that it is being deployed. - verisign will put .com in July http://bit.ly/dyd54E - .org will be available in June http://bit.ly/abEJ28 - .gov went dnssec in March 2009 http://bit.ly/bH27b0 - The root will be signed July 2010 http://bit.ly/9YQMDJ - a map of dnssec deployment http://www.xelerance.com/dnssec/ So listening to Dan Kaminsky you would think that he is against X509. Well certainly it could be improved a lot, but he is not quite as negative as one may think. X.509 with DNSsec seems to be something he thinks can work. What he told me after his CCC and HAR talks and what you can see in the last few minutes of the HAR talk "X509 considered Harmful" http://bit.ly/2darr8 is that once DNS is secure one could put the X509 (self signed even) certs into the DNS records. This would bypass the need for CAs. [ I hope I understood him correctly ]. I am not sure what needs to be done to make this possible with the browser vendors, but it would massively improve security on the web. As a result I have fait that the global situation on the internet will only make foaf+ssl solutions easier and more secure to deploy, enabling a completely distributed social network to emerge, free and without the spying, as Eben Moglen author of the GPL said so well recently http://bit.ly/brQmJz Henry Social Web Architect http://bblfish.net/ Social Web Architect http://bblfish.net/

15 years, 6 months

1
0
0 0

[xwiki-devs] [VOTE] Backup pack: test for farm admin and for the whole import instead of testing for programming right and for each document

by Thomas Mortagne

Hi devs, To fix http://jira.xwiki.org/jira/browse/XE-615 i would like to change the test associated to backup pack. You can look at the issue for more detail on the issue but basically the problem is that on an empty XE guest does not have programming right which make impossible to import XE xar like it used to. You have to enable superadmin user with a password in clear in the xwiki.cfg file. I propose to change the way importer is working and test only once for the whole import and for admin right on main wiki which will make possible to install XE without having to enable superadmin. I feel it's secure enough but i prefer sending this vote mail to make sure more people can validate it's ok. Here is my +1. -- Thomas Mortagne

15 years, 6 months

6
5
0 0

[xwiki-devs] Hover in Selenium2

by Alex Busenius

Hi all, I'm writing integration tests for the patch fixing http://jira.xwiki.org/jira/browse/XABLOG-99. In particular, I want to test adding, renaming and deleting of blog categories from Blog/ManageCategories page. My problem is that the "toolbox" with rename and delete buttons is only displayed on hover, and selenium complains that it cannot access invisible elements. I tried to use RenderedWebElement.hover() as follows: By locator = By.xpath("//a[contains(@href, \"" + name + "\")]/ancestor::span[@class='blog-category-level']"); RenderedWebElement category = (RenderedWebElement) getDriver().findElement(locator); category.hover(); but the n I get error "Unable to hover over element". Does anybody knows how to show these delete buttons? I'm using FF 3.6 on Linux. Thanks, Alex

15 years, 6 months

2
4
0 0

[xwiki-devs] The problem with Todo Application

by Michelle Shi

Hi, I used the old todo Application in code zone. It has some problem, I record them here [ http://michelle.myxwiki.org/xwiki/bin/view/Blog/ProblemWithTodoApplications ]. Now I found that there is a cincubator project about new todo application [ http://incubator.myxwiki.org/xwiki/bin/view/Todo/]. This project seem to sovle all my problem. I wonder if there is a timeline of this application. Is there anything like roadmap of new Todo application? Thanks. Michelle

15 years, 6 months

2
1
0 0

[xwiki-devs] XWiki was not selected for GSoC this year

by Sergiu Dumitriu

-------- Original Message -------- From: socghop.noreply(a)gmail.com Subject: Thank you for your application To: sergiu.dumitriu(a)gmail.com Hi Sergiu Dumitriu, Thank you for submitting "XWiki" organization application to Google Summer of Code 2010. Unfortunately, we were unable to accept your organization's application at this time. We received many more applications for the program than we are able to accommodate, and we would encourage you to reapply for future instances of the program. Best regards, Google Open Source Programs

15 years, 6 months

5
4
0 0

[xwiki-devs] [URL] How to rename "bin" to "wiki" or something else.

by Nicola Nardino

Hi all, I'm wondering if it's possible to rename the "bin" part of the URL to something else. For same reason I can't drop the bin from the URL in Weblogic so I was wondering whether it could be possible to nicely rename it. Best Regards Nicola -- View this message in context: http://n2.nabble.com/URL-How-to-rename-bin-to-wiki-or-something-else-tp4755… Sent from the XWiki- Dev mailing list archive at Nabble.com.

15 years, 6 months

4
5
0 0

[xwiki-devs] [GSoC] Student introduction and Interested in Calendar application Proposal

by Michelle Shi

Hi Devs, I am a girl from China. I am a student pursuing my BS degree in The Central University Of Finance and Economics. My major is Electronic Commerce. I love Open Source, but in China Open Source is not so popular. Open Source is powerful and the idea of Open Source can accelerate the development of the Software indursty. I want to involve into a Open Source program, learn Open Source method and popularize open source in China. One of my friend use XWiki as his personal Knowledge repository and dairy. I try xwiki in myxwiki.org. I think is a powerful platform, in which any applications can be built on it, only limited by your imagination. I want to learn xwiki and use the power of xwiki. The best way to do this, I think, is to involved to xwiki. I follow the mail list and ask question in IRC xwiki channel. I find the guys in xwiki community are very nice to help others. I like that. I want to contribute to xwiki, as open source guy do. I checked the 21 proposal projects, and I think I am interested in Calendar application proposal. I use google Calendar which is a great product. I have program skill in java, but I don't have must experience in JaveScript and ajax. I will try my best to learn xwiki and related knowledge. I need your help to do this, and I will do my best. Look forward working with your guys. Thanks. Michelle Shi

15 years, 6 months

4
5
0 0

[xwiki-devs] [GSoC] My homework about new calendar Application for XWiki

by Michelle Shi

Hi devs, I am the student who is interested in xwiki GSoC. I want to build a new calendar Application for XWiki. This is my homework about this project ;) After learning xwiki for a while, I really think it is a great platform, and supported by a great comunnity. I can find all kinds of documents in xwiki, such as introduction to xwiki features, documents for xwiki new developer or contributor, Developer's Guide, FAQ, and active maillist. I can learn a lot by dive into xwiki.org. Thanks for you guy document work ;) This is a list for what I have do and my future plan. Please direct me to prepare for this project. I need your suggestion. 1. Family with xwiki. I have applied a wiki in myxwiki.org, and I use this wiki for my weblog and project schedule. I learn some xwiki feature throught http://platform.xwiki.org/xwiki/bin/view/Main/. I know some base concepts in xwiki, such as page, space, object, class. I know the xwiki is a platform to build various kinds application, such as BBS, blog, photo album. I learn how to export and import xar, how to manage the xwiki right, and how to create simple class in xwiki. 2. Learn the "Suggested way of working for GSoC students" in this page http://dev.xwiki.org/xwiki/bin/view/GoogleSummerOfCode/ 3. Learn base xwiki develop knowledge. I learn how to build xwiki from source code, directed by http://dev.xwiki.org/xwiki/bin/view/Main/. I use svn, maven, eclipse. And How to debug xwiki in eclipse. 4. Community with xwiki devs. I are following xwiki dev and user list to know the lastest news in xwiki. I read all the mails in dev list, but I can't understand some top for now. I will post my questions to this list in the future. I ask questions in xwiki IRC. 5. I have use the old calendar application, and read the source code. I think I need check the old calendar plugin java source code again. 6. I have read the requirment for the now calendar application. http://dev.xwiki.org/xwiki/bin/view/GoogleSummerOfCode/CalendarApplication2…. I think some details need to be discussed. 7. I will record my process in http://michelle.myxwiki.org, this is my blog http://michelle.myxwiki.org/xwiki/bin/view/Blog/. I make a project space in my wiki. You can follow my plan in this page http://michelle.myxwiki.org/xwiki/bin/view/GSoC/ Todo 1. Learn how to develop application in xwiki. Learn the Tutorials and Guides in this page http://platform.xwiki.org/xwiki/bin/view/DevGuide/. I think "Creating a TODO application in XWiki" is a great tutorials. 2. To learn about the whole xwiki, I think I need to check out all the content in Developer's Guide. 3. Check out the open source calendar program and learn the the source code. I think the render of calendar need some javescript code. I will learn it. 4. After discuss with <sdumitriu> in IRC, I know some idea of the new calendar, like "calendar event in its own document And the calendar view just gathers and displays all the events in the current wiki or space". I will think about how to realise it in xwiki.

15 years, 6 months

1
0
0 0

[xwiki-devs] [vote] Bundle annotations in platform by default starting with 2.3M1

by Anca Luca

Hi devs, as part of 2.3M1, we'd like to commit and activate annotations by default in the xwiki platform. WDYT? and as a strategy we could have: 1/ jars in platform and .xar that users can install if they want -- the .xar would actually provide the interface of the annotations, js css & forms 2/ jars in platform and .xar included in XE by default I think i'd go for 2/ in M stage. If we can't stabilize it enough for final, we could get it out, but 2. would be fine for now. WDYT? Thanks, Anca

15 years, 6 months

7
6
0 0

[xwiki-devs] [VOTE] XWiki.org governance (take 2)

by Vincent Massol

Hi everyone, I'd like to move this topic forward. Thus I've now created a draft of the XWiki.org Governance that gathers what I had proposed at http://markmail.org/message/fxqvprtbb5vyog6g The Governance page is currently at: http://dev.xwiki.org/xwiki/bin/view/Drafts/Governance Please review it and vote. The idea is then to move it to http://dev.xwiki.org/xwiki/bin/view/Community/Governance in a few days. As usual, non committers don't have binding votes but are still very much encouraged to give their opinions. Their voice is especially more important on this topic since most committers are from XWiki SAS and thus I feel we need at least a general agreement from the community at large before doing anything. Thanks a lot -Vincent

15 years, 6 months

8
16
0 0

[xwiki-devs] [Proposal] XWiki.org horizontal navigation + home page

by Giuseppe Vallarelli

I've realized another proposal for the homepage, it's here<http://incubator.myxwiki.org/xwiki/bin/view/Mockups/Homepage2>(thanks to Silvia who uploaded image). In the uppper part there are the links equivalent to the tab bar proposed by Silvia in her proposal, i've added "Get Involved" that's equivalent to "How do I contribute"(link) but is placed in the upper part of the homepage. In the centre there is a rounded box where should be placed the Xwiki logo plus a motto and an awesome background similarly to www.kde.org at the end of the homepage for me should be placed some links with a nice show effect(i think jquery could do this). Source of inspiration(i'm a "thief" :)) - easy to read <http://informationarchitects.jp/100e2r/> - example_KDE <http://kde.org/> - apache_menu <http://www.apache.org/> Giuseppe.

15 years, 6 months

1
0
0 0

[xwiki-devs] [Proposal] Contrib projects release strategy

by Jean-Vincent Drean

Hi XWikiers, The goal of this proposal is to be able to deploy contrib projects on the xwiki maven repository, allowing distributions to depend on contrib projects. Contrib projects deployment must be different from the other xwiki.org deployments since want to review the artifacts contributors publish under our banner. The proposal is to use the nexus staging deployment feature to perform contrib releases. Strategy: - Create the http://maven.xwiki.org/contrib/ repository - When a contributor first want to release his project, create a user for him allowed to push artifacts in staging on nexus.xwiki.org. This credentials are meant to be put in ~/.m2/settings.xml to be used by maven for authentication on nexus.xwiki.org. - When a contributor performs a release the artifacts are pushed on the nexus staging repository, an email is sent on notifications(a)xwiki.org to notify nexus admins that they must review/publish them. We could create a new http://svn.xwiki.org/svnroot/xwiki/contrib/pom/ pom project to ease maintainers work, here's a draft: -------------------------8<----------------------------- <groupId>org.xwiki.contrib</groupId> <artifactId>root</artifactId> <name>XWiki Contrib - Root POM</name> <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> <url>http://contrib.xwiki.org</url> <issueManagement> <system>jira</system> <url>http://jira.xwiki.org/jira/browse/XCONTRIB</url> </issueManagement> <scm> <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/contrib/pom/trunk</connection> <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/contrib/pom/trunk</developerConnection> <url>http://svn.xwiki.org/svnroot/xwiki/contrib/pom/trunk</url> </scm> <distributionManagement> <repository> <id>xwiki-staging</id> <name>XWiki Staging Repository</name> <url>http://nexus.xwiki.org/nexus/service/local/staging/deploy/maven2/</url> </repository> </distributionManagement> ------------------------->8----------------------------- Note: I'm still not sure about this, I think duplicating distributionManagement in an application and have xwiki-applications as parent might be more convenient than the contrary (duplicating build extensions and stuff + have org.xwiki.contrib.root as parent). WDYT ? Thanks, JV.

15 years, 6 months

7
15
0 0

[xwiki-devs] [UX][Proposal] Annotation UI Improvements

by Ecaterina Valica

Hi, I made some UI suggestions for the annotations. Overview: http://incubator.myxwiki.org/xwiki/bin/download/Improvements/Annotations/pr… Details: http://incubator.myxwiki.org/xwiki/bin/view/Improvements/AnnotationsProposal Please let us (me and Anca) know what you think. Thanks, Caty

15 years, 6 months

10
33
0 0

[xwiki-devs] [Proposal] Governance for xwiki.org

by Vincent Massol

Hi everyone (devs and users), While we have a clear governance for write access to our source repository (http://dev.xwiki.org), we're missing a clear governance for xwiki.org. The idea is to address mainly the following 2 questions: 1) who "owns" it and thus "controls" (or rather provides direction for) its content 2) can it be used for business advertising (support, paid packages, consulting services) Bit of History about XWiki SAS ======================== - XWiki SAS (http://xwiki.com) is the company founded by Ludovic Dubost the creator of XWiki (I'm the CTO of XWiki SAS in addition to being a committer here). - Most of the active contributors are also employed and paid by XWiki SAS to develop the XWiki software. Today that's -- 12.5 committers (developers) -- 1 open source product manager (see http://markmail.org/thread/ggaaw4u6yyci4oan for its definition) -- 1 designer -- 1 tester/technical writer - XWiki SAS sells services around the open source software, see http://www.xwiki.com/xwiki/bin/view/Services/ - XWiki SAS truly believes and understands open source, see http://www.xwiki.com/xwiki/bin/view/About/Values -- I also wrote a blog post on this some time back: http://massol.myxwiki.org/xwiki/bin/view/Blog/XWikiSASAndOpenSource - XWiki SAS has promised "not to do evil" ;), see its manifesto at http://www.xwiki.com/xwiki/bin/view/About/Manifesto - XWiki SAS is paying for the servers and maintenance of xwiki.org, myxwiki.org, the maven repo, the svn repo, the hudson build serversn the free JUG farm, and more Issue at hand =========== XWiki SAS would like to generate more revenue to be able to increase the development pace of the XWiki software. We'd like to fund even more the development of XWiki, so that it becomes an even better product. We've asked you what you'd like to see in the future in XWiki and you've answered on this survey result: http://www.xwiki.org/xwiki/bin/view/Blog/Features+Survey+Results We'd like to implement those features as fast as possible. For this we need to ensure that users interested in commercial services find easily the way to http://xwiki.com, even when they arrive on xwiki.org. This is true for XWiki SAS's services but also for any company willing to offer services around the XWiki open source project. There's no magic. Developers need to be paid when they work full time on some project. We need a commercial ecosystem around XWiki for it to progress as quickly as its competitors (the collaboration market). We need to allow for commercial companies the ability to generate revenue from their work on the XWiki open source project. However we also want to continue ensuring that all the XWiki development is done in open source, under a LGPL license. Governance Proposal ================= 1) xwiki.org is controlled by the XWiki committers. This means that important changes brought to it should be discussed/vote on the list, using the same practices as for code commits 2) xwiki.org stays open in edit mode to all external contributors (and XWiki committers continue to monitor it to remove spam, etc) 3) we agree to start with 3 zones where companies can advertise their commercial offers on top of the XWiki open source product: -- On the download page (for business packages, subscriptions, hosting) -- On the support page (for services: support, consulting) -- (still to be defined) Possibly on a "Products" tab in the new horizontal navigation. The idea would be to do as jboss.org is doing. Projects are open source and community and Products are commercial 4) the company offerings are listed by their amount of contributions to the XWiki open source project. The company that contributes most (XWiki SAS today) gets the best spots (top of the list, bigger space) 5) Companies who want to be listed should provide some proof of their contributions to the XWiki open source project 6) XWiki SAS gets some acknowledgment for paying for the xwiki.org server/maintenance of it. Probably somewhere in the footer of the site or on side panel somewhere 7) xwiki.org should always remain a site for the xwiki open source community Conclusion ========= We want to stress that this proposal is not about XWiki SAS making a commercial takeover of the xwiki.org site. It's about recognizing that if the XWiki open source software progresses quickly today, it's thanks to contributors but also for a very large proportion to companies paying developers to work on it, either directly (like XWiki SAS or other companies that have developers contributing) or indirectly (by paying for example XWiki SAS or other companies to work on specific features). It's also about recognizing that XWiki SAS is happy to see other companies willing to contribute to the progress of the XWiki open source project and thus to provide a place for these companies to be visible too. I hope that all our contributors but also users of the XWiki Open Source software will find this proposal acceptable and I welcome any feedback on it. Thanks -Vincent Massol Hat 1: XWiki SAS CTO Hat 2: XWiki committer

15 years, 6 months

10
15
0 0

Re: [xwiki-devs] [VOTE] Annotations in the platform (was Re: XE 2.3M1 release preparation)

by Guillaume Lerouge

On Wed, Mar 17, 2010 at 7:59 AM, Vincent Massol <vincent(a)massol.net> wrote: > > On Mar 17, 2010, at 12:56 AM, Anca Luca wrote: > > > Hi Vincent, > > > > On 03/15/2010 07:17 PM, Vincent Massol wrote: > >> > >> On Mar 15, 2010, at 4:04 PM, Anca Luca wrote: > >> > >>> Hi Vincent, all > >>> > >>> On 03/15/2010 12:15 PM, Vincent Massol wrote: > >>>> Hi, > >>>> > >>>> We've slipped badly for the 2.3M1 release (my fault for not monitoring > it closely enough). It was planned on the 8th of March and we're the 15th > already (one week delay). > >>>> > >>>> The other problem is that we don't have what we had imagined would go > in 2.3M1 (color theme improvement for ex). Right now there are lots of > changes but nothing really user-noticeable. > >>>> > >>>> So I'd suggest the following: > >>>> * Delay by a few days in order to be able to include: > >>>> - color theme improvement. Sergiu you need to tell us if that's doable > and for when. > >>>> - captcha on comments. Caleb, let us know if that's all done or if > there's need for more testing/development. > >>>> > >>>> Bonus: > >>>> - Anca, will it be possible to have annotations released for 2.3M1 (ie > now)? How much more time would you need? > >>> > >>> I'll close the vote for XWIKI-4775 asap, and commit it since it's due a > long > >>> time now. > >>> I shouldn't need more than 2 days, but how would we want the > annotations > >>> integrated in the platform? > >>> > >>> Right now they're built as an extension, with some jars to deploy on > the server > >>> and a .xar to install the default annotations application. > >> > >> I think we should: > >> * have platform/xwiki-annotations and release it when we release the > plaform > >> * have applications/annotations and include it in the default XE XAR > >> > >> The rationale is that annotations is a powerful feature and I believe > it's good to have it by default for now (it would be too difficult to > install it separately for now). > > > > Why would it be difficult? we can maven magic a zip with a bunch of jars > anytime > > and make people unpack it in their WEB-INF/lib & install the xar. I think > that's > > reasonable complexity for such an extension. > > That's what I call complex. It's too complex for a large majority of our > users and it would make the annotation feature not used which is a shame. In > any case I don't see any compelling reason not to bundle it by default in > the default XE we distribute. > +1 again! Anca, why don't you want your awesome work to be bundled in XE by default? ;-) Guillaume > Thanks > -Vincent > > > Thanks, > > Anca > > > >> > >> When we have the extension manager implemented, we'll be able to trim > down the size of what the "core" platform and instead have the user be able > to install extensions when they start their wiki for the first time or when > they go to the admin page for this. But since we don't have this now I feel > it's better to have annotations packaged in the platform and in the default > XAR than not have it. > >> > >> Here's my +1 to both (API in the platform and annotation XAR in default > XE). > >> > >> Note: It would be great to have the ability to turn on/off the > annotations feature for 2.3 final. > >> > >> Thanks > >> -Vincent > >> _______________________________________________ > >> devs mailing list > >> devs(a)xwiki.org > >> http://lists.xwiki.org/mailman/listinfo/devs > > _______________________________________________ > > devs mailing list > > devs(a)xwiki.org > > http://lists.xwiki.org/mailman/listinfo/devs > > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Guillaume Lerouge Product Manager - XWiki SAS Skype: wikibc Twitter: glerouge http://guillaumelerouge.com/

15 years, 6 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r27661 - platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin

by Vincent Massol

On Mar 16, 2010, at 6:28 PM, mflorea (SVN) wrote: > Author: mflorea > Date: 2010-03-16 18:28:54 +0100 (Tue, 16 Mar 2010) > New Revision: 27661 > > Modified: > platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/WysiwygPluginApi.java > Log: > XWIKI-5013: HTML code visible when inserting velocity macro displaying a property > > Modified: platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/WysiwygPluginApi.java > =================================================================== > --- platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/WysiwygPluginApi.java 2010-03-16 15:51:03 UTC (rev 27660) > +++ platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/WysiwygPluginApi.java 2010-03-16 17:28:54 UTC (rev 27661) > @@ -35,6 +35,14 @@ > public class WysiwygPluginApi extends Api > { > /** > + * The context property which indicates if the current code was called from a template (only Velocity execution) or > + * from a wiki page (wiki syntax rendering). > + * > + * @see #parseAndRender(String, String) > + */ > + private static final String IS_IN_RENDERING_ENGINE = "isInRenderingEngine"; > + > + /** > * The plugin instance. > */ > private WysiwygPlugin plugin; > @@ -98,11 +106,26 @@ > */ > public String parseAndRender(String html, String syntax) > { > + // Save the value of the "is in rendering engine" context property. > + Object isInRenderingEngine = context.get(IS_IN_RENDERING_ENGINE); > + > try { > + // This tells display() methods that we are inside the rendering engine and thus that they can return wiki > + // syntax and not HTML syntax (which is needed when outside the rendering engine, i.e. when we're inside > + // templates using only Velocity for example). > + context.put(IS_IN_RENDERING_ENGINE, true); > + > return Utils.getComponent(HTMLConverter.class).parseAndRender(html, syntax); > } catch (Exception e) { > // Leave the previous HTML in case of an exception. > return html; > + } finally { > + // Restore the value of the value of the "is in rendering engine" context property. > + if (isInRenderingEngine != null) { > + context.put(IS_IN_RENDERING_ENGINE, isInRenderingEngine); > + } else { > + context.remove(IS_IN_RENDERING_ENGINE); > + } Shouldn't you always put back the value that you saved (even if it's null) ? Thanks -Vincent

15 years, 6 months

2
2
0 0

[xwiki-devs] Homepage Sketch

by Giuseppe Vallarelli

I've read and seen :) about Silvia's mockup, i've realized this sketch borrowing some ideas from the web and my web experience:Sketch<http://incubator.myxwiki.org/xwiki/bin/view/Hompage%20sketch/>, hope could help.

15 years, 6 months

3
2
0 0

Re: [xwiki-devs] [xwiki-notifications] r27653 - in platform/core/trunk/xwiki-core: . src/main/java/com/xpn/xwiki/plugin/rightsmanager src/main/java/com/xpn/xwiki/stats/impl src/main/java/com/xpn/xwiki/stats/impl/xwiki src/main/java/com/xpn/xwiki/user/api src/test/java/com/xpn/xwiki/stats/impl

by Caleb James DeLisle

tmortagne (SVN) wrote: > Author: tmortagne > Date: 2010-03-16 14:37:11 +0100 (Tue, 16 Mar 2010) > New Revision: 27653 > > Added: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerListener.java > Modified: > platform/core/trunk/xwiki-core/pom.xml > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManager.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPlugin.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/StatsUtil.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/xwiki/XWikiStatsReader.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiRightService.java > platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/stats/impl/StatsUtilTest.java > Log: > XWIKI-4606: Statistics exclusions by user > > Modified: platform/core/trunk/xwiki-core/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-core/pom.xml 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/pom.xml 2010-03-16 13:37:11 UTC (rev 27653) > @@ -1396,7 +1396,8 @@ > **/user/impl/LDAP/LDAPProfileXClass.java, > **/user/impl/exo/ExoAuthServiceImpl.java, > **/user/impl/exo/ExoFilter.java, > - **/user/impl/exo/ExoGroupServiceImpl.java > + **/user/impl/exo/ExoGroupServiceImpl.java, Should there be a comment here that this is excluded because of a fanout complexity violation? Caleb > + **/stats/impl/xwiki/XWikiStatsReader.java > </excludes> > </configuration> > </plugin> > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManager.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManager.java 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManager.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -23,17 +23,15 @@ > import java.util.ArrayList; > import java.util.Collection; > import java.util.HashMap; > -import java.util.Hashtable; > +import java.util.LinkedHashSet; > import java.util.List; > import java.util.Map; > > import org.apache.commons.lang.StringUtils; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > -import org.xwiki.observation.EventListener; > -import org.xwiki.observation.event.DocumentDeleteEvent; > -import org.xwiki.observation.event.Event; > -import org.xwiki.observation.remote.RemoteObservationManagerContext; > +import org.xwiki.model.reference.DocumentReference; > +import org.xwiki.model.reference.DocumentReferenceResolver; > > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > @@ -46,15 +44,16 @@ > import com.xpn.xwiki.plugin.rightsmanager.utils.LevelTree; > import com.xpn.xwiki.plugin.rightsmanager.utils.RequestLimit; > import com.xpn.xwiki.plugin.rightsmanager.utils.UsersGroups; > +import com.xpn.xwiki.user.api.XWikiRightService; > import com.xpn.xwiki.web.Utils; > > /** > - * Hidden toolkit use by the plugin API that make all the plugin's actions. > + * Hidden toolkit used by the plugin API that make all the plugin's actions. > * > * @version $Id$ > * @since XWiki Core 1.1.2, XWiki Core 1.2M2 (public since 1.4M1) > */ > -public final class RightsManager implements EventListener > +public final class RightsManager > { > /** > * Name of the default space where users and groups are stored. > @@ -134,26 +133,21 @@ > // //////////////////////////////////////////////////////////////////////////// > > /** > - * The name of the listener. > + * Unique instance of RightsManager. > */ > - private static final String NAME = "rightsmanager"; > + private static RightsManager instance; > > /** > - * The events to match. > + * Used to resolve document reference based on another reference. > */ > - private static final List<Event> EVENTS = new ArrayList<Event>() > - { > - { > - add(new DocumentDeleteEvent()); > - } > - }; > + private DocumentReferenceResolver<String> explicitDocumentReferenceResolver = > + Utils.getComponent(DocumentReferenceResolver.class, "explicit"); > > - // //////////////////////////////////////////////////////////////////////////// > - > /** > - * Unique instance of RightsManager. > + * Used to resolve reference based on context. > */ > - private static RightsManager instance; > + private DocumentReferenceResolver<String> currentDocumentReferenceResolver = > + Utils.getComponent(DocumentReferenceResolver.class, "current"); > > /** > * Hidden constructor of RightsManager only access via getInstance(). > @@ -176,120 +170,6 @@ > return instance; > } > > - /** > - * Remove reference to provided user or group in all groups and rights in current wiki. > - * > - * @param userOrGroupWiki the wiki name of the group or user. > - * @param userOrGroupSpace the space name of the group or user. > - * @param userOrGroupName the name of the group or user. > - * @param user indicate if it is a user or a group. > - * @param context the XWiki context. > - * @throws XWikiException error when browsing groups or rights. > - */ > - private void cleanDeletedUserOrGroupInLocalWiki(String userOrGroupWiki, String userOrGroupSpace, > - String userOrGroupName, boolean user, XWikiContext context) throws XWikiException > - { > - removeUserOrGroupFromAllRights(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, context); > - context.getWiki().getGroupService(context).removeUserOrGroupFromAllGroups(userOrGroupWiki, userOrGroupSpace, > - userOrGroupName, context); > - } > - > - /** > - * Remove reference to provided user or group in all groups and rights in all wikis. > - * > - * @param userOrGroupWiki the wiki name of the group or user. > - * @param userOrGroupSpace the space name of the group or user. > - * @param userOrGroupName the name of the group or user. > - * @param user indicate if it is a user or a group. > - * @param context the XWiki context. > - * @throws XWikiException error when browsing groups or rights. > - */ > - private void cleanDeletedUserOrGroup(String userOrGroupWiki, String userOrGroupSpace, String userOrGroupName, > - boolean user, XWikiContext context) throws XWikiException > - { > - if (!context.getWiki().isVirtualMode()) { > - cleanDeletedUserOrGroupInLocalWiki(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, context); > - } else { > - List<String> wikiList = context.getWiki().getVirtualWikisDatabaseNames(context); > - > - String database = context.getDatabase(); > - try { > - boolean foundMainWiki = false; > - > - for (String wikiName : wikiList) { > - if (context.isMainWiki(wikiName)) { > - foundMainWiki = true; > - } > - > - context.setDatabase(wikiName); > - cleanDeletedUserOrGroupInLocalWiki(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, > - context); > - } > - > - if (!foundMainWiki) { > - context.setDatabase(context.getMainXWiki()); > - cleanDeletedUserOrGroupInLocalWiki(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, > - context); > - } > - } finally { > - context.setDatabase(database); > - } > - } > - } > - > - /** > - * {@inheritDoc} > - * > - * @see org.xwiki.observation.EventListener#getName() > - */ > - public String getName() > - { > - return NAME; > - } > - > - /** > - * {@inheritDoc} > - * > - * @see org.xwiki.observation.EventListener#getEvents() > - */ > - public List<Event> getEvents() > - { > - return EVENTS; > - } > - > - /** > - * {@inheritDoc} > - * > - * @see org.xwiki.observation.EventListener#onEvent(org.xwiki.observation.event.Event, java.lang.Object, > - * java.lang.Object) > - */ > - public void onEvent(Event event, Object source, Object data) > - { > - // Only take into account local events > - if (!Utils.getComponent(RemoteObservationManagerContext.class).isRemoteState()) { > - XWikiDocument document = ((XWikiDocument) source).getOriginalDocument(); > - XWikiContext context = (XWikiContext) data; > - > - String userOrGroupWiki = document.getDatabase(); > - String userOrGroupSpace = document.getSpace(); > - String userOrGroupName = document.getName(); > - > - if (document.getObject("XWiki.XWikiUsers") != null) { > - try { > - cleanDeletedUserOrGroup(userOrGroupWiki, userOrGroupSpace, userOrGroupName, true, context); > - } catch (XWikiException e) { > - LOG.warn("Error when cleaning for deleted user", e); > - } > - } else if (document.getObject("XWiki.XWikiGroups") != null) { > - try { > - cleanDeletedUserOrGroup(userOrGroupWiki, userOrGroupSpace, userOrGroupName, false, context); > - } catch (XWikiException e) { > - LOG.warn("Error when cleaning for deleted group", e); > - } > - } > - } > - } > - > // Groups and users management > > /** > @@ -1201,14 +1081,12 @@ > > Map<String, Collection<String>> groupCache = groupCacheIn; > if (groupCache == null) { > - groupCache = new Hashtable<String, Collection<String>>(); > + groupCache = new HashMap<String, Collection<String>>(); > } > > - Collection<String> memberList; > + Collection<String> memberList = groupCache.get(groupName); > > - if (groupCache.containsKey(groupName)) { > - memberList = groupCache.get(groupName); > - } else { > + if (memberList == null) { > memberList = > context.getWiki().getGroupService(context).getAllMembersNamesForGroup(groupName, 0, 0, context); > groupCache.put(groupName, memberList); > @@ -1228,4 +1106,91 @@ > > return found; > } > + > + /** > + * Resolve passed user or group into users references list. > + * > + * @param userOrGroup the user or group > + * @param context the XWikiContext the XWiki context > + * @return the list of users references > + * @throws XWikiException error when getting documents > + */ > + public Collection<DocumentReference> resolveUsers(DocumentReference userOrGroup, XWikiContext context) > + throws XWikiException > + { > + Collection<DocumentReference> users = new LinkedHashSet<DocumentReference>(); > + > + // Try it as virtual user (guest, superadmin) > + > + if (userOrGroup.getLastSpaceReference().getName().equals(DEFAULT_USERORGROUP_SPACE) > + && (userOrGroup.getName().equalsIgnoreCase(XWikiRightService.SUPERADMIN_USER) || userOrGroup.getName() > + .equals(XWikiRightService.GUEST_USER))) { > + users.add(userOrGroup); > + } > + > + // resolve > + > + XWikiDocument document = context.getWiki().getDocument(userOrGroup, context); > + > + if (!document.isNew()) { > + // Try it as user > + > + DocumentReference userClassReference = > + new DocumentReference(document.getDatabase(), DEFAULT_USERORGROUP_SPACE, "XWikiUsers"); > + > + if (document.getXObject(userClassReference) != null) { > + users.add(userOrGroup); > + } > + > + // Try it as group > + > + DocumentReference groupClassReference = > + new DocumentReference(document.getDatabase(), DEFAULT_USERORGROUP_SPACE, "XWikiGroups"); > + > + List<BaseObject> members = document.getXObjects(groupClassReference); > + if (members != null) { > + for (BaseObject memberObj : members) { > + String member = memberObj.getStringValue("member"); > + > + users.addAll(resolveUsers(this.explicitDocumentReferenceResolver.resolve(member, userOrGroup), > + context)); > + } > + } > + } > + > + return users; > + } > + > + /** > + * Resolve passed user or group into users references list. > + * > + * @param userOrGroup the user or group > + * @param context the XWikiContext the XWiki context > + * @return the list of users references > + * @throws XWikiException error when getting documents > + */ > + public Collection<DocumentReference> resolveUsers(String userOrGroup, XWikiContext context) throws XWikiException > + { > + return resolveUsers(this.currentDocumentReferenceResolver.resolve(userOrGroup), context); > + } > + > + /** > + * Resolve passed users and groups into users references list. > + * > + * @param referenceList the list of users and groups > + * @param context the XWikiContext the XWiki context > + * @return the list of users references > + * @throws XWikiException error when getting documents > + */ > + public Collection<DocumentReference> resolveUsers(List<String> referenceList, XWikiContext context) > + throws XWikiException > + { > + Collection<DocumentReference> users = new LinkedHashSet<DocumentReference>(); > + > + for (String reference : referenceList) { > + users.addAll(resolveUsers(reference, context)); > + } > + > + return users; > + } > } > > Added: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerListener.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerListener.java (rev 0) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerListener.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -0,0 +1,208 @@ > +/* > + * See the NOTICE file distributed with this work for additional > + * information regarding copyright ownership. > + * > + * This is free software; you can redistribute it and/or modify it > + * under the terms of the GNU Lesser General Public License as > + * published by the Free Software Foundation; either version 2.1 of > + * the License, or (at your option) any later version. > + * > + * This software is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this software; if not, write to the Free > + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > + */ > + > +package com.xpn.xwiki.plugin.rightsmanager; > + > +import java.util.ArrayList; > +import java.util.List; > + > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > +import org.xwiki.observation.EventListener; > +import org.xwiki.observation.event.DocumentDeleteEvent; > +import org.xwiki.observation.event.Event; > +import org.xwiki.observation.remote.RemoteObservationManagerContext; > + > +import com.xpn.xwiki.XWikiContext; > +import com.xpn.xwiki.XWikiException; > +import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.web.Utils; > + > +/** > + * Listener to user and groups events to apply related automatic task like cleaning groups and rights objects. > + * > + * @version $Id: RightsManager.java 22782 2009-08-18 13:50:24Z tmortagne $ > + * @since XWiki Core 2.2.3 > + */ > +public final class RightsManagerListener implements EventListener > +{ > + /** > + * The logging tool. > + */ > + private static final Log LOG = LogFactory.getLog(RightsManagerListener.class); > + > + /** > + * The name of the listener. > + */ > + private static final String NAME = "rightsmanager"; > + > + /** > + * The events to match. > + */ > + private static final List<Event> EVENTS = new ArrayList<Event>() > + { > + { > + add(new DocumentDeleteEvent()); > + } > + }; > + > + // //////////////////////////////////////////////////////////////////////////// > + > + /** > + * Unique instance of RightsManager. > + */ > + private static RightsManagerListener instance; > + > + /** > + * Hidden constructor of RightsManager only access via getInstance(). > + */ > + private RightsManagerListener() > + { > + } > + > + /** > + * @return a unique instance of RightsManager. Thread safe. > + */ > + public static RightsManagerListener getInstance() > + { > + synchronized (RightsManagerListener.class) { > + if (instance == null) { > + instance = new RightsManagerListener(); > + } > + } > + > + return instance; > + } > + > + /** > + * {@inheritDoc} > + * > + * @see org.xwiki.observation.EventListener#getName() > + */ > + public String getName() > + { > + return NAME; > + } > + > + /** > + * {@inheritDoc} > + * > + * @see org.xwiki.observation.EventListener#getEvents() > + */ > + public List<Event> getEvents() > + { > + return EVENTS; > + } > + > + /** > + * {@inheritDoc} > + * > + * @see org.xwiki.observation.EventListener#onEvent(org.xwiki.observation.event.Event, java.lang.Object, > + * java.lang.Object) > + */ > + public void onEvent(Event event, Object source, Object data) > + { > + // Only take into account local events > + if (!Utils.getComponent(RemoteObservationManagerContext.class).isRemoteState()) { > + XWikiDocument document = ((XWikiDocument) source).getOriginalDocument(); > + XWikiContext context = (XWikiContext) data; > + > + String userOrGroupWiki = document.getDatabase(); > + String userOrGroupSpace = document.getSpace(); > + String userOrGroupName = document.getName(); > + > + if (document.getObject("XWiki.XWikiUsers") != null) { > + try { > + cleanDeletedUserOrGroup(userOrGroupWiki, userOrGroupSpace, userOrGroupName, true, context); > + } catch (XWikiException e) { > + LOG.warn("Error when cleaning for deleted user", e); > + } > + } else if (document.getObject("XWiki.XWikiGroups") != null) { > + try { > + cleanDeletedUserOrGroup(userOrGroupWiki, userOrGroupSpace, userOrGroupName, false, context); > + } catch (XWikiException e) { > + LOG.warn("Error when cleaning for deleted group", e); > + } > + } > + } > + } > + > + /** > + * Remove reference to provided user or group in all groups and rights in current wiki. > + * > + * @param userOrGroupWiki the wiki name of the group or user. > + * @param userOrGroupSpace the space name of the group or user. > + * @param userOrGroupName the name of the group or user. > + * @param user indicate if it is a user or a group. > + * @param context the XWiki context. > + * @throws XWikiException error when browsing groups or rights. > + */ > + private void cleanDeletedUserOrGroupInLocalWiki(String userOrGroupWiki, String userOrGroupSpace, > + String userOrGroupName, boolean user, XWikiContext context) throws XWikiException > + { > + RightsManager.getInstance().removeUserOrGroupFromAllRights(userOrGroupWiki, userOrGroupSpace, userOrGroupName, > + user, context); > + context.getWiki().getGroupService(context).removeUserOrGroupFromAllGroups(userOrGroupWiki, userOrGroupSpace, > + userOrGroupName, context); > + } > + > + /** > + * Remove reference to provided user or group in all groups and rights in all wikis. > + * > + * @param userOrGroupWiki the wiki name of the group or user. > + * @param userOrGroupSpace the space name of the group or user. > + * @param userOrGroupName the name of the group or user. > + * @param user indicate if it is a user or a group. > + * @param context the XWiki context. > + * @throws XWikiException error when browsing groups or rights. > + */ > + private void cleanDeletedUserOrGroup(String userOrGroupWiki, String userOrGroupSpace, String userOrGroupName, > + boolean user, XWikiContext context) throws XWikiException > + { > + if (!context.getWiki().isVirtualMode()) { > + cleanDeletedUserOrGroupInLocalWiki(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, context); > + } else { > + List<String> wikiList = context.getWiki().getVirtualWikisDatabaseNames(context); > + > + String database = context.getDatabase(); > + try { > + boolean foundMainWiki = false; > + > + for (String wikiName : wikiList) { > + if (context.isMainWiki(wikiName)) { > + foundMainWiki = true; > + } > + > + context.setDatabase(wikiName); > + cleanDeletedUserOrGroupInLocalWiki(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, > + context); > + } > + > + if (!foundMainWiki) { > + context.setDatabase(context.getMainXWiki()); > + cleanDeletedUserOrGroupInLocalWiki(userOrGroupWiki, userOrGroupSpace, userOrGroupName, user, > + context); > + } > + } finally { > + context.setDatabase(database); > + } > + } > + } > +} > > > Property changes on: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerListener.java > ___________________________________________________________________ > Name: svn:mime-type > + text/plain > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPlugin.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPlugin.java 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/rightsmanager/RightsManagerPlugin.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -75,10 +75,10 @@ > // removed in order to remove that user from its groups. > // Make sure we allow this plugin to be initialized several times in a row; i.e. don't re-register the > // listener if it's already registered. > - RightsManager rightsManager = RightsManager.getInstance(); > + RightsManagerListener rightsManagerListener = RightsManagerListener.getInstance(); > ObservationManager observationManager = Utils.getComponent(ObservationManager.class); > - if (observationManager.getListener(rightsManager.getName()) == null) { > - observationManager.addListener(rightsManager); > + if (observationManager.getListener(rightsManagerListener.getName()) == null) { > + observationManager.addListener(rightsManagerListener); > } > } > > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/StatsUtil.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/StatsUtil.java 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/StatsUtil.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -23,8 +23,10 @@ > > import java.net.MalformedURLException; > import java.net.URL; > +import java.util.ArrayList; > import java.util.Calendar; > import java.util.Collection; > +import java.util.Collections; > import java.util.Date; > import java.util.List; > > @@ -36,12 +38,13 @@ > import org.apache.commons.lang.StringUtils; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > +import org.xwiki.model.reference.DocumentReference; > +import org.xwiki.query.Query; > +import org.xwiki.query.QueryManager; > > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > -import org.xwiki.query.Query; > -import org.xwiki.query.QueryManager; > - > +import com.xpn.xwiki.plugin.rightsmanager.RightsManager; > import com.xpn.xwiki.user.api.XWikiRightService; > import com.xpn.xwiki.util.Util; > import com.xpn.xwiki.web.XWikiRequest; > @@ -59,11 +62,26 @@ > private static final Log LOG = LogFactory.getLog(StatsUtil.class); > > /** > + * Default separator for a list. > + */ > + private static final String LIST_SEPARATOR = ","; > + > + /** > + * Default separator for a list in escaped form. > + */ > + private static final String ESCAPED_LIST_SEPARATOR = "\\,"; > + > + /** > * The name of the property in XWiki configuration file containing the list of cookie domains. > */ > private static final String CFGPROP_COOKIEDOMAINS = "xwiki.authentication.cookiedomains"; > > /** > + * Separator for the property in XWiki configuration file containing the list of cookie domains. > + */ > + private static final char CFGPROP_COOKIEDOMAINS_SEP = ','; > + > + /** > * The name of the property in XWiki configuration file indicating if statistics are enabled. > */ > private static final String CFGPROP_STATS = "xwiki.stats"; > @@ -74,6 +92,12 @@ > private static final String CFGPROP_STATS_DEFAULT = "xwiki.stats.default"; > > /** > + * The name of the property in XWiki configuration file containing the list of users and group to filter in > + * statistics requests. > + */ > + private static final String CFGPROP_STATS_EXCLUDEDUSERSANDGROUPS = "xwiki.stats.excludedUsersAndGroups"; > + > + /** > * The prefix name of the session property containing recent statistics actions. > */ > private static final String SESSPROP_RECENT_PREFFIX = "recent_"; > @@ -94,6 +118,12 @@ > private static final String PREFPROP_STATISTICS = "statistics"; > > /** > + * The name of the XWiki preferences property containing the list of users and group to filter in statistics > + * requests. > + */ > + private static final String PREFPROP_EXCLUDEDUSERSANDGROUPS = "statistics_excludedUsersAndGroups"; > + > + /** > * The name of the request property containing the referer. > */ > private static final String REQPROP_REFERER = "referer"; > @@ -158,7 +188,8 @@ > * <ul> > * <li>"yyyMMdd" for {@link PeriodType#DAY}</li> > * <li>"yyyMM" for {@link PeriodType#MONTH}</li> > - * </ul>. > + * </ul> > + * . > * > * @param date the date for which to return an integer representation. > * @param type the date type. It can be {@link PeriodType#DAY} or {@link PeriodType#MONTH}. > @@ -195,7 +226,8 @@ > public static String[] getCookieDomains(XWikiContext context) > { > if (cookieDomains == null) { > - cookieDomains = StringUtils.split(context.getWiki().Param(CFGPROP_COOKIEDOMAINS), ","); > + cookieDomains = > + StringUtils.split(context.getWiki().Param(CFGPROP_COOKIEDOMAINS), CFGPROP_COOKIEDOMAINS_SEP); > } > > return cookieDomains; > @@ -345,7 +377,7 @@ > } > } > > - if ((!context.getUser().equals(XWikiRightService.GUEST_USER_FULLNAME)) > + if ((!context.getUser().equals(XWikiRightService.GUEST_USER_FULLNAME)) > && (visitObject.getUser().equals(XWikiRightService.GUEST_USER_FULLNAME))) { > // The user has changed from guest to an authenticated user > // We want to record this > @@ -653,4 +685,51 @@ > > return referer; > } > + > + /** > + * The list of users to filter in request. > + * > + * @param context the XWiki context > + * @return the list of users references > + * @throws XWikiException error when trying to resolve users > + */ > + public static Collection<DocumentReference> getFilteredUsers(XWikiContext context) throws XWikiException > + { > + List<String> userList; > + > + String users = context.getWiki().getXWikiPreference(PREFPROP_EXCLUDEDUSERSANDGROUPS, "", context); > + > + if (StringUtils.isEmpty(users)) { > + users = context.getWiki().Param(CFGPROP_STATS_EXCLUDEDUSERSANDGROUPS); > + } > + > + if (!StringUtils.isBlank(users)) { > + userList = new ArrayList<String>(); > + > + int begin = 0; > + boolean escaped = false; > + for (int i = 0; i < users.length(); ++i) { > + char c = users.charAt(i); > + > + if (!escaped) { > + if (c == '\\') { > + escaped = true; > + } else if (c == ',') { > + userList.add(users.substring(begin, i).replace(ESCAPED_LIST_SEPARATOR, LIST_SEPARATOR)); > + begin = i + 1; > + } > + } else { > + escaped = false; > + } > + } > + > + if (begin < users.length()) { > + userList.add(users.substring(begin).replace(ESCAPED_LIST_SEPARATOR, LIST_SEPARATOR)); > + } > + } else { > + userList = Collections.emptyList(); > + } > + > + return RightsManager.getInstance().resolveUsers(userList, context); > + } > } > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/xwiki/XWikiStatsReader.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/xwiki/XWikiStatsReader.java 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/xwiki/XWikiStatsReader.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -32,7 +32,11 @@ > import java.util.Map; > > import org.apache.commons.collections.CollectionUtils; > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > import org.joda.time.DateTime; > +import org.xwiki.model.reference.DocumentReference; > +import org.xwiki.model.reference.EntityReferenceSerializer; > > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > @@ -49,6 +53,7 @@ > import com.xpn.xwiki.store.XWikiHibernateStore; > import com.xpn.xwiki.web.DownloadAction; > import com.xpn.xwiki.web.SaveAction; > +import com.xpn.xwiki.web.Utils; > import com.xpn.xwiki.web.ViewAction; > > /** > @@ -60,6 +65,17 @@ > public class XWikiStatsReader > { > /** > + * Logging tool. > + */ > + private static final Log LOG = LogFactory.getLog(XWikiStatsReader.class); > + > + /** > + * Used to convert a proper Document Reference to a string but without the wiki name. > + */ > + private EntityReferenceSerializer<String> compactwikiEntityReferenceSerializer = > + Utils.getComponent(EntityReferenceSerializer.class, "compactwiki"); > + > + /** > * Return the statistics action stored. > * > * @param action the action. > @@ -137,8 +153,7 @@ > } > > /** > - * Shows how the statistics for the specified action have evolved over the specified period of > - * time. > + * Shows how the statistics for the specified action have evolved over the specified period of time. > * > * @param action the action for which to retrieve statistics. > * @param scope the set of documents to consider. > @@ -147,14 +162,13 @@ > * @param context the XWiki context. > * @return a map of (date, actionCount) pairs. > */ > - public Map<DateTime, Integer> getActionStatistics(String action, Scope scope, Period period, > - Duration step, XWikiContext context) > + public Map<DateTime, Integer> getActionStatistics(String action, Scope scope, Period period, Duration step, > + XWikiContext context) > { > DateTime stepStart = new DateTime(period.getStart()); > DateTime periodEnd = new DateTime(period.getEnd()); > org.joda.time.Period stepDuration = > - new org.joda.time.Period(step.getYears(), step.getMonths(), step.getWeeks(), step > - .getDays(), 0, 0, 0, 0); > + new org.joda.time.Period(step.getYears(), step.getMonths(), step.getWeeks(), step.getDays(), 0, 0, 0, 0); > > Map<DateTime, Integer> activity = new HashMap<DateTime, Integer>(); > while (stepStart.compareTo(periodEnd) < 0) { > @@ -163,8 +177,8 @@ > stepEnd = periodEnd; > } > List<DocumentStats> stats = > - getDocumentStatistics(action, scope, new Period(stepStart.getMillis(), stepEnd > - .getMillis()), RangeFactory.FIRST, context); > + getDocumentStatistics(action, scope, new Period(stepStart.getMillis(), stepEnd.getMillis()), > + RangeFactory.FIRST, context); > int actionCount = 0; > if (stats.size() > 0) { > actionCount = stats.get(0).getPageViews(); > @@ -179,18 +193,16 @@ > /** > * Retrieves document statistics. > * > - * @param action the action the results should be ordered by. It can be one of: "view", "save" > - * or "download". If the action is "view" then the documents are ordered by the > - * number of times they have been viewed so far. > + * @param action the action the results should be ordered by. It can be one of: "view", "save" or "download". If the > + * action is "view" then the documents are ordered by the number of times they have been viewed so far. > * @param scope the set of documents for which to retrieve statistics. > * @param period the period of time, including its start date but excluding its end date. > - * @param range the sub-range to return from the entire result set. Use this parameter for > - * pagination. > + * @param range the sub-range to return from the entire result set. Use this parameter for pagination. > * @param context the XWiki context. > * @return A list of DocumentStats objects > */ > - public List<DocumentStats> getDocumentStatistics(String action, Scope scope, Period period, > - Range range, XWikiContext context) > + public List<DocumentStats> getDocumentStatistics(String action, Scope scope, Period period, Range range, > + XWikiContext context) > { > List<DocumentStats> documentStatsList; > > @@ -203,18 +215,17 @@ > XWikiHibernateStore store = context.getWiki().getHibernateStore(); > > try { > - String query = MessageFormat.format( > - "select name, sum(pageViews) from DocumentStats" > - + " where {0} and action=? and ? <= period and period < ? group by name order" > - + " by sum(pageViews) {1}", nameFilter, sortOrder); > + String query = > + MessageFormat.format("select name, sum(pageViews) from DocumentStats" > + + " where {0} and action=? and ? <= period and period < ? group by name order" > + + " by sum(pageViews) {1}", nameFilter, sortOrder); > > paramList.add(action); > paramList.add(period.getStartCode()); > paramList.add(period.getEndCode()); > > List< ? > solist = > - store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, > - context); > + store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, context); > > documentStatsList = getDocumentStatistics(solist, action); > if (range.getSize() < 0) { > @@ -233,8 +244,7 @@ > * @param resultSet the result of a database query for document statistics. > * @param action the action for which the statistics were retrieved. > * @return a list of {@link com.xpn.xwiki.stats.impl.DocumentStats} objects. > - * @see #getDocumentStatistics(String, Scope, com.xpn.xwiki.criteria.impl.Period , Range , > - * XWikiContext) > + * @see #getDocumentStatistics(String, Scope, com.xpn.xwiki.criteria.impl.Period , Range , XWikiContext) > */ > private List<DocumentStats> getDocumentStatistics(List< ? > resultSet, String action) > { > @@ -246,8 +256,7 @@ > Object[] result = (Object[]) it.next(); > // We can't represent a custom period (e.g. year, week or some time interval) in the > // database and thus we use a default one, which sould be ignored > - DocumentStats docStats = > - new DocumentStats((String) result[0], action, now, PeriodType.DAY); > + DocumentStats docStats = new DocumentStats((String) result[0], action, now, PeriodType.DAY); > docStats.setPageViews(((Number) result[1]).intValue()); > documentStatsList.add(docStats); > } > @@ -261,13 +270,12 @@ > * @param domain the domain used for filtering the results. > * @param scope the scope of referred documents for which to retrieve statistics. > * @param period the period of time, including its start date but excluding its end date. > - * @param range the sub-range to return from the entire result set. Use this parameter for > - * pagination. > + * @param range the sub-range to return from the entire result set. Use this parameter for pagination. > * @param context the XWiki context. > * @return a list of DocumentStats objects. > */ > - public List<DocumentStats> getBackLinkStatistics(String domain, Scope scope, Period period, > - Range range, XWikiContext context) > + public List<DocumentStats> getBackLinkStatistics(String domain, Scope scope, Period period, Range range, > + XWikiContext context) > { > List<DocumentStats> documentStatsList; > > @@ -279,18 +287,17 @@ > > XWikiHibernateStore store = context.getWiki().getHibernateStore(); > try { > - String query = MessageFormat.format( > - "select name, sum(pageViews) from RefererStats" > - + " where {0} and referer like ? and ? <= period and period < ? group by name" > - + " order by sum(pageViews) {1}", nameFilter, sortOrder); > + String query = > + MessageFormat.format("select name, sum(pageViews) from RefererStats" > + + " where {0} and referer like ? and ? <= period and period < ? group by name" > + + " order by sum(pageViews) {1}", nameFilter, sortOrder); > > paramList.add(getHqlValidDomain(domain)); > paramList.add(period.getStartCode()); > paramList.add(period.getEndCode()); > > List< ? > solist = > - store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, > - context); > + store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, context); > > documentStatsList = getDocumentStatistics(solist, "refer"); > if (range.getSize() < 0) { > @@ -306,17 +313,16 @@ > /** > * Retrieves referrer statistics. > * > - * @param domain the domain for which to retrieve statistics. To retrieve statistics for all > - * domains use the empty string. > + * @param domain the domain for which to retrieve statistics. To retrieve statistics for all domains use the empty > + * string. > * @param scope the scope of referred documents to use for filtering the results. > * @param period the period of time, including its start date but excluding its end date. > - * @param range the sub-range to return from the entire result set. Use this parameter for > - * pagination. > + * @param range the sub-range to return from the entire result set. Use this parameter for pagination. > * @param context the XWiki context. > * @return a list of RefererStats objects. > */ > - public List<RefererStats> getRefererStatistics(String domain, Scope scope, Period period, > - Range range, XWikiContext context) > + public List<RefererStats> getRefererStatistics(String domain, Scope scope, Period period, Range range, > + XWikiContext context) > { > List<RefererStats> refererList; > > @@ -338,8 +344,7 @@ > paramList.add(period.getEndCode()); > > List< ? > solist = > - store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, > - context); > + store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, context); > > refererList = getRefererStatistics(solist); > if (range.getSize() < 0) { > @@ -353,8 +358,8 @@ > } > > /** > - * Converts the rows retrieved from the database to a list of > - * {@link com.xpn.xwiki.stats.impl.RefererStats} instances. > + * Converts the rows retrieved from the database to a list of {@link com.xpn.xwiki.stats.impl.RefererStats} > + * instances. > * > * @param resultSet The result of a database query for referer statistics > * @return A list of {@link com.xpn.xwiki.stats.impl.RefererStats} objects > @@ -379,60 +384,103 @@ > } > > /** > - * Retrieves visit statistics. > + * Generate the HQL query used in {@link #getVisitStatistics(String, Period, Range, XWikiContext)}. > * > - * @param action the action the results should be ordered by. It can be one of: "view", "save" > - * or "download". If the action is "view" then the visitors are ordered by the number > - * of pages they have viewed so far. > + * @param action the action the results should be ordered by. It can be one of: "view", "save" or "download". If the > + * action is "view" then the visitors are ordered by the number of pages they have viewed so far. > * @param period the period of time, including its start date but excluding its end date. > - * @param range the sub-range to return from the entire result set. Use this parameter for > - * pagination. > + * @param range the sub-range to return from the entire result set. Use this parameter for pagination. > + * @param paramList the list of query parameters to fill. > * @param context the XWiki context. > - * @return a list of VisitStats objects. > + * @return the HQL query > */ > - public List<VisitStats> getVisitStatistics(String action, Period period, Range range, > + private String createVisitStatisticsQuery(String action, Period period, Range range, List<Object> paramList, > XWikiContext context) > { > - List<VisitStats> visiStatList; > + StringBuffer query = new StringBuffer("select name, sum(pageSaves), sum(pageViews), sum(downloads)"); > > - List<Object> paramList = new ArrayList<Object>(2); > + query.append(" from VisitStats"); > > + query.append(" where"); > + > + // user filter > + > + StringBuffer userListWhere = new StringBuffer(); > + try { > + for (DocumentReference user : StatsUtil.getFilteredUsers(context)) { > + if (userListWhere.length() > 0) { > + userListWhere.append(", "); > + } > + userListWhere.append('?'); > + > + paramList.add(this.compactwikiEntityReferenceSerializer.serialize(user)); > + } > + } catch (Exception e) { > + LOG.error("Faild to get filter users list", e); > + } > + > + if (userListWhere.length() > 0) { > + query.append(" name NOT IN ("); > + query.append(userListWhere); > + query.append(") and "); > + } > + > + // date filter > + > + query.append(" ? <= startDate and endDate < ? group by name"); > + paramList.add(new Date(period.getStart())); > + paramList.add(new Date(period.getEnd())); > + > + // order > + > + query.append(' '); > + > String sortOrder = getHqlSortOrderFromRange(range); > > - String orderByClause; > if (action.equals(SaveAction.ACTION_NAME)) { > - orderByClause = "order by sum(pageSaves) " + sortOrder; > + query.append("order by sum(pageSaves) " + sortOrder); > } else if (action.equals(ViewAction.VIEW_ACTION)) { > - orderByClause = "order by sum(pageViews) " + sortOrder; > + query.append("order by sum(pageViews) " + sortOrder); > } else if (action.equals(DownloadAction.ACTION_NAME)) { > - orderByClause = "order by sum(downloads) " + sortOrder; > + query.append("order by sum(downloads) " + sortOrder); > } else { > - orderByClause = > - MessageFormat.format("order by sum(pageSaves) {0}," + " sum(pageViews) {0}," > - + " sum(downloads) {0}", sortOrder); > + query.append(MessageFormat.format("order by sum(pageSaves) {0}, sum(pageViews) {0}, sum(downloads) {0}", > + sortOrder)); > } > > + return query.toString(); > + } > + > + /** > + * Retrieves visit statistics. > + * > + * @param action the action the results should be ordered by. It can be one of: "view", "save" or "download". If the > + * action is "view" then the visitors are ordered by the number of pages they have viewed so far. > + * @param period the period of time, including its start date but excluding its end date. > + * @param range the sub-range to return from the entire result set. Use this parameter for pagination. > + * @param context the XWiki context. > + * @return a list of VisitStats objects. > + */ > + public List<VisitStats> getVisitStatistics(String action, Period period, Range range, XWikiContext context) > + { > + List<VisitStats> visiStatList; > + > + List<Object> paramList = new ArrayList<Object>(2); > + > + String query = createVisitStatisticsQuery(action, period, range, paramList, context); > + > XWikiHibernateStore store = context.getWiki().getHibernateStore(); > try { > - String query = > - "select name, sum(pageSaves), sum(pageViews), sum(downloads)" > - + " from VisitStats" + " where ? <= startDate and endDate < ? group by name " > - + orderByClause; > - > - paramList.add(new Date(period.getStart())); > - paramList.add(new Date(period.getEnd())); > - > List< ? > solist = > - store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, > - context); > + store.search(query, range.getAbsoluteSize(), range.getAbsoluteStart(), paramList, context); > > - visiStatList = > - getVisitStatistics(solist, new DateTime(period.getStart()), new DateTime(period > - .getEnd())); > + visiStatList = getVisitStatistics(solist, new DateTime(period.getStart()), new DateTime(period.getEnd())); > if (range.getSize() < 0) { > Collections.reverse(visiStatList); > } > } catch (XWikiException e) { > + LOG.error("Faild to search for vist statistics", e); > + > visiStatList = Collections.emptyList(); > } > > @@ -446,10 +494,9 @@ > * @param startDate the start date used in the query. > * @param endDate the end date used in the query. > * @return a list of {@link com.xpn.xwiki.stats.impl.VisitStats} objects. > - * @see #getVisitStatistics(com.xpn.xwiki.criteria.impl.Period , Range , XWikiContext) > + * @see #getVisitStatistics(String, Period, Range, XWikiContext) > */ > - private List<VisitStats> getVisitStatistics(List< ? > resultSet, DateTime startDate, > - DateTime endDate) > + private List<VisitStats> getVisitStatistics(List< ? > resultSet, DateTime startDate, DateTime endDate) > { > List<VisitStats> stats = new ArrayList<VisitStats>(resultSet.size()); > > @@ -466,8 +513,7 @@ > int downloads = ((Number) result[3]).intValue(); > > VisitStats vs = > - new VisitStats(name, uniqueID, cookie, ip, userAgent, new Date(startDate > - .getMillis()), PeriodType.DAY); > + new VisitStats(name, uniqueID, cookie, ip, userAgent, new Date(startDate.getMillis()), PeriodType.DAY); > vs.setStartDate(new Date(startDate.getMillis())); > vs.setEndDate(new Date(endDate.getMillis())); > vs.setPageSaves(pageSaves); > @@ -492,12 +538,10 @@ > * @param month the month. > * @param context the XWiki context. > * @return DocumentStats - statistics object. > - * @deprecated use {@link #getDocumentStatistics(String, Scope, Period, Range , XWikiContext)} > - * instead. > + * @deprecated use {@link #getDocumentStatistics(String, Scope, Period, Range , XWikiContext)} instead. > */ > @Deprecated > - public DocumentStats getDocMonthStats(String docname, String action, Date month, > - XWikiContext context) > + public DocumentStats getDocMonthStats(String docname, String action, Date month, XWikiContext context) > { > XWikiHibernateStore store = context.getWiki().getHibernateStore(); > DocumentStats object = new DocumentStats(docname, action, month, PeriodType.MONTH); > @@ -518,12 +562,10 @@ > * @param context the XWiki context. > * @return the monthly referer statistics. > * @throws XWikiException error when searching for referer statistics. > - * @deprecated use {@link #getRefererStatistics(String, Scope, Period, Range, XWikiContext)} > - * instead. > + * @deprecated use {@link #getRefererStatistics(String, Scope, Period, Range, XWikiContext)} instead. > */ > @Deprecated > - public List< ? > getRefMonthStats(String docName, Date month, XWikiContext context) > - throws XWikiException > + public List< ? > getRefMonthStats(String docName, Date month, XWikiContext context) throws XWikiException > { > XWikiHibernateStore store = context.getWiki().getHibernateStore(); > > @@ -531,9 +573,7 @@ > if (store != null) { > List<Object> paramList = new ArrayList<Object>(1); > paramList.add(docName); > - solist = > - store.search("from RefererStats as obj where obj.name=?", 0, 0, paramList, > - context); > + solist = store.search("from RefererStats as obj where obj.name=?", 0, 0, paramList, context); > } else { > solist = Collections.emptyList(); > } > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiRightService.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiRightService.java 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiRightService.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -40,9 +40,14 @@ > public static final String SUPERADMIN_USER_FULLNAME = "XWiki." + SUPERADMIN_USER; > > /** > + * The Guest username. > + */ > + public static final String GUEST_USER = "XWikiGuest"; > + > + /** > * The Guest full name. > */ > - public static final String GUEST_USER_FULLNAME = "XWiki.XWikiGuest"; > + public static final String GUEST_USER_FULLNAME = "XWiki." + GUEST_USER; > > /** > * Checks if the wiki current user has the right to execute (@code action} on the document {@code doc}, along with > > Modified: platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/stats/impl/StatsUtilTest.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/stats/impl/StatsUtilTest.java 2010-03-16 13:07:30 UTC (rev 27652) > +++ platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/stats/impl/StatsUtilTest.java 2010-03-16 13:37:11 UTC (rev 27653) > @@ -20,18 +20,45 @@ > package com.xpn.xwiki.stats.impl; > > import java.text.SimpleDateFormat; > +import java.util.Arrays; > import java.util.Calendar; > +import java.util.HashSet; > > +import org.jmock.Mock; > +import org.xwiki.model.reference.DocumentReference; > + > +import com.xpn.xwiki.XWiki; > +import com.xpn.xwiki.XWikiException; > +import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.objects.BaseObject; > import com.xpn.xwiki.stats.impl.StatsUtil.PeriodType; > +import com.xpn.xwiki.test.AbstractBridgedXWikiComponentTestCase; > > -import junit.framework.TestCase; > - > /** > * Unit tests for the {@link StatsUtil} class. > + * > + * @version $Id$ > */ > -public class StatsUtilTest extends TestCase > +public class StatsUtilTest extends AbstractBridgedXWikiComponentTestCase > { > + private Mock mockXWiki; > + > /** > + * {@inheritDoc} > + * > + * @see com.xpn.xwiki.test.AbstractBridgedXWikiComponentTestCase#setUp() > + */ > + @Override > + protected void setUp() throws Exception > + { > + super.setUp(); > + > + this.mockXWiki = mock(XWiki.class); > + > + getContext().setWiki((XWiki) this.mockXWiki.proxy()); > + } > + > + /** > * Test for the {@link StatsUtil#getPeriodAsInt(java.util.Date, PeriodType)}. > */ > public void testGetPeriodAsInt() > @@ -48,4 +75,62 @@ > b = StatsUtil.getPeriodAsInt(cal.getTime(), PeriodType.DAY) + ""; > assertEquals("Wrong day period format", a, b); > } > + > + public void testGetFilteredUsers() throws XWikiException > + { > + this.mockXWiki.stubs().method("getXWikiPreference").will(returnValue(null)); > + this.mockXWiki.stubs().method("Param").will(returnValue(null)); > + > + assertEquals(new HashSet<DocumentReference>(), StatsUtil.getFilteredUsers(getContext())); > + > + this.mockXWiki.stubs().method("Param").will(returnValue("XWiki.XWikiGuest")); > + > + assertEquals(new HashSet<DocumentReference>(Arrays.asList(new DocumentReference("xwiki", "XWiki", "XWikiGuest"))), StatsUtil.getFilteredUsers(getContext())); > + > + this.mockXWiki.stubs().method("Param").will(returnValue("XWiki.supeRadmin")); > + > + assertEquals(new HashSet<DocumentReference>(Arrays.asList(new DocumentReference("xwiki", "XWiki", "supeRadmin"))), StatsUtil.getFilteredUsers(getContext())); > + > + this.mockXWiki.stubs().method("Param").will(returnValue("invalid")); > + this.mockXWiki.stubs().method("getDocument").will(returnValue(new XWikiDocument("xwiki", "Space", "invalid"))); > + > + assertEquals(new HashSet<DocumentReference>(), StatsUtil.getFilteredUsers(getContext())); > + > + DocumentReference userReference = new DocumentReference("xwiki", "XWiki", "user"); > + final XWikiDocument userDoc = new XWikiDocument(userReference); > + userDoc.addXObject(new DocumentReference("xwiki", "XWiki", "XWikiUsers"), new BaseObject()); > + > + this.mockXWiki.stubs().method("Param").will(returnValue("XWiki.user")); > + this.mockXWiki.stubs().method("getDocument").with(eq(userReference), ANYTHING).will(returnValue(userDoc)); > + > + assertEquals(new HashSet<DocumentReference>(Arrays.asList(userReference)), StatsUtil > + .getFilteredUsers(getContext())); > + > + DocumentReference user2Reference = new DocumentReference("xwiki", "XWiki", "user2"); > + final XWikiDocument user2Doc = new XWikiDocument(user2Reference); > + user2Doc.addXObject(new DocumentReference("xwiki", "XWiki", "XWikiUsers"), new BaseObject()); > + > + this.mockXWiki.stubs().method("Param").will(returnValue("XWiki.user,XWiki.user2")); > + this.mockXWiki.stubs().method("getDocument").with(eq(user2Reference), ANYTHING).will(returnValue(user2Doc)); > + > + assertEquals(new HashSet<DocumentReference>(Arrays.asList(userReference, user2Reference)), StatsUtil > + .getFilteredUsers(getContext())); > + > + DocumentReference user3Reference = new DocumentReference("otherwiki", "XWiki", "user3"); > + final XWikiDocument user3Doc = new XWikiDocument(user3Reference); > + user3Doc.addXObject(new DocumentReference("otherwiki", "XWiki", "XWikiUsers"), new BaseObject()); > + > + DocumentReference groupReference = new DocumentReference("otherwiki", "XWiki", "group"); > + final XWikiDocument groupDoc = new XWikiDocument(groupReference); > + BaseObject member = new BaseObject(); > + member.setStringValue("member", "user3"); > + groupDoc.addXObject(new DocumentReference("otherwiki", "XWiki", "XWikiGroups"), member); > + > + this.mockXWiki.stubs().method("Param").will(returnValue("XWiki.user,XWiki.user2,otherwiki:XWiki.group")); > + this.mockXWiki.stubs().method("getDocument").with(eq(groupReference), ANYTHING).will(returnValue(groupDoc)); > + this.mockXWiki.stubs().method("getDocument").with(eq(user3Reference), ANYTHING).will(returnValue(user3Doc)); > + > + assertEquals(new HashSet<DocumentReference>(Arrays.asList(userReference, user2Reference, user3Reference)), > + StatsUtil.getFilteredUsers(getContext())); > + } > } > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

15 years, 6 months

1
0
0 0

[xwiki-devs] [PROPOSAL] Statistics users default filter

by Thomas Mortagne

Hi dev, I'm working on http://jira.xwiki.org/jira/browse/XWIKI-4606 and i would like to propose the following: 1) add a property than takes a list of users/groups I only found xwiki.stats.excludedUsers for now, xwiki.stats.excludedUsersAndGroups is a bit long an groups are meta users so it's ok, right ? ;) For each element of the list we get the document to know if it's a user of a group and recursively get groups users to produce a list of all users to filter. That means that StatUtils#getFilteredUsers would return a list of users without any group that would have been internally "resolved". I plan to add this resolve tool in com.xpn.xwiki.plugin.rightsmanager.RightsManager for now, we can see latter if we want to add this in public apis (RightsManager*PluginApi classes). For now i plan to have: * xwiki.stats.excludedUsers in xwiki.cfg (follow "xwiki.stats" propery naming) * statistics_excludedUsers in XWikiPreferencesmyxwiki.org (follow "statistics" property naming) 2) in all statistics search/get methods we filter theses users automatically by inserting them in the hql where clauses (all theses methods are mostly about creating the proper database query to get the result) WDYT ? Thanks -- Thomas Mortagne

15 years, 6 months

4
8
0 0

Re: [xwiki-devs] [xwiki-notifications] r27643 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web

by Vincent Massol

On Mar 16, 2010, at 10:14 AM, Caleb James DeLisle wrote: > Actually I was trying to be hip and use gedit to write the log so I could use multiple lines. > Maybe I'll set a newline variable in my .bashrc so I can keep on using the command line... FWIW I use vi and it works well. I just type "svn commit", then vi opens, I enter my comment and save it and it just works for me. -Vincent > > Marius Dumitru Florea wrote: >> cjdelisle (SVN) wrote: >>> Author: cjdelisle >>> Date: 2010-03-16 09:50:34 +0100 (Tue, 16 Mar 2010) >>> New Revision: 27643 >>> >>> Modified: >>> platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java >> >>> Log: >> >> You forgot the log :) >> >> Thanks, >> Marius >> >>> >>> Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java >>> =================================================================== >>> --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java 2010-03-16 08:34:35 UTC (rev 27642) >>> +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java 2010-03-16 08:50:34 UTC (rev 27643) >>> @@ -40,6 +40,10 @@ >>> * @see XWikiAction#render(com.xpn.xwiki.XWikiContext) >>> */ >>> public String render(XWikiContext context) throws XWikiException { >>> - return context.getWiki().Param("xwiki.unknownActionResponse", "exception"); >>> + String defaultAction = context.getWiki().Param("xwiki.unknownActionResponse", "exception"); >>> + // Set the action in the context because code which uses $xcontext.getAction() >>> + // should get the desired action instead of "unknown" >>> + context.setAction(defaultAction); >>> + return defaultAction; >>> } >>> } >>> >>> _______________________________________________ >>> notifications mailing list >>> notifications(a)xwiki.org >>> http://lists.xwiki.org/mailman/listinfo/notifications >> _______________________________________________ >> notifications mailing list >> notifications(a)xwiki.org >> http://lists.xwiki.org/mailman/listinfo/notifications >> > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

15 years, 6 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r27643 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web

by Marius Dumitru Florea

cjdelisle (SVN) wrote: > Author: cjdelisle > Date: 2010-03-16 09:50:34 +0100 (Tue, 16 Mar 2010) > New Revision: 27643 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java > Log: You forgot the log :) Thanks, Marius > > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java 2010-03-16 08:34:35 UTC (rev 27642) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/UnknownAction.java 2010-03-16 08:50:34 UTC (rev 27643) > @@ -40,6 +40,10 @@ > * @see XWikiAction#render(com.xpn.xwiki.XWikiContext) > */ > public String render(XWikiContext context) throws XWikiException { > - return context.getWiki().Param("xwiki.unknownActionResponse", "exception"); > + String defaultAction = context.getWiki().Param("xwiki.unknownActionResponse", "exception"); > + // Set the action in the context because code which uses $xcontext.getAction() > + // should get the desired action instead of "unknown" > + context.setAction(defaultAction); > + return defaultAction; > } > } > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

15 years, 6 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs