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

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

by Thomas Mortagne

+1 for annotations in standard +1 to make possible to enable/disable annotations On Mon, Mar 15, 2010 at 18:17, Vincent Massol <vincent(a)massol.net> 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). > > 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 > -- Thomas Mortagne

15 years, 6 months

1
0
0 0

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

by Guillaume Lerouge

Hi, On Mon, Mar 15, 2010 at 6:17 PM, Vincent Massol <vincent(a)massol.net> 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). > > 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). > I'm +1 too. I believe annotations are a cool and useful feature and that they fit well the traditional wiki use-case of people collaborating on content together. More generally speaking, I agree with Vincent about the strategy of core-trimming that will need to take place once XWiki becomes more extensible. Guillaume > 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 > -- Guillaume Lerouge Product Manager - XWiki SAS Skype: wikibc Twitter: glerouge http://guillaumelerouge.com/

15 years, 6 months

1
0
0 0

[xwiki-devs] [discussion] Object property references separators

by Anca Luca

Hi all, I would like to go ahead with committing http://jira.xwiki.org/jira/browse/XWIKI-4775 before the 2.2 final release (because I would like annotations to work as clean as possible on 2.2 final). In order to do that, we need to agree on a set of separators for the object name and property name. There have been the following proposals so far: A wiki:Space.Page^objectName#property B wiki:Space.Page^objectName$property which has received some votes in http://markmail.org/thread/uihq4mmwgaufbcz6 but I personally would stay away from # and $ separators since they're reserved characters in velocity scripting language and it might be uncomfortable for using refs in scripts. Also, we had: C wiki:Space.Page^objectName;property and also: D wiki:Space.Page:objectName.property Which one would you prefer? Any other proposals? Any separator should be easy to implement, and roughly anything could be used as a separator (so feel free to propose). Note that there is an alternative to this, to make annotations implementable on 2.2: only add the two entity types (Object and Object Property) along with making the string serializer and string resolver extensible so one could add its own separators for the 2 new types. WDYT? Thanks, Anca

15 years, 6 months

4
8
0 0

[xwiki-devs] GSoC: Interested in "Export To Word / PDF through OpenOffice" project

by Amer Tahir

Hi, I'm a BSc Computer Science student studying at LUMS, Pakistan and I wish to contribute to XWiki project through GSoC 2010. I'm familiar with OpenOffice integration with wikis, I did a university project on a similar idea for MediaWiki, but I feel that I can use the same techniques to export wiki content to Word/PDF/HTML using OpenOffice components. I've recently familiarized myself with XWiki and it's powerful architecture excites me. I can't wait to start working on it. I would like to know what do the mentors (Asiri Rathnayake and Florin Ciubotaru) expect from this project, any limitations/bottlenecks they suspect that might need to be taken care of and so on. I've not worked on open-source projects before, but I've worked on many web-based and software projects with sufficient experience of Java programming. Waiting for an opportunity to get on board, Amer Tahir

15 years, 6 months

2
1
0 0

[xwiki-devs] Oracle 10g Installation, real world permissions.

by NicolaNardino

Hi guys, I'm preparing a proper xwiki installation in my network on a shared Oracle 10g instance. Of course, it's ot of the world granting all privileges to the xwiki user, so I did some testing and found out that it just needs the roles connect and resource. As far as I could see, the oracle schema contains no procedures nor triggers or other objects but tables and indexes, and the hibernate sequence. Can anyone confirm it? Cheers Nicola -- View this message in context: http://n2.nabble.com/Oracle-10g-Installation-real-world-permissions-tp47361… Sent from the XWiki- Dev mailing list archive at Nabble.com.

15 years, 6 months

3
4
0 0

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

by Sergiu Dumitriu

On 03/15/2010 12:36 PM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-03-15 12:36:08 +0100 (Mon, 15 Mar 2010) > New Revision: 27636 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java > Log: > XWIKI-4902: Introduce new APIs based on Entity Reference (public APIs) > > * Better implementation > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java 2010-03-15 11:04:29 UTC (rev 27635) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java 2010-03-15 11:36:08 UTC (rev 27636) > @@ -1493,8 +1493,11 @@ > public DocumentReference getDocumentReferenceFromPath(String path, XWikiContext context) > { > // TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points. > + > + // Make sure the path is URL-decoded > + String decodedPath = Util.decodeURI(path, context); No, this breaks encoded / (%2B) in document names. > List<String> segments = new ArrayList<String>(); > - for (String segment : path.split("/", -1)) { > + for (String segment : decodedPath.split("/", -1)) { > segments.add(segment); > } > // Remove the first segment if it's empty to cater for cases when the path starts with "/" > @@ -1505,18 +1508,7 @@ > XWikiEntityURL entityURL = (XWikiEntityURL) this.entityXWikiURLBuilder.build( > new WikiReference(context.getDatabase()), segments); > > - // URL-unencode the parsed document reference parts since the path we get as input can contain URL-encoded > - // path segments. > - // TODO: When we move to using XWikiURLFactory this won't be needed anymore. > - DocumentReference documentReference = > - new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT)); > - documentReference.setName(Util.decodeURI(documentReference.getName(), context)); > - documentReference.getLastSpaceReference().setName( > - Util.decodeURI(documentReference.getLastSpaceReference().getName(), context)); > - documentReference.getWikiReference().setName( > - Util.decodeURI(documentReference.getWikiReference().getName(), context)); > - > - return documentReference; > + return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT)); > } > -- Sergiu Dumitriu http://purl.org/net/sergiu/

15 years, 6 months

1
0
0 0

[xwiki-devs] XE 2.2.3 preparation

by Vincent Massol

Hi devs, We need to start releasing XE 2.2.3 ASAP (there was a big regression re creation of subwikis for XEM). The idea is to release Wednesday if that's ok for everyone. Please let me know if you know of an important bug that should go in 2.2.3 and that's not already there. Same if you're working on something for 2.2.3 Thanks -Vincent

15 years, 6 months

2
2
0 0

[xwiki-devs] two ideas

by Beibei Yang

Hello All, I'd like to contribute to the XWiki project through the GSoC 2010. I just spent the evening to try out XWiki. It's really a cool app. I love it! I have a couple ideas to make it even better but I'm not 100% sure if they are implemented. Please enlighten me. 1. Import blog entries from RSS feeds: The XWiki Blog allows users to add blog entries. It would be useful to implement the feature to allow users to import blog entries from RSS feeds. 2. Add Feedburner to all the feeds in XWiki. Thank you, Beibei (Betty) Yang

15 years, 6 months

4
3
0 0

[xwiki-devs] [Proposal] Add support for PostgreSQL

by Caleb James DeLisle

Hello, Postgres works quite well with XWiki as it is (I use it on localhost without issue). The only feature missing right now is virtual wiki support, this is because Hibernate demands that everything take place inside of a transaction and Postgres demands that databases be created outside of a transaction. Recently I have found that I can open a single connection and switch it to "autoCommit" mode create a database then close the session. A test case: {{groovy}} session = xcontext.getContext().getWiki().getHibernateStore().getSessionFactory().openSession(); connection = session.connection(); try { connection.setAutoCommit(true); statement = connection.createStatement(); statement.execute("create database subwiki"); } finally { connection.setAutoCommit(false); session.close(); } {{/groovy}} I am proposing we add a method to XWikiHibernateStore: executeWithAutoCommit(String sql) which does what is shown in the above code. This should open the door to postgres support. WDYT? Caleb

15 years, 6 months

2
2
0 0

[xwiki-devs] Regex validation of password on registration page

by Caleb James DeLisle

Guillaume Lerouge asked me on IRC if one could choose a regex for validating a password which a user chooses. This was the question: CalebJamesDeLisl: do you know whether it's possible to specify a regex for the password check in the new registration screen? <glerouge> like, if the password does not have at least 3 numbers, 3 lowecase letters and 3 uppercase letters refuse it Since he was gone when I woke up, I decided to answer here. The answer is yes it is quite possible, in fact there is a regex being used already at the moment the regex only forces the user to choose a password longer than 5 characters but it can be changed in the configuration at the top of the registration page. The configuration looks like this: ## ##The password field, mandatory and must be at least 6 characters long. #set($field = {'name' : 'register_password', 'label' : $msg.get('core.register.password'), 'params' : { 'type' : 'password', 'size' : '10' }, 'validate' : { 'mandatory' : { 'failureMessage' : $msg.get('xe.admin.registration.fieldMandatory') }, 'regex' : { 'pattern' : '/.{6,}/', 'failureMessage' : $msg.get('xe.admin.registration.passwordTooShort') } } }) and where it says /.{6,}/ is where you would put the expression (and you would probably want to change the failure message) Note that you may not add another regular expression below the one already existing because the data is stored as a map and a map can only have one value for the key 'regex'. Caleb

15 years, 6 months

2
2
0 0

[xwiki-devs] [Proposal] Allow users to send mail inviting their friends to join a wiki.

by Caleb James DeLisle

Users should be able to invite other people to join their wiki by sending email made with a template. They should be able to add a message. There should be a template message which tells what the invitation is about. They should be taken to the registration application (their email address can be filled in as long as <> " ' \ characters are escaped to prevent XSS) There should be a mechanism to store the ip addresses/user names of those who send the email and a link in the email to report spam so the service is not abused. I would like to make it an application if possible. Your thoughts? Caleb

15 years, 6 months

4
4
0 0

[xwiki-devs] http://webid.myxwiki.org/

by Story Henry

A very basic implementation of foaf+ssl is up here: http://webid.myxwiki.org/ We put it up at its own wiki to allow us more freedom to try out new ideas. You can currently create an account there, then create your X509 certificate in one click which you can use to login to other sites. Some things that would be fun to put there: 1- cool homepage URLs ------------------- For example: http://webid.myxwiki.org/id/bblfish would be nice, and a lot better than http://webid.myxwiki.org/xwiki/bin/view/XWiki/hjs This would then allow us later to all have URLs like http://xwiki.org/id/bblfish Which makes for good OpenIds. 2- Add OpenId to the home pages ------------------------------ This is extremely easy. Just add <link rel="openid2.provider openid.server" href="http://openid4.me/index.php"/> to the header of the profile page. http://OpenId4.me/ automatically logs one in then if one has a WebId 3- Add Foaf+ssl login to xwiki ------------------------------ - using https://foafssl.org/srv/idp to start off with to get the basics right - by developing a module that fits into xwiki (more setup costs, but speeds things up a lot) 4- Somewhat more clever authentication policies ----------------------------------------------- Using foaf+ssl one can develop rules to give access to parts of the wiki to all the friends of one's friends, to all people working on a project (described by DOAP), etc... Many more ideas. But I'll be happy if the above work. I think that should get everyone here interested enough to develop more such cool examples. Social Web Architect http://bblfish.net/ Social Web Architect http://bblfish.net/

15 years, 6 months

1
1
0 0

[xwiki-devs] [Proposal] Add support for Default Values for XWiki Wiki Macros

by Anamaria Stoica

Hi, I would like to add support for Default Values for XWiki Wiki Macros. It's not very difficult, as the XWiki Java Macros already have it. The required changes would be: - add default value property to XWiki.WikiMacroParameterClass - update DefaultWikiMacroFactory#buildMacro() to parse the new parameter - update WikiMacroParameterDescriptor with a new property for default value parameter, a new constructor and also update the getDefaultValue method Thanks, Anamaria

15 years, 6 months

6
13
0 0

[xwiki-devs] Revamp the invitation manager: restore, or rewrite? application or module?

by Caleb James DeLisle

Hello all, I would like to get the email invitation manager up and working again but I'm not sure how to do it. 1. Get the plugin working and write a small application as a front end for it. This is fast and reliable but the plugin system is deprecated and it wouldn't be that cool to be perpetuating dependency on a deprecated system. 2. Rewrite the invitation manager. I think this could be done within the 2.3 timeframe but I can't be sure of it. 2A. Rewrite as an application. This was my first thought, my reasons are because while sending email is a generic need deserving of an API, sending invitation mail is a specific need and if we are to include a public function for each need as specific as invitation email then we will surely end up with a monstrous and unmaintainable API. The problem with an application is that it is harder to maintain and keep clean, we have more systems in place such as checkstyle, advanced IDEs and the strict java compiler which are unavailable in groovy and especially unavailable in velocity. 2B. Rewrite as a module. This has the distinct advantage of the code being easier to manage, but carries the risk of bloated API. At the moment I can't think of any way to make the module available to the application/presentation end without adding to the API. How do you think this should be done? Any other options to avoid growing the api? Caleb

15 years, 6 months

1
0
0 0

[xwiki-devs] considering integration of XWiki with Sakai

by Adam Hocek

Hello, I am a developer at Marist College. We are an active member of the Sakai (sakaiproject.org). Sakai is an open source Collaboration and Learning Environment that supports many tools for collaboration. There is currently a wiki in Sakai called rWiki based on Radeox wiki. rWiki is somewhat limited and there is interest to investigate an alternative wiki option that we might integrate with. XWiki is an option that we are considering and wanted to reach out to the XWiki community to see if this was something of interest. Sakai is also developed in Java and makes sense to use XWiki's Java API. I think at this point in time we would like to see if a similar integration with another product has been done before and also to see if we could get support from the XWiki community for issues that arise during the integration process. Any feedback would be appreciated. - Adam Adam Hocek Information Technology Marist College tel: 845-575-3948

15 years, 6 months

2
5
0 0

[xwiki-devs] [VOTE] Modify EntityReferenceResolver + EntityReferenceSerializer APIs to allow for optional parameters

by Vincent Massol

Hi, I'd like to change for EntityReferenceResolver from: EntityReference resolve(T entityReferenceRepresentation, EntityType type); to EntityReference resolve(T entityReferenceRepresentation, EntityType type, Object... parameters); And for EntityReferenceSerializer, from: T serialize(EntityReference reference); to T serialize(EntityReference reference, Object... parameters); The rationale is that we need a new resolver that can normalize an EntityReference against a fixed EntityReference. Right now to implement this we need to use the execution context and modify it to modify the current doc to have that ref, do the resolving and then restore the context. It's complex and requires extra work: private <T> DocumentReference resolveReference(T referenceToResolve, DocumentReferenceResolver<T> resolver, DocumentReference defaultReference) { XWikiContext xcontext = getXWikiContext(); String originalWikiName = xcontext.getDatabase(); XWikiDocument originalCurentDocument = xcontext.getDoc(); try { xcontext.setDatabase(defaultReference.getWikiReference().getName()); xcontext.setDoc(new XWikiDocument(defaultReference)); return resolver.resolve(referenceToResolve); } finally { xcontext.setDoc(originalCurentDocument); xcontext.setDatabase(originalWikiName); } } So I'd like to write a new resolver that would be used like this: docResolver.resolve(refToNormalize, defaultReference) Notes: 1) **IMPORTANT**: Note that this could break backward compat for anyone who's done implementations based on Resolver/Serializer APIs but I still think it's ok to go with it in 2) I'd need this for XE 2.2.2 since I need this new resolver. I could hack it and continue using the code above though and only make the change in 2.3 (trunk). Here's my +1 Thanks -Vincent

15 years, 6 months

5
4
0 0

[xwiki-devs] Statistics flawed in my case (Oracle XE 10g)

by NicolaNardino

Hi guys, have you ever experienced such an issue? I had to set nullable "XWIKISTATSDOC"."XWS_CLASSNAME" to make statistics working, because I was receiving this: Caused by: java.sql.SQLIntegrityConstraintViolationException: ORA-01400: cannot insert NULL into (...."XWIKISTATSDOC"."XWS_CLASSNAME") Well, sometimes I'm getting anothererror message ROR util.JDBCExceptionReporter - ORA-00932: inconsistent datatypes: expecte d - got CLOB Any clue? Cheers Nicola -- View this message in context: http://n2.nabble.com/Statistics-flawed-in-my-case-Oracle-XE-10g-tp4709339p4… Sent from the XWiki- Dev mailing list archive at Nabble.com.

15 years, 6 months

4
5
0 0

Re: [xwiki-devs] [xwiki-notifications] r27563 - platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/main/java/org/xwiki/rendering/internal/macro/velocity

by Sergiu Dumitriu

On 03/10/2010 08:58 AM, vmassol (SVN) wrote: > Author: vmassol > Date: 2010-03-10 08:58:56 +0100 (Wed, 10 Mar 2010) > New Revision: 27563 > > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/main/java/org/xwiki/rendering/internal/macro/velocity/VelocityMacro.java > Log: > fixed invalid javadoc > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/main/java/org/xwiki/rendering/internal/macro/velocity/VelocityMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/main/java/org/xwiki/rendering/internal/macro/velocity/VelocityMacro.java 2010-03-10 06:43:01 UTC (rev 27562) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-velocity/src/main/java/org/xwiki/rendering/internal/macro/velocity/VelocityMacro.java 2010-03-10 07:58:56 UTC (rev 27563) > @@ -87,7 +87,7 @@ > /** > * {@inheritDoc} > * Why is this invalid? > - * @see AbstractScriptMacro#evaluate(ScriptMacroParameters, String, MacroTransformationContext) > + * @see AbstractScriptMacro#evaluate > */ > @Override > protected String evaluate(VelocityMacroParameters parameters, String content, MacroTransformationContext context) -- Sergiu Dumitriu http://purl.org/net/sergiu/

15 years, 6 months

3
5
0 0

[xwiki-devs] [Proposal] Change the GUID in BaseObject.clone()

by Vincent Massol

Hi, I'd like to modify BaseObject.clone() so that it changes the GUID since GUID must be unique per instance. WDYT? Thanks -Vincent

15 years, 6 months

6
5
0 0

[xwiki-devs] Editor WYSIWYG

by Mohammed BOUZERTA

Hi, I need your help. So I have used an Editor WYSIWYG in my form for adding some article. http://code.xwiki.org/xwiki/bin/view/Modules/WysiwygEditorModule There is no problem to create new article but when I need to edit and modify this I don't find any way to set the default conent of textarea(Inwysiwyg editor) <textarea id="demo"></textarea> Wysiwyg.onModuleLoad(function() { Editor = new WysiwygEditor({hookId: 'content'}); }); My question is: is there setRichTextArea() method or similar to set default content to textarea (dem). I think you so much for.

15 years, 6 months

3
2
0 0

Re: [xwiki-devs] [xwiki-notifications] r27562 - in platform/core/trunk: xwiki-core/src/main/java/com/xpn/xwiki/internal xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge

by Vincent Massol

Hi Asiri, Don't we have any tests for wiki macros? I don't see any test providing that it works. Since wiki macros are something introduced recently I'm surprised we don't have tests for it (or do we?). Also could you explain the need for default parameter values in wiki macro parameter descriptor? Since the macro content is available in the content field, isn't it easy to use a default value there? So is this just for convenience or is there something I don't see? Thanks -Vincent On Mar 10, 2010, at 7:43 AM, asiri (SVN) wrote: > Author: asiri > Date: 2010-03-10 07:43:01 +0100 (Wed, 10 Mar 2010) > New Revision: 27562 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java > Log: > XWIKI-4944: Add support for Default Values for XWiki Wiki Macros. > > * Applied anamaria's patch without changes. > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -191,7 +191,8 @@ > String parameterDescription = macroParameter.getStringValue(PARAMETER_DESCRIPTION_PROPERTY); > boolean parameterMandatory = > (macroParameter.getIntValue(PARAMETER_MANDATORY_PROPERTY) == 0) ? false : true; > - > + String parameterDefaultValue = macroParameter.getStringValue(PARAMETER_DEFAULT_VALUE_PROPERTY); > + > // Verify parameter name. > if (StringUtils.isEmpty(parameterName)) { > throw new WikiMacroException(String.format( > @@ -203,10 +204,15 @@ > String errorMessage = "Incomplete macro definition in [%s], macro parameter description is empty"; > getLogger().debug(String.format(errorMessage, documentReference)); > } > + > + // If field empty, assume no default value was provided. > + if (StringUtils.isEmpty(parameterDefaultValue)) { > + parameterDefaultValue = null; > + } > > // Create the parameter descriptor. > parameterDescriptors.add(new WikiMacroParameterDescriptor(parameterName, parameterDescription, > - parameterMandatory)); > + parameterMandatory, parameterDefaultValue)); > } > } > > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -235,6 +235,7 @@ > needsUpdate |= bclass.addTextField(PARAMETER_NAME_PROPERTY, "Parameter name", 30); > needsUpdate |= bclass.addTextAreaField(PARAMETER_DESCRIPTION_PROPERTY, "Parameter description", 40, 5); > needsUpdate |= bclass.addBooleanField(PARAMETER_MANDATORY_PROPERTY, "Parameter mandatory", "yesno"); > + needsUpdate |= bclass.addTextField(PARAMETER_DEFAULT_VALUE_PROPERTY, "Parameter default value", 30); > > if (needsUpdate) { > update(doc); > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -111,4 +111,10 @@ > * Constant for representing parameter mandatory property. > */ > String PARAMETER_MANDATORY_PROPERTY = "mandatory"; > + > + /** > + * Constant for representing parameter defaultValue property. > + * @since 2.3M1 > + */ > + String PARAMETER_DEFAULT_VALUE_PROPERTY = "defaultValue"; > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -54,6 +54,11 @@ > private boolean mandatory; > > /** > + * Default value of the parameter. > + */ > + private Object defaultValue; > + > + /** > * Creates a new {@link WikiMacroParameterDescriptor} instance. > * > * @param id parameter identifier. > @@ -68,6 +73,23 @@ > } > > /** > + * Creates a new {@link WikiMacroParameterDescriptor} instance. > + * > + * @param id parameter identifier. > + * @param description parameter description. > + * @param mandatory if the parameter is mandatory. > + * @param defaultValue parameter default value. > + * @since 2.3M1 > + */ > + public WikiMacroParameterDescriptor(String id, String description, boolean mandatory, Object defaultValue) > + { > + this.id = id; > + this.description = description; > + this.mandatory = mandatory; > + this.defaultValue = defaultValue; > + } > + > + /** > * {@inheritDoc} > */ > public String getId() > @@ -106,7 +128,7 @@ > */ > public Object getDefaultValue() > { > - return null; > + return this.defaultValue; > } > > /** > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

15 years, 6 months

4
11
0 0

Re: [xwiki-devs] [xwiki-notifications] r27562 - in platform/core/trunk: xwiki-core/src/main/java/com/xpn/xwiki/internal xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge

by Vincent Massol

On Wed, Mar 10, 2010 at 7:43 AM, asiri <platform-notifications(a)xwiki.org> wrote: > Author: asiri > Date: 2010-03-10 07:43:01 +0100 (Wed, 10 Mar 2010) > New Revision: 27562 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java > Log: > XWIKI-4944: Add support for Default Values for XWiki Wiki Macros. > > * Applied anamaria's patch without changes. > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroFactory.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -191,7 +191,8 @@ > String parameterDescription = macroParameter.getStringValue(PARAMETER_DESCRIPTION_PROPERTY); > boolean parameterMandatory = > (macroParameter.getIntValue(PARAMETER_MANDATORY_PROPERTY) == 0) ? false : true; > - > + String parameterDefaultValue = macroParameter.getStringValue(PARAMETER_DEFAULT_VALUE_PROPERTY); > + > // Verify parameter name. > if (StringUtils.isEmpty(parameterName)) { > throw new WikiMacroException(String.format( > @@ -203,10 +204,15 @@ > String errorMessage = "Incomplete macro definition in [%s], macro parameter description is empty"; > getLogger().debug(String.format(errorMessage, documentReference)); > } > + > + // If field empty, assume no default value was provided. > + if (StringUtils.isEmpty(parameterDefaultValue)) { > + parameterDefaultValue = null; > + } > > // Create the parameter descriptor. > parameterDescriptors.add(new WikiMacroParameterDescriptor(parameterName, parameterDescription, > - parameterMandatory)); > + parameterMandatory, parameterDefaultValue)); > } > } > > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultWikiMacroInitializer.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -235,6 +235,7 @@ > needsUpdate |= bclass.addTextField(PARAMETER_NAME_PROPERTY, "Parameter name", 30); > needsUpdate |= bclass.addTextAreaField(PARAMETER_DESCRIPTION_PROPERTY, "Parameter description", 40, 5); > needsUpdate |= bclass.addBooleanField(PARAMETER_MANDATORY_PROPERTY, "Parameter mandatory", "yesno"); Shouldn't this be "Mandatory parameter" instead? > + needsUpdate |= bclass.addTextField(PARAMETER_DEFAULT_VALUE_PROPERTY, "Parameter default value", 30); This should be instead: "Default parameter value" Thanks -Vincent > > if (needsUpdate) { > update(doc); > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/internal/WikiMacroConstants.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -111,4 +111,10 @@ > * Constant for representing parameter mandatory property. > */ > String PARAMETER_MANDATORY_PROPERTY = "mandatory"; > + > + /** > + * Constant for representing parameter defaultValue property. > + * @since 2.3M1 > + */ > + String PARAMETER_DEFAULT_VALUE_PROPERTY = "defaultValue"; > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java 2010-03-10 05:11:59 UTC (rev 27561) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/wikibridge/WikiMacroParameterDescriptor.java 2010-03-10 06:43:01 UTC (rev 27562) > @@ -54,6 +54,11 @@ > private boolean mandatory; > > /** > + * Default value of the parameter. > + */ > + private Object defaultValue; > + > + /** > * Creates a new {@link WikiMacroParameterDescriptor} instance. > * > * @param id parameter identifier. > @@ -68,6 +73,23 @@ > } > > /** > + * Creates a new {@link WikiMacroParameterDescriptor} instance. > + * > + * @param id parameter identifier. > + * @param description parameter description. > + * @param mandatory if the parameter is mandatory. > + * @param defaultValue parameter default value. > + * @since 2.3M1 > + */ > + public WikiMacroParameterDescriptor(String id, String description, boolean mandatory, Object defaultValue) > + { > + this.id = id; > + this.description = description; > + this.mandatory = mandatory; > + this.defaultValue = defaultValue; > + } > + > + /** > * {@inheritDoc} > */ > public String getId() > @@ -106,7 +128,7 @@ > */ > public Object getDefaultValue() > { > - return null; > + return this.defaultValue; > } > > /** > > _______________________________________________ > 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] remove captcha.enabled from xwiki.properties and only enable/disable captcha on an application by application basis.

by Caleb James DeLisle

I originally added captcha.enabled to xwiki.properties when there was no configuration for the registration page and I felt there should be settings on both administration and config file levels but in retrospect I think the decision reflected my lack of knowledge about the configuration system. I'd like to remove captcha.enabled, it will make no change to the default behavior because the captcha is disabled by default in each of it's current uses. WDYT? Caleb

15 years, 6 months

5
6
0 0

[xwiki-devs] [Proposal] Introduce relative references for XWikiDocument's parent ref and XObject's XClass ref

by Vincent Massol

Hi, Discussing with Thomas today we think we need to use relative refs in XWikiDocument for storing the Parent reference and in XObject (BaseCollection to be precise) to store the XClass reference. The rationales are: * the copy wiki use case: Imagine that you've set a relative parent reference in the UI, you'll want that the copied document retains the relativity * have the same behavior as relative links in document contents. * we had this feature and lost it during the reference refactoring in XE 2.2. Regarding the implementation the idea is to: * store relative reference using the EntityReference class and to introduce a RelativeStringEntityReferenceResolver class. * modify the XWikiDocument's javadoc to deprecate setDocumentReference and all setXXX that change the reference since XWikiDocument should be immutable re its reference (the storage impl today doesn't support a XWikiDocument that has its reference that is modified). Let me know if you see a problem. I'm starting to implement this. Thanks -Vincent

15 years, 6 months

3
2
0 0

[xwiki-devs] right problem when creating a new wiki with XEM 2.2.1

by Pascal Voitot Dev

Hello, I installed an XEM 2.2.1 on glassfish + mysql... OK Then I imported xwiki-enterprise-manager-wiki-administrator-2.2.1.xar into the Wiki... it works and I get the XEM pages... I login as XWiki.Admin I try to create a new Wiki and I get this exception [#|2010-03-05T01:16:21.719+0100|INFO|glassfishv3.0|javax.enterprise.system.std.com.sun.enterprise.v3.services.impl|_ThreadID=25;_ThreadName=Thread-1;|2010-03-05 01:16:21,718 [ http://MY_IP:8080/xwiki/bin/view/WikiManager/CreateNewWiki?wikiname=mywiki&…] ERROR kimanager.WikiManagerPluginApi - Wiki [Main.WebHome,my-adress.info,XWiki.Admin] creation failed com.xpn.xwiki.plugin.wikimanager.WikiManagerException: Error number 9001 in 5: com.xpn.xwiki.plugin.wikimanager.WikiManagerPlugin: You dont have right to create wiki [{0}] at com.xpn.xwiki.plugin.wikimanager.WikiManagerPluginApi.createNewWiki(WikiManagerPluginApi.java:204) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.velocity.util.introspection.UberspectImpl$VelMethodImpl.doInvoke(UberspectImpl.java:389) at org.apache.velocity.util.introspection.UberspectImpl$VelMethodImpl.invoke(UberspectImpl.java:378) at org.apache.velocity.runtime.parser.node.ASTMethod.execute(ASTMethod.java:270) at org.apache.velocity.runtime.parser.node.ASTReference.execute(ASTReference.java:252) at org.apache.velocity.runtime.parser.node.ASTReference.value(ASTReference.java:493) at org.apache.velocity.runtime.parser.node.ASTExpression.value(ASTExpression.java:71) at org.apache.velocity.runtime.parser.node.ASTSetDirective.render(ASTSetDirective.java:142) at org.apache.velocity.runtime.parser.node.ASTBlock.render(ASTBlock.java:72) at org.apache.velocity.runtime.parser.node.ASTIfStatement.render(ASTIfStatement.java:87) at org.apache.velocity.runtime.parser.node.SimpleNode.render(SimpleNode.java:336) at org.xwiki.velocity.internal.DefaultVelocityEngine.evaluate(DefaultVelocityEngine.java:191) at org.xwiki.velocity.internal.DefaultVelocityEngine.evaluate(DefaultVelocityEngine.java:156) at com.xpn.xwiki.render.XWikiVelocityRenderer.evaluate(XWikiVelocityRenderer.java:116) at com.xpn.xwiki.render.XWikiVelocityRenderer.render(XWikiVelocityRenderer.java:93) at com.xpn.xwiki.render.DefaultXWikiRenderingEngine.renderText(DefaultXWikiRenderingEngine.java:272) at com.xpn.xwiki.render.DefaultXWikiRenderingEngine.renderText(DefaultXWikiRenderingEngine.java:202) at com.xpn.xwiki.render.DefaultXWikiRenderingEngine.renderText(DefaultXWikiRenderingEngine.java:170) at com.xpn.xwiki.render.DefaultXWikiRenderingEngine.renderDocument(DefaultXWikiRenderingEngine.java:159) at com.xpn.xwiki.doc.XWikiDocument.getRenderedContent(XWikiDocument.java:741) at com.xpn.xwiki.doc.XWikiDocument.getRenderedContent(XWikiDocument.java:758) at com.xpn.xwiki.api.Document.getRenderedContent(Document.java:492) I've seen a closed/Won't fix bug in Jira http://jira.xwiki.org/jira/browse/XAWM-115 but the given information brings no help... I create a page in Wiki WikiManager as indicated in this bug: {{velocity}} #set($xwikicontext = $context.context) #set($rightService = $xwikicontext.getWiki().getRightService()) * Is the wiki in virtual mode: $xwikicontext.getWiki().isVirtualMode() * The user [$context.user] has admin rights: $rightService.hasAdminRights($xwikicontext) * The user [$context.user] has programming rights: $rightService.hasProgrammingRights($xwikicontext) {{/velocity}} It gives: Is the wiki in virtual mode: true The user [XWiki.Admin] has admin rights: true The user [XWiki.Admin] has programming rights: true I tried with the template "templatexe" also but nothing better... Has anyone encountered the same error as me or any idea? regards Pascal

15 years, 6 months

3
13
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