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

[xwiki-devs] Macros and 1.0 2.0 xwiki syntax

by glenn_engel＠agilent.com

I have a java macro which I've written that I'd like to reference from a panel. Is there a way to use xwiki 2.0 syntax in a panel so I can invoke my macro? It would appear that panels utilize 1.0 syntax? As a workaround I added yet another 2.0 page with just the macro invocation and then included that page in the panel. It seems like a catch22 if I create a component macro I can only use it in 2.0 and if I create a radeox macro I can only use it in 1.0. How does one write a macro that can be accessable from 1.0 or 2.0 as well as from a panel? Or, will the 1.0 be jettisoned entirely at some point ? Thanks, Glenn

16 years, 3 months

2
3
0 0

Re: [xwiki-devs] [xwiki-notifications] r20796 - platform/xwiki-applications/trunk/tag/src/main/resources/XWiki

by Sergiu Dumitriu

jvdrean (SVN) wrote: > Author: jvdrean > Date: 2009-06-04 15:27:25 +0200 (Thu, 04 Jun 2009) > New Revision: 20796 > > Modified: > platform/xwiki-applications/trunk/tag/src/main/resources/XWiki/TagCloud.xml > Log: > XATAG-11 : Modify TagCloud style to make it look better outside of the dashboard > > Modified: platform/xwiki-applications/trunk/tag/src/main/resources/XWiki/TagCloud.xml > =================================================================== > --- platform/xwiki-applications/trunk/tag/src/main/resources/XWiki/TagCloud.xml 2009-06-04 13:21:14 UTC (rev 20795) > +++ platform/xwiki-applications/trunk/tag/src/main/resources/XWiki/TagCloud.xml 2009-06-04 13:27:25 UTC (rev 20796) What is this? Please remove it. > + text-justify: auto; -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 3 months

1
0
0 0

[xwiki-devs] [Rendering] Adding a Plain text parser & syntax

by Vincent Massol

Hi, I think we need to add a plain text parser & a "plain/1.0" syntax id. Here's a use case: you want to add a groovy class in a wiki page (and you don't want it to be rendered as wiki syntax of course). WDYT? Thanks -Vincent

16 years, 3 months

5
7
0 0

[xwiki-devs] [VOTE] Modify Block.replace() API

by Vincent Massol

Hi, Following the previously aborted vote, here's a new proposal. The problem with the current implementation is that you cannot write: for (LinkBlock block : xdom.getChildrenByType(LinkBlock.class, true)) { Block newBlock = new FormatBlock(Collections.<Block>singletonList(block), Format.ITALIC); block.replace(newBlock); } This fails because when the "block" is added in FormatBlock, its parent is set to be the FormatBlock and thus when block.replace() executes the parent of the new block is set to be the format block instead of its parent. I thus propose an API that is inline with the w3c DOM API: /** * Replaces an existing children block with the passed new block. * Also sets the new block's parent to be the current block. * * @param newBlock the new block to replace the old block with */ void replaceChild(Block newBlock, Block oldBlock); /** * Replaces an existing children block with the passed new blocks. * Also sets the new block's parents to be the current block. * * @param newBlocks the new blocks to replace the old block with */ void replaceChild(List<Block> newBlocks, Block oldBlock); Note for Sergiu (before he asks ;)): - We had evaluated using either the w3c Node API or the JCR Node API before we created our own Block API. - We cannot use the w3c Node interface since it contains too many references to XML (like CDATA, ProcessingInstruction, etc) - We cannot use the JCR Node API since it's too complex and contains references to mixins, etc. Here's my +1 Thanks -Vincent

16 years, 3 months

4
3
0 0

[xwiki-devs] Plugin Spaces

by glenn_engel＠agilent.com

It seems that plugins that need to add panels or js/css support files end up creating a space with pages to store these elements. This in turn seems like it would lead to a plethora of spaces for which end users don't really have much use. Ideally it would be nice to just have all these files in the jar file and have them invisibly be part of xwiki without needing to import an xar and create a new space. The advantage of this is you have a nice single package for updating and installation. This is typical of a confluence plugin. Are there any plans to allow for 'plugin spaces' that might be 'hidden' or possibly have content provided more easily from a jar? On a separate but related note, how do people deal today with revision control when there are wiki pages needed as part of a plugin? Do you keep exporting the plugin space and checking in xar files? I'm currently keeping page content separately as conventional files and pasting them into the wiki for testing. I guess I'm not reporting anything is broke here but seems like some rough edges I'd like to smooth out. -- Glenn

16 years, 3 months

1
0
0 0

[xwiki-devs] [VOTE] Add Block.replace(Block) API in Rendering

by Vincent Massol

Hi, Right now we have a Block.replace(List<Block> newBlocks) API but I'd like to add a new one: Block.replace(Block newBlock); Here's a use case, be able to write: for (LinkBlock block : xdom.getChildrenByType(LinkBlock.class, true)) { Block newBlock = new FormatBlock(Collections.<Block>singletonList(block), Format.ITALIC); block.replace(newBlock); } Rather than: for (LinkBlock block : xdom.getChildrenByType(LinkBlock.class, true)) { Block newBlock = new FormatBlock(Collections.<Block>singletonList(block), Format.ITALIC); block.replace(Collections.<Block>singletonList(newBlock)); } The rationale is that in most cases when we do a replace we do it with a single block since most of our blocks contain children blocks. I'd like to add this in 2.0 and also in 1.9 (not breaking anything). The reason for 1.9 is that I'd like to use it in our Rendering documentation (actually that's how I discovered the pb). Here's my +1 Thanks -Vincent

16 years, 3 months

2
2
0 0

[xwiki-devs] [VOTE] Change checkstyle.xml to ignore the length of lines with GWT JSNI calls

by Marius Dumitru Florea

Hi devs, Currently our Checkstyle configuration contains this: <module name="LineLength"> <property name="ignorePattern" value="(@version|@see|@link|^import)"/> <property name="max" value="120"/> </module> I propose we add the following pattern to the ignorePattern property: @(\w+\.)+\w+::\w+\( The reason is that "Java identifiers referenced from within JSNI methods can get quite long and cannot be parsed if split across lines." ( http://code.google.com/webtoolkit/makinggwtbetter.html#codestyle ). Here's an example: var editor = @com.xpn.xwiki.wysiwyg.client.editor.WysiwygEditorApi::new(Lorg/xwiki/gwt/dom/client/JavaScriptObject;)(config); editor.@com.xpn.xwiki.wysiwyg.client.editor.WysiwygEditorApi::getSourceText(Lorg/xwiki/gwt/dom/client/JavaScriptObject;Lorg/xwiki/gwt/dom/client/JavaScriptObject;)(onSuccess, onFailure); So without modifying the ignorePattern I'm forced to exclude an entire Java source file from Checkstyle just because some of the JSNI lines are too long. I'm +1 changing the ignorePattern property. Thanks, Marius

16 years, 3 months

5
5
0 0

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

by Thomas Mortagne

On Wed, Jun 3, 2009 at 06:45, asiri <platform-notifications(a)xwiki.org> wrote: > Author: asiri > Date: 2009-06-03 06:45:22 +0200 (Wed, 03 Jun 2009) > New Revision: 20727 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java > Log: > [misc] Made setParent() method use a compact document name serializer instead of the toString() method in DocumentName class. > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2009-06-03 00:14:00 UTC (rev 20726) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2009-06-03 04:45:22 UTC (rev 20727) > @@ -605,7 +605,9 @@ > */ > public void setParent(DocumentName parentName) > { > - this.parent = parentName.toString(); > + DocumentNameSerializer serializer = > + (DocumentNameSerializer) Utils.getComponent(DocumentNameSerializer.class, "compact"); You don't need that, there is already a compactDocumentNameSerializer initialized in XWikiDocument constructor. > + this.parent = serializer.serialize(parentName); > } > > public String getFullName() > @@ -3154,10 +3156,10 @@ > > public List<String> getChildren(XWikiContext context) throws XWikiException > { > - String[] whereParams = { this.getWikiName() + ":" + this.getFullName(), this.getFullName(), this.getName(), > - this.getSpace() }; > - > - String whereStatement = "doc.parent=? or doc.parent=? or (doc.parent=? and doc.space=?)"; > + String[] whereParams = > + {this.getWikiName() + ":" + this.getFullName(), this.getFullName(), this.getName(), this.getSpace()}; > + > + String whereStatement = "doc.parent=? or doc.parent=? or (doc.parent=? and doc.space=?)"; > return context.getWiki().getStore().searchDocumentsNames(whereStatement, Arrays.asList(whereParams), context); > } > > @@ -3953,10 +3955,7 @@ > * renaming algorithm takes into account the fact that there are several ways to write a link to a given page and > * all those forms need to be renamed. For example the following links all point to the same page: > * <ul> > - * <li>[Page]</li> > - * <li>[Page?param=1]</li> > - * <li>[currentwiki:Page]</li> > - * <li>[CurrentSpace.Page]</li> > + * <li>[Page]</li> <li>[Page?param=1]</li> <li>[currentwiki:Page]</li> <li>[CurrentSpace.Page]</li> > * </ul> > * <p> > * Note: links without a space are renamed with the space added. > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications > -- Thomas Mortagne

16 years, 3 months

2
1
0 0

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

by Vincent Massol

On Jun 3, 2009, at 6:45 AM, asiri (SVN) wrote: > Author: asiri > Date: 2009-06-03 06:45:22 +0200 (Wed, 03 Jun 2009) > New Revision: 20727 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java > Log: > [misc] Made setParent() method use a compact document name > serializer instead of the toString() method in DocumentName class. > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > doc/XWikiDocument.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java 2009-06-03 00:14:00 UTC (rev 20726) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > XWikiDocument.java 2009-06-03 04:45:22 UTC (rev 20727) > @@ -605,7 +605,9 @@ > */ > public void setParent(DocumentName parentName) > { > - this.parent = parentName.toString(); > + DocumentNameSerializer serializer = > + (DocumentNameSerializer) > Utils.getComponent(DocumentNameSerializer.class, "compact"); > + this.parent = serializer.serialize(parentName); > } > > public String getFullName() > @@ -3154,10 +3156,10 @@ > > public List<String> getChildren(XWikiContext context) throws > XWikiException > { > - String[] whereParams = { this.getWikiName() + ":" + > this.getFullName(), this.getFullName(), this.getName(), > - this.getSpace() }; > - > - String whereStatement = "doc.parent=? or doc.parent=? or > (doc.parent=? and doc.space=?)"; > + String[] whereParams = > + {this.getWikiName() + ":" + this.getFullName(), > this.getFullName(), this.getName(), this.getSpace()}; > + > + String whereStatement = "doc.parent=? or doc.parent=? or > (doc.parent=? and doc.space=?)"; > return > context.getWiki().getStore().searchDocumentsNames(whereStatement, > Arrays.asList(whereParams), context); > } > > @@ -3953,10 +3955,7 @@ > * renaming algorithm takes into account the fact that there are > several ways to write a link to a given page and > * all those forms need to be renamed. For example the following > links all point to the same page: > * <ul> > - * <li>[Page]</li> > - * <li>[Page?param=1]</li> > - * <li>[currentwiki:Page]</li> > - * <li>[CurrentSpace.Page]</li> > + * <li>[Page]</li> <li>[Page?param=1]</li> > <li>[currentwiki:Page]</li> <li>[CurrentSpace.Page]</li> Can you put back the nicely formatted javadoc? Thanks -Vincent

16 years, 3 months

2
1
0 0

[xwiki-devs] [Proposal] Reorganize the document footer

by Sergiu Dumitriu

Hello devs, I'd like to reorganize the document footer as depicted in http://incubator.myxwiki.org/xwiki/bin/view/Mockups/DocumentFooter , namely: 1: Tags will be displayed after the document content, as links to tag pages, and not in an input element in the Information tab as they are now. They are still editable in view mode by clicking an edit button available after the tags list. 2. The "Created by ... on ..." information about the document will be displayed before "Last modified by...", under the document content, and not down in the page footer, where it seems ambiguous (seems to be referring to the whole wiki), nor in the Information tab. 3. The "Information" tab becomes "Related documents", since it does not contain the tags and the creator anymore. The related documents are: * parent (editable in view mode by the same mechanism as the tags) * children * included documents * links and backlinks 4. A new "Rights" tab is displayed for admins after "Related pages", basically providing the rights management UI. Here's my +1. Any objections / other suggestions? -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 3 months

5
13
0 0

[xwiki-devs] [VOTE] Add support for specifying relative document names

by Asiri Rathnayake

Hi Devs, Currently DocumentNames generated by DocumentNameFactory contains the fully qualified document name at all times. And when they are serialized using DocumentNameSerializer, they result in the fully qualified document name string like "wiki:space.name". The problem with this is that new xwiki components using DocumentAccessBridge cannot use relative document names. For an example, "parent" field of a document cannot be set w.r.t the current wiki because the "wiki:" part is always appended by default (by the serializer). So we need a mechanism to specify "what kind of document name" we mean (relative or absolute). We can achive this in many ways: 1. Allow pasing a Serializer into methods which takes in a DocumentName. 2. Allow associating a Serilizer with a DocumentName. 3. Use Execution as a means of passing the preferred Serializer 4. Use a flag inside DocumentName (ABSOLUTE, WIKI_RELATIVE, SPACE_RELATIVE) which will be intepretted by the Serializer appropriately whenever a DocumentName is serialized. None of the above approaches are perfectly clean. But the fourth approach seems to make more sense. I'm +1 for 4. Thanks. - Asiri

16 years, 3 months

3
5
0 0

[xwiki-devs] JIRA client 1.5 released

by Vincent Massol

FYI, JIRA Client 1.5 has been released: http://almworks.com/jiraclient/download.html For those who don't know it, it's a great jira client. We have an open source license for it for our committers. For the license see http://dev.xwiki.org/xwiki/bin/view/Community/DevelopmentTools#HJiraclient Thanks -Vincent

16 years, 3 months

1
0
0 0

[xwiki-devs] Custom XWiki Skins

by Andreas Schaefer

Hi Beside the technical issues which are resolved now the other main reason why I did not adapt XWiki so far is the available Skins. So far I am running the Wiki based on Mac OS X Server 10.5 Wiki which looks very slick. You can see under: http://blogs.madplanet.com/groups/mpc-staff/ or something hat looks like my blog: http://blogs.madplanet.com/users/schaefa/ XWiki only provides 2 skins which I don't think are very appealing for readers even though Toucan gets the job done for a writer. So I tried to figure out how to change a skin but could not find a lot of help on how to wrap my head around probably because I am a developer and look to far and think to complicated. So first I am wondering why aren't there any other skins available? Application like Drupal, Joopla and other have many available. In case I want to change the images (let's say making it look like the ones I mentioned above) do I then need to copy a skin directory and start to change the images? And if yes which skin should I use? I seem that 'toucan' has less items and is more up to date but I that is just a hunch. Has someone used the XWiki Skin Editor? Thanks Andreas Schaefer CEO of Madplanet.com Inc. Email: andreas.schaefer(a)madplanet.com schaefera(a)me.com Twitter; andy_mpc AIM: schaefera(a)me.com

16 years, 3 months

3
2
0 0

[xwiki-devs] [VOTE/DISCUSSION] Cahnge DocumentModelBridge::setParent(DocumentName name) implementation slightly

by Asiri Rathnayake

Hi devs, Currently the above method is implemented so as to set the absolute name of the parent document as the parent name of a page. Assuming we don't support inter-wiki parent-child relationships, I propose we should modify this method not to include the "wiki:" prefix in the parent name because it breaks the wysiwyg (not displaying parent-child relationships correctly). Now I'm not exactly sure whether it is the wysiwyg or this method that needs fixing, but the latter is easier to fix. If we do decide to modify this method, should i simply use: <code> public void setParent(DocumentName parentName) { this.parent = parentName.getSpace() + "." + parentName.getPage(); } </code> Or should I use a custom DocumentNameSerializer? Thanks a lot. - Asiri

16 years, 3 months

4
3
0 0

[xwiki-devs] JSON with XWiki/2.0 ???

by Pascal Voitot

Hello, I try to create a page in XWiki/2.0 generating some JSON data but I have some problems and I have to go back to XWiki/1.0... * when you write this in a page MySpace.MyPage: [ { "field" : "value" } ] you call MySpace.MyPage?xpage=plain and you get some HTML code: <p><br/>.{ "field"&nbsp:&nbsp"value"...<br/></p> this is not good for the JSON parser... * So I try using the verbatim {{{}}} {{{ [ { "field" : "value" } ] }}} and I call again MySpace.MyPage?xpage=plain and I get: <pre> [ { "field" : "value" } ] </pre> Ok for the JSON data but the <pre></pre> is not good also for JSON parser... * If I write some velocity inside: {{velocity}} #doit() [ { "field" : "${value}" } ] {{/velocity} I get some  comments or something like that before my json encoded into HTML... not good for the JSON parser also... What's the solution in XWiki/2.0 to make a page generate JSON? For the time being, I use XWiki/1.0 but this is not a viable solution. thanks Pascal

16 years, 3 months

2
9
0 0

Re: [xwiki-devs] [xwiki-notifications] r20681 - in platform/core/trunk: xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component/embed xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component/internal xwiki-component/xwiki-component-default/src/main/java/org/xwiki/component/manager xwiki-containers/xwiki-container-servlet/src/main/java/org/xwiki/container/servlet xwiki-core/src/test/java/com/xpn/xwiki

by Vincent Massol

On Jun 1, 2009, at 4:12 PM, Sergiu Dumitriu wrote: > vmassol (SVN) wrote: >> Author: vmassol >> Date: 2009-06-01 10:49:54 +0200 (Mon, 01 Jun 2009) >> New Revision: 20681 >> >> Log: >> XWIKI-3913: Add support for Component Manager events >> >> * TODO: Refactor localization module to use the refactored >> Observation module >> * TODO: Refactor Rendering API module by removing notion of Source >> Macro Manager (rollback as before) and instead use Component >> Manager events to register Macros dynamically. >> >> Added: platform/core/trunk/xwiki-component/xwiki-component-default/ >> src/main/java/org/xwiki/component/manager/ >> ComponentDescriptorAddedEvent.java >> =================================================================== >> --- platform/core/trunk/xwiki-component/xwiki-component-default/src/ >> main/java/org/xwiki/component/manager/ >> ComponentDescriptorAddedEvent.java (rev 0) >> +++ platform/core/trunk/xwiki-component/xwiki-component-default/src/ >> main/java/org/xwiki/component/manager/ >> ComponentDescriptorAddedEvent.java 2009-06-01 08:49:54 UTC (rev >> 20681) >> + public boolean matches(Object otherEvent) >> + { >> + boolean result = false; >> + >> + if >> (ComponentDescriptorAddedEvent >> .class.isAssignableFrom(otherEvent.getClass())) { >> + ComponentDescriptorAddedEvent event = >> (ComponentDescriptorAddedEvent) otherEvent; > > I'd like to support a wildcard here, like a listener for all component > registrations (if getRole == null, return true). > > Also, why is getRole.getName compared to simply getRole? Fixed, thanks. >> + if (getRole().getName().equals(event.getRole())) { >> + result = true; >> + } >> + } >> >> Modified: platform/core/trunk/xwiki-containers/xwiki-container- >> servlet/src/main/java/org/xwiki/container/servlet/ >> XWikiPlexusServletContextListener.java >> =================================================================== >> // This is a temporary bridge to allow non XWiki components >> to lookup XWiki components. >> - // We're putting the XWiki Component Manager instance in >> the Servlet Context so that it's >> - // available in the XWikiAction class which in turn puts >> it into the XWikiContext instance. >> - // Class that need to lookup then just need to get it from >> the XWikiContext instance. >> - // This is of course not necessary for XWiki components >> since they just need to implement >> - // the Composable interface to get access to the Component >> Manager or better they simply >> - // need to define the Components they require as field >> members and configure the Plexus >> - // deployment descriptors (components.xml) so that they >> are automatically injected. >> servletContextEvent.getServletContext().setAttribute( >> >> org.xwiki.component.manager.ComponentManager.class.getName(), >> this.componentManager); >> } > > Why did you remove this comment? Because It wasn't valid any more: - we're not using XWikiAction - there's no components.xml - the compnent manager is now injected. I thought it wasn't necessary to explain all this here and that saying it's a temporary bridge that allows non components to lookup components is enough. >> Modified: platform/core/trunk/xwiki-core/src/test/java/com/xpn/ >> xwiki/XWikiTest.java >> =================================================================== >> --- platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/ >> XWikiTest.java 2009-06-01 07:45:41 UTC (rev 20680) >> +++ platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/ >> XWikiTest.java 2009-06-01 08:49:54 UTC (rev 20681) >> @@ -20,6 +20,7 @@ >> package com.xpn.xwiki; > > A bit of duplication here: Actually I think that a bit of duplication isn't bad in tests if it makes the test simpler to read. That's what I thought there. >> - TestSaveEventListener listener = new >> TestSaveEventListener(); >> + Mock mockListener = mock(EventListener.class); >> + >> mockListener >> .stubs().method("getName").will(returnValue("testlistener")); >> + >> mockListener >> .expects >> (once()).method("getEvents").will(returnValue(Arrays.asList(new >> DocumentSaveEvent("xwikitest:Some.Document")))); >> + >> ObservationManager om = (ObservationManager) >> getComponentManager().lookup(ObservationManager.class); >> - om.addListener(new >> DocumentSaveEvent("xwikitest:Some.Document"), listener); >> + om.addListener((EventListener) mockListener.proxy()); >> Modified: platform/core/trunk/xwiki-observation/src/main/java/org/ >> xwiki/observation/internal/DefaultObservationManager.java >> =================================================================== > >> + for (Event listenerEvent : regListener.events) { > > Why do you check the class also? match() should take care of this, and > it prohibits event inheritance. Fixed, thanks. Thanks for the review! -Vincent

16 years, 3 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r20663 - in sandbox/gsoc/xoo: . src/main/assembly src/main/java/org/xwiki/xoo src/main/oxt src/main/oxt/META-INF src/main/oxt/dialogLibrary

by Florin Ciubotaru

Hi, See below, cristinas (SVN) wrote: > Author: cristinas > Date: 2009-05-31 09:54:20 +0200 (Sun, 31 May 2009) > New Revision: 20663 > > Added: > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Debug.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Settings.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/SettingsDialog.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Utils.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiAddIn.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiDialog.java > sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/ > sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Login.xdl > sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Module1.xba > sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/dialog.xlb > sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/script.xlb > Modified: > sandbox/gsoc/xoo/pom.xml > sandbox/gsoc/xoo/src/main/assembly/dep.xml > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/IConstants.java > sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XOO.java > sandbox/gsoc/xoo/src/main/oxt/META-INF/manifest.xml > Log: > connection wizard added > > Modified: sandbox/gsoc/xoo/pom.xml > =================================================================== > --- sandbox/gsoc/xoo/pom.xml 2009-05-31 04:19:18 UTC (rev 20662) > +++ sandbox/gsoc/xoo/pom.xml 2009-05-31 07:54:20 UTC (rev 20663) > @@ -1,9 +1,8 @@ > -<?xml version="1.0" encoding="UTF-8"?> > -<project> > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> > <modelVersion>4.0.0</modelVersion> > <groupId>org.xwiki.xoo</groupId> > <artifactId>xoo</artifactId> > - <version>1.0</version> > + <version>1.0-SNAPSHOT</version> > <description>XWiki OpenOffice.org Integration</description> > <build> > <plugins> > @@ -72,21 +71,27 @@ > <dependency> > <groupId>org.openoffice</groupId> > <artifactId>jurt</artifactId> > - <version>2.1.0</version> > + <version>3.0.0</version> > <scope>compile</scope> > </dependency> > <dependency> > <groupId>org.openoffice</groupId> > <artifactId>ridl</artifactId> > - <version>2.1.0</version> > + <version>3.0.0</version> > <scope>compile</scope> > </dependency> > <dependency> > <groupId>org.openoffice</groupId> > <artifactId>unoil</artifactId> > - <version>2.1.0</version> > + <version>3.0.0</version> > <scope>compile</scope> > </dependency> > + <dependency> > + <groupId>org.xwiki.platform</groupId> > + <artifactId>xwiki-core-xmlrpc-client</artifactId> > + <version>1.9-SNAPSHOT</version> > + <scope>compile</scope> > + </dependency> > </dependencies> > </project> > > > Modified: sandbox/gsoc/xoo/src/main/assembly/dep.xml > =================================================================== > --- sandbox/gsoc/xoo/src/main/assembly/dep.xml 2009-05-31 04:19:18 UTC (rev 20662) > +++ sandbox/gsoc/xoo/src/main/assembly/dep.xml 2009-05-31 07:54:20 UTC (rev 20663) > @@ -1,9 +1,12 @@ > <assembly> > - <id>bin</id> > <formats> > <format>zip</format> > </formats> > <includeBaseDirectory>false</includeBaseDirectory> > + <dependencySets> > + <dependencySet> > + </dependencySet> > + </dependencySets> > <fileSets> > <fileSet> > <directory>src/main/oxt</directory> > @@ -20,6 +23,10 @@ > <directory>src/main/oxt/META-INF</directory> > <outputDirectory>/META-INF</outputDirectory> > </fileSet> > + <fileSet> > + <directory>src/main/oxt/dialogLibrary</directory> > + <outputDirectory>/dialogLibrary</outputDirectory> > + </fileSet> > <fileSet> > <directory>target</directory> > <outputDirectory></outputDirectory> > > Added: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Debug.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Debug.java (rev 0) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Debug.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,107 @@ > +/* > + * 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 org.xwiki.xoo; > + > +import com.sun.star.awt.Rectangle; > +import com.sun.star.awt.WindowAttribute; > +import com.sun.star.awt.WindowClass; > +import com.sun.star.awt.WindowDescriptor; > +import com.sun.star.awt.XMessageBox; > +import com.sun.star.awt.XToolkit; > +import com.sun.star.awt.XWindowPeer; > +import com.sun.star.uno.UnoRuntime; > +import com.sun.star.frame.XFrame; > + > +public class Debug { > + > + private static Debug _instance; > + > + private XFrame m_xFrame; > + private XToolkit m_xToolkit; > + > + /** > + * > + */ > + private Debug() { > + } > + > + /** > + * > + * @param m_xFrame > + * @param m_xToolkit > + */ > + public void setContext(XFrame m_xFrame, XToolkit m_xToolkit) { > + this.m_xFrame = m_xFrame; > + this.m_xToolkit = m_xToolkit; > + } > + > + /** > + * > + * @return > + */ > + public static Debug getInstance() { > + if (null == _instance) { > + _instance = new Debug(); > + } > + return _instance; > + } > + > + /** > + * Shows a dialog used for debugging > + * > + * @param sTitle > + * the title of the dialog > + * @param sMessage > + * the message to be displayed > + */ > + public void showMessageBox(String sMessage) { > + try { > + if (null != m_xFrame && null != m_xToolkit) { > + > + // describe window properties. > + WindowDescriptor aDescriptor = new WindowDescriptor(); > + aDescriptor.Type = WindowClass.MODALTOP; > + aDescriptor.WindowServiceName = new String("infobox"); > + aDescriptor.ParentIndex = -1; > + aDescriptor.Parent = (XWindowPeer) UnoRuntime.queryInterface( > + XWindowPeer.class, m_xFrame.getContainerWindow()); > + aDescriptor.Bounds = new Rectangle(0, 0, 300, 200); > + aDescriptor.WindowAttributes = WindowAttribute.BORDER > + | WindowAttribute.MOVEABLE | WindowAttribute.CLOSEABLE; > + > + XWindowPeer xPeer = m_xToolkit.createWindow(aDescriptor); > + if (null != xPeer) { > + XMessageBox xMsgBox = (XMessageBox) UnoRuntime > + .queryInterface(XMessageBox.class, xPeer); > + if (null != xMsgBox) { > + xMsgBox.setCaptionText("Debug"); > + xMsgBox.setMessageText(sMessage); > + xMsgBox.execute(); > + } > + } > + } > + } catch (com.sun.star.uno.Exception e) { > + // TODO error handling > + > + } > + } > + > +} > > Modified: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/IConstants.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/IConstants.java 2009-05-31 04:19:18 UTC (rev 20662) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/IConstants.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -25,8 +25,19 @@ > */ > > public interface IConstants { Why do you need an interface for this? This looks like a .net interface naming convention, but I did not see it in the java world. The XWiki convention is documented here: - http://dev.xwiki.org/xwiki/bin/view/Community/CodeStyle#HClass2FInterfacena… > - > - public final static String PROTOCOL_XOO = "org.xwiki.xoo.xoo:"; > - public final static String CMD_LOGIN = "cmdLogin"; > - > + > + final static String PROTOCOL_XOO = "org.xwiki.xoo.xoo:"; > + final static String CMD_LOGIN = "cmdLogin"; > + final static String SETTINGS_DIALOG = "vnd.sun.star.script:dialogLibrary.Login?location=application"; > + > + final static int TYPE_INFO = 0; > + final static int TYPE_ERROR = 1; > + > + final static String TITLE_ERROR = "XWiki Error"; > + final static String TITLE_XWIKI = "XWiki"; > + > + final static int ERROR_LOGINFAILED = 0; > + final static String[] errorMessages = { "Login failed! Please check the server URL, the username and password " }; > + final static int MESS_LOGINSUCC = 0; > + final static String[] Messages = { "Login succeed!" }; > } > > Added: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Settings.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Settings.java (rev 0) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Settings.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,63 @@ > +/* > + * 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 org.xwiki.xoo; > + > +public class Settings { > I this a generic settings class or will it store just authentication settings? > + > + private String serverURL; > + private String username; > + private String password; > + > + public Settings(String serverURL, String username, String password) { > + this.serverURL = serverURL; > + this.username = username; > + this.password = password; > + } > + > + public String getServerURL() { > + return serverURL; > + } > + > + public void setServerURL(String serverURL) { > + this.serverURL = serverURL; > + } > + > + public String getUsername() { > + return username; > + } > + > + public void setUsername(String username) { > + this.username = username; > + } > + > + public String getPassword() { > + return password; > + } > + > + public void setPassword(String password) { > + this.password = password; > + } > + > + public String toString() { > + return serverURL + " " + username + " " + password; > + } > + > +} > > Added: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/SettingsDialog.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/SettingsDialog.java (rev 0) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/SettingsDialog.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,106 @@ > +/* > + * 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 org.xwiki.xoo; > + > +import org.xwiki.xmlrpc.XWikiXmlRpcClient; > + > +import com.sun.star.awt.XDialog; > +import com.sun.star.beans.UnknownPropertyException; > +import com.sun.star.lang.WrappedTargetException; > +import com.sun.star.uno.XComponentContext; > + > +public class SettingsDialog extends XWikiDialog { > + > + private final String sOKMethod = "btnOK_Clicked"; > + private final String sCancelMethod = "btnCancel_Clicked"; > + > + /** > + * > + * @param c > + */ > + public SettingsDialog(XComponentContext c) { > + super(c, IConstants.SETTINGS_DIALOG); > + } > + > + /** > + * > + */ > + public boolean callHandlerMethod(XDialog xDialog, Object EventObject, > + String MethodName) { > + > + if (MethodName.equals(sOKMethod)) { > + btnOK_Clicked(); > + } > + if (MethodName.equals(sCancelMethod)) { > + btnCancel_Clicked(); > + } > + return true; > + } > + > + /** > + * > + */ > + public void btnOK_Clicked() { > + > + boolean bResult = false; > + > + try { > + String sURL = (String) GetPropSet("txtServerURL").getPropertyValue( > + "Text"); > + String sUserName = (String) GetPropSet("txtUsername") > + .getPropertyValue("Text"); > + String sPassword = (String) GetPropSet("txtPassword") > + .getPropertyValue("Text"); > + Settings set = new Settings(sURL, sUserName, sPassword); > + > + XWikiAddIn xWikiAddIn = XWikiAddIn.getInstance(); > + xWikiAddIn.setSettings(set); > + XWikiXmlRpcClient client = xWikiAddIn.getClient(); > + if (client != null) { > + bResult = xWikiAddIn.doLogin(); > + } > + if (bResult) { > + m_xDialog.endExecute(); > + Utils.ShowMessage(m_xContext, m_xDialog, > + IConstants.TITLE_XWIKI, IConstants.MESS_LOGINSUCC, > + IConstants.TYPE_INFO, false); > + } else { > + Utils.ShowMessage(m_xContext, m_xDialog, > + IConstants.TITLE_ERROR, IConstants.ERROR_LOGINFAILED, > + IConstants.TYPE_ERROR, false); > + } > + } catch (UnknownPropertyException e) { > + // TODO Auto-generated catch block > + e.printStackTrace(); > + } catch (WrappedTargetException e) { > + // TODO Auto-generated catch block > + e.printStackTrace(); > + } > + > + } > + > + /** > + * > + */ > + public void btnCancel_Clicked() { > + m_xDialog.endExecute(); > + } > You have missing javadoc on every method in this class. Why are the mouse clicked methods public? > +} > \ No newline at end of file > > Added: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Utils.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Utils.java (rev 0) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/Utils.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,169 @@ > +/* > + * 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 org.xwiki.xoo; > + > +import com.sun.star.awt.MessageBoxButtons; > +import com.sun.star.awt.XControl; > +import com.sun.star.awt.XDialog; > +import com.sun.star.awt.XMessageBox; > +import com.sun.star.awt.XMessageBoxFactory; > +import com.sun.star.awt.XWindowPeer; > +import com.sun.star.lang.XComponent; > +import com.sun.star.lang.XMultiComponentFactory; > +import com.sun.star.uno.UnoRuntime; > +import com.sun.star.uno.XComponentContext; > + > +public class Utils { > + > + /** > + * > + * @param nMessID > + * @param nTypeID > + * @return > + */ > + private static String getText(int nMessID, int nTypeID) { > + String sMessage = null; > + > + switch (nTypeID) { > + case IConstants.TYPE_ERROR: > + sMessage = (IConstants.errorMessages.length > nMessID) ? IConstants.errorMessages[nMessID] > + : "Error: " + nMessID; > + break; > + case IConstants.TYPE_INFO: > + sMessage = (IConstants.Messages.length > nMessID) ? IConstants.Messages[nMessID] > + : "Error: " + nMessID; > + break; > + } > + return sMessage; > + } > + > + /** > + * > + * @param xContext > + * @param xDialog > + * @param sTitle > + * @param nMessID > + * @param nTypeID > + * @param bQuery > + */ > + protected static void ShowMessage(XComponentContext xContext, > + XDialog xDialog, String sTitle, int nMessID, int nTypeID, > + boolean bQuery) { > + XWindowPeer xPeer = null; > + XControl xControl = (XControl) UnoRuntime.queryInterface( > + XControl.class, xDialog); > + if (xControl != null) > + xPeer = xControl.getPeer(); > + ShowMessage(xContext, xPeer, sTitle, nMessID, nTypeID, bQuery); > + } > + > + /** > + * > + * @param xContext > + * @param xParentPeer > + * @param sTitle > + * @param nMessID > + * @param nTypeID > + * @param bQuery > + * @return > + */ > + protected static boolean ShowMessage(XComponentContext xContext, > + XWindowPeer xParentPeer, String sTitle, int nMessID, int nTypeID, > + boolean bQuery) { > + boolean bResult = false; > + > + if (xContext != null) { > + String sMessage = getText(nMessID, nTypeID); > + > + if (xParentPeer != null) { > + XMessageBoxFactory xMBFactory = null; > + XMessageBox xMB = null; > + try { > + XMultiComponentFactory xFactory = xContext > + .getServiceManager(); > + if (xFactory != null) > + xMBFactory = (XMessageBoxFactory) UnoRuntime > + .queryInterface(XMessageBoxFactory.class, > + xFactory.createInstanceWithContext( > + "com.sun.star.awt.Toolkit", > + xContext)); > + > + if (xMBFactory != null) { > + if (bQuery) { > + xMB = xMBFactory > + .createMessageBox( > + xParentPeer, > + new com.sun.star.awt.Rectangle(), > + "querybox", > + MessageBoxButtons.BUTTONS_YES_NO > + | MessageBoxButtons.DEFAULT_BUTTON_NO, > + sTitle, sMessage); > + } else if (nTypeID == IConstants.TYPE_INFO) { > + xMB = xMBFactory.createMessageBox(xParentPeer, > + new com.sun.star.awt.Rectangle(), > + "infobox", > + MessageBoxButtons.BUTTONS_YES_NO, sTitle, > + sMessage); > + } > + > + else { > + xMB = xMBFactory.createMessageBox(xParentPeer, > + new com.sun.star.awt.Rectangle(), > + "errorbox", MessageBoxButtons.BUTTONS_OK, > + sTitle, sMessage); > + } > + if (xMB != null) { > + xMB.execute(); > + bResult = true; > + } > + } > + } catch (Exception e) { > + e.printStackTrace(); > + // TODO error Handling > + > + } finally { > + if (xMB != null) > + Dispose(xMB); > + } > + } > + } > + > + return bResult; > + } > + > + /** > + * > + * @param oObject > + */ > + public static void Dispose(Object oObject) { > + if (oObject != null) { > + try { > + XComponent xComp = (XComponent) UnoRuntime.queryInterface( > + XComponent.class, oObject); > + if (xComp != null) > + xComp.dispose(); > + } catch (Exception e) { > + e.printStackTrace(); > + } > + } > + } > + > +} > > Modified: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XOO.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XOO.java 2009-05-31 04:19:18 UTC (rev 20662) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XOO.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -25,14 +25,7 @@ > import com.sun.star.lang.XSingleComponentFactory; > import com.sun.star.registry.XRegistryKey; > import com.sun.star.lib.uno.helper.WeakBase; > - > import com.sun.star.awt.XToolkit; > -import com.sun.star.awt.XWindowPeer; > -import com.sun.star.awt.XMessageBox; > -import com.sun.star.awt.WindowAttribute; > -import com.sun.star.awt.WindowClass; > -import com.sun.star.awt.WindowDescriptor; > -import com.sun.star.awt.Rectangle; > > /** > * > @@ -163,6 +156,8 @@ > m_xFrame = > (com.sun.star.frame.XFrame) UnoRuntime.queryInterface(com.sun.star.frame.XFrame.class, object[0]); > } > + Debug debug = Debug.getInstance(); > + debug.setContext(m_xFrame, m_xToolkit); > } > > /** > @@ -175,7 +170,9 @@ > { > if (aURL.Protocol.compareTo(IConstants.PROTOCOL_XOO) == 0) { > if (aURL.Path.compareTo(IConstants.CMD_LOGIN) == 0) { > - showMessageBox("Test", "Test"); > + //showMessageBox("Test", "Test"); > + SettingsDialog set = new SettingsDialog(m_xContext); > + set.show(); > return; > } > } > @@ -203,41 +200,4 @@ > // TODO add code > } > > - /** > - * Shows a dialog used for debugging > - * @param sTitle the title of the dialog > - * @param sMessage the message to be displayed > - */ > - public void showMessageBox(String sTitle, String sMessage) > - { > - try { > - if (null != m_xFrame && null != m_xToolkit) { > - > - // describe window properties. > - WindowDescriptor aDescriptor = new WindowDescriptor(); > - aDescriptor.Type = WindowClass.MODALTOP; > - aDescriptor.WindowServiceName = new String("infobox"); > - aDescriptor.ParentIndex = -1; > - aDescriptor.Parent = > - (XWindowPeer) UnoRuntime.queryInterface(XWindowPeer.class, m_xFrame.getContainerWindow()); > - aDescriptor.Bounds = new Rectangle(0, 0, 300, 200); > - aDescriptor.WindowAttributes = > - WindowAttribute.BORDER | WindowAttribute.MOVEABLE | WindowAttribute.CLOSEABLE; > - > - XWindowPeer xPeer = m_xToolkit.createWindow(aDescriptor); > - if (null != xPeer) { > - XMessageBox xMsgBox = (XMessageBox) UnoRuntime.queryInterface(XMessageBox.class, xPeer); > - if (null != xMsgBox) { > - xMsgBox.setCaptionText(sTitle); > - xMsgBox.setMessageText(sMessage); > - xMsgBox.execute(); > - } > - } > - } > - } catch (com.sun.star.uno.Exception e) { > - // TODO error handling > - > - } > - } > - > } > > Added: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiAddIn.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiAddIn.java (rev 0) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiAddIn.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,93 @@ > +/* > + * 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 org.xwiki.xoo; > + > +import java.net.MalformedURLException; > + > +import org.apache.xmlrpc.XmlRpcException; > +import org.xwiki.xmlrpc.XWikiXmlRpcClient; > + > +public class XWikiAddIn { > Can you explain a bit what is the role of this class? I hope this doesn't become a massive singleton that will be used everywhere across the sources. You are using the add-in and add-on terms in your sources. We should respect the OOo naming and call it 'extension'. > + > + static private XWikiAddIn _instance = null; > + > + private XWikiXmlRpcClient client = null; > + private Settings settings; > + > + /** > + * > + */ > + private XWikiAddIn() { > + } > + > + /** > + * > + * @return > + */ > + public static synchronized XWikiAddIn getInstance() { > + if (null == _instance) { > + _instance = new XWikiAddIn(); > + } > + return _instance; > + } > + > + /** > + * > + * @return > + */ > + public XWikiXmlRpcClient getClient() { > + return client; > + } > + > + /** > + * > + * @param set > + */ > + public void setSettings(Settings set) { > + this.settings = set; > + try { > + client = new XWikiXmlRpcClient(set.getServerURL()); > + } catch (MalformedURLException e) { > + } > + } > + > + /** > + * > + * @return > + */ > + public Settings getSettings() { > + return settings; > + } > + > + /** > + * > + * @return > + */ > + public boolean doLogin() { > + boolean bResult = true; > + try { > + client.login(settings.getUsername(), settings.getPassword()); > + } catch (XmlRpcException e) { > + bResult = false; > + } > + return bResult; > + } > +} > > Added: sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiDialog.java > =================================================================== > --- sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiDialog.java (rev 0) > +++ sandbox/gsoc/xoo/src/main/java/org/xwiki/xoo/XWikiDialog.java 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,158 @@ > +/* > + * 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 org.xwiki.xoo; > + > +import com.sun.star.awt.XControl; > +import com.sun.star.awt.XControlContainer; > +import com.sun.star.awt.XControlModel; > +import com.sun.star.awt.XDialog; > +import com.sun.star.awt.XDialogEventHandler; > +import com.sun.star.awt.XDialogProvider2; > +import com.sun.star.beans.XPropertySet; > +import com.sun.star.lang.XMultiComponentFactory; > +import com.sun.star.uno.UnoRuntime; > +import com.sun.star.uno.XComponentContext; > +import com.sun.star.awt.XTopWindow; > +import com.sun.star.awt.XTopWindowListener; > +import com.sun.star.awt.XWindow; > +import com.sun.star.container.XNameContainer; > +import com.sun.star.lang.EventObject; > +import com.sun.star.lang.XMultiServiceFactory; > + > +public class XWikiDialog implements XDialogEventHandler, XTopWindowListener { > + > + XComponentContext m_xContext; > + XControlContainer m_xControlContainer; > + XDialog m_xDialog; > + String[] m_aMethods; > + boolean m_bAction = false; > + > + protected Thread m_aThread; > + protected boolean m_bThreadFinished = false; > + > + /** Creates a new instance of XWikiDialog */ > + public XWikiDialog(XComponentContext c, String DialogURL) { > + this.m_xContext = c; > + XMultiComponentFactory xMCF = m_xContext.getServiceManager(); > + try { > + Object obj; > + obj = xMCF.createInstanceWithContext( > + "com.sun.star.awt.DialogProvider2", m_xContext); > + XDialogProvider2 xDialogProvider = (XDialogProvider2) UnoRuntime > + .queryInterface(XDialogProvider2.class, obj); > + > + m_xDialog = xDialogProvider > + .createDialogWithHandler(DialogURL, this); > + m_xControlContainer = (XControlContainer) UnoRuntime > + .queryInterface(XControlContainer.class, m_xDialog); > + XTopWindow xTopWindow = (XTopWindow) UnoRuntime.queryInterface( > + XTopWindow.class, m_xDialog); > + if (xTopWindow != null) > + xTopWindow.addTopWindowListener(this); > + } catch (com.sun.star.uno.Exception ex) { > + ex.printStackTrace(); > + } > + } > + > + /** > + * Shows the Dialog. > + */ > + public void show() { > + if (m_xDialog != null) > + m_xDialog.execute(); > + } > + > + /** > + * > + * @param sControl The control for > + * @return > + */ > + protected XPropertySet GetPropSet(String sControl) { > + return GetPropSet(m_xControlContainer, sControl); > + } > + > + protected static XPropertySet GetPropSet( > + XControlContainer xControlContainer, String sControl) { > + XPropertySet xPS = null; > + > + if (xControlContainer != null && sControl != null) { > + XControl xControl = xControlContainer.getControl(sControl); > + xPS = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, > + xControl.getModel()); > + } > + > + if (xPS == null) > + throw new com.sun.star.uno.RuntimeException(); > + > + return xPS; > + } > + > + public void DisposeDialog() { > + } > + > + public void SetFocusTo(String aControl) { > + if (m_xControlContainer != null) { > + try { > + XWindow xWindow = (XWindow) UnoRuntime > + .queryInterface(XWindow.class, m_xControlContainer > + .getControl(aControl)); > + if (xWindow != null) > + xWindow.setFocus(); > + } catch (Exception e) { > + e.printStackTrace(); > + } > + } > + } > + > + public boolean callHandlerMethod(XDialog arg0, Object arg1, String arg2) { > + return true; > + } > + > + public String[] getSupportedMethodNames() { > + // TODO Auto-generated method stub > + return null; > + } > + > + public void windowActivated(EventObject arg0) { > + } > + > + public void windowClosed(EventObject arg0) { > + } > + > + public void windowClosing(EventObject arg0) { > + } > + > + public void windowDeactivated(EventObject arg0) { > + } > + > + public void windowMinimized(EventObject arg0) { > + } > + > + public void windowNormalized(EventObject arg0) { > + } > + > + public void windowOpened(EventObject arg0) { > + } > + > + public void disposing(EventObject arg0) { > + } > + > +} > > Modified: sandbox/gsoc/xoo/src/main/oxt/META-INF/manifest.xml > =================================================================== > --- sandbox/gsoc/xoo/src/main/oxt/META-INF/manifest.xml 2009-05-31 04:19:18 UTC (rev 20662) > +++ sandbox/gsoc/xoo/src/main/oxt/META-INF/manifest.xml 2009-05-31 07:54:20 UTC (rev 20663) > @@ -4,6 +4,8 @@ > manifest:full-path="xoo-1.0.jar"/> > <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" > manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/> > + <manifest:file-entry manifest:full-path="dialogLibrary/" > + manifest:media-type="application/vnd.sun.star.basic-library"/> > <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" > manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/> > </manifest:manifest> > > Added: sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Login.xdl > =================================================================== > --- sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Login.xdl (rev 0) > +++ sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Login.xdl 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,27 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> > +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Login" dlg:left="101" dlg:top="52" dlg:width="143" dlg:height="108" dlg:closeable="true" dlg:moveable="true" dlg:title="Connection Settings"> > + <dlg:bulletinboard> > + <dlg:button dlg:id="btnOK" dlg:tab-index="0" dlg:left="26" dlg:top="86" dlg:width="37" dlg:height="16" dlg:value="OK"> > + <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:btnOK_Clicked" script:language="UNO"/> > + </dlg:button> > + <dlg:button dlg:id="btnCancel" dlg:tab-index="2" dlg:left="102" dlg:top="86" dlg:width="37" dlg:height="16" dlg:value="Cancel"> > + <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.UNO:btnCancel_Clicked" script:language="UNO"/> > + </dlg:button> > + <dlg:text dlg:id="lblURL" dlg:tab-index="3" dlg:left="5" dlg:top="25" dlg:width="34" dlg:height="10" dlg:value="Server URL"/> > + <dlg:text dlg:id="lblUser" dlg:tab-index="4" dlg:left="5" dlg:top="43" dlg:width="34" dlg:height="10" dlg:value="Username"/> > + <dlg:text dlg:id="lblPass" dlg:tab-index="8" dlg:left="5" dlg:top="61" dlg:width="34" dlg:height="10" dlg:value="Password"/> > + <dlg:titledbox dlg:id="FrameControl2" dlg:tab-index="9" dlg:left="-1" dlg:top="29" dlg:width="1" dlg:height="6"> > + <dlg:title dlg:value="FrameControl2"/> > + </dlg:titledbox> > + <dlg:titledbox dlg:id="frmSettings" dlg:tab-index="10" dlg:left="3" dlg:top="5" dlg:width="137" dlg:height="75"> > + <dlg:title dlg:value="Server settings"/> > + </dlg:titledbox> > + <dlg:textfield dlg:id="txtServerURL" dlg:tab-index="5" dlg:left="54" dlg:top="25" dlg:width="82" dlg:height="10" dlg:value="http://localhost:8080"/> > + <dlg:textfield dlg:id="txtUsername" dlg:tab-index="6" dlg:left="54" dlg:top="43" dlg:width="82" dlg:height="10"/> > + <dlg:button dlg:id="btnApply" dlg:tab-index="1" dlg:left="64" dlg:top="86" dlg:width="37" dlg:height="16" dlg:value="Apply"> > + <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:btnCancel_Clicked" script:language="UNO"/> > + </dlg:button> > + <dlg:textfield dlg:id="txtPassword" dlg:tab-index="7" dlg:left="54" dlg:top="61" dlg:width="82" dlg:height="10" dlg:echochar="*"/> > + </dlg:bulletinboard> > +</dlg:window> > \ No newline at end of file > > Added: sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Module1.xba > =================================================================== > --- sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Module1.xba (rev 0) > +++ sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/Module1.xba 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,14 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> > +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">REM ***** BASIC ***** > + > +Sub Main > + > + > + > + oDialog = createUnoDialog(DialogLibraries.dialogLibrary.Login) > + oDialog.execute > + > + > +End Sub > +</script:module> > \ No newline at end of file > > Added: sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/dialog.xlb > =================================================================== > --- sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/dialog.xlb (rev 0) > +++ sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/dialog.xlb 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,5 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> > +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dialogLibrary" library:readonly="false" library:passwordprotected="false"> > + <library:element library:name="Login"/> > +</library:library> > \ No newline at end of file > > Added: sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/script.xlb > =================================================================== > --- sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/script.xlb (rev 0) > +++ sandbox/gsoc/xoo/src/main/oxt/dialogLibrary/script.xlb 2009-05-31 07:54:20 UTC (rev 20663) > @@ -0,0 +1,5 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> > +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dialogLibrary" library:readonly="false" library:passwordprotected="false"> > + <library:element library:name="Module1"/> > +</library:library> > \ No newline at end of file > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications > >

16 years, 3 months

2
2
0 0

[xwiki-devs] [VOTE] Postpone 1.9 RC2 release to Thursday

by Vincent Massol

Hi devs, Seen that we still have quite a few issues planned for 1.9 RC2 and seen that Monday is bank holiday in France (and some of xwiki devs are off on Tuesday) I'm proposing that we postpone the release from Monday to Thursday 4th of June. In addition I'm proposing that we name it 1.9 final rather than RC2 and do another release (I think we already agreed this before but let's make sure). The idea would be to start stabilizing it from Tuesday onwards: - ensure we have no regresssion (check email threads on the list - There's one from Pascal to answer that I know of) - do some strong testing. +1 from me Thanks -Vincent

16 years, 3 months

5
4
0 0

[xwiki-devs] Permissions on actions

by glenn_engel＠agilent.com

Hi, I'm wondering how xwiki applies permissions to various actions. For example, in looking at the ViewAction and DeleteAction classes I don't see anything that would be applying permissions but clearly some part of the system knows that a /view/ action is different than a /delete/ which is different from a /viewrev/. I created my own action and it 'appears' to be applying the edit permissions. How is this done? What if it was a view type of action? Thanks, Glenn

16 years, 3 months

3
3
0 0

[xwiki-devs] XWiki 1.9-RC1: XWiki2.0 syntax by default breaks the creation of XWikiClass

by Pascal Voitot

The XWikiClassTemplate velocity script is in a XWiki/1.0 syntax doc: ## replace Main with the Space where you want your documents to be created ## replace the default parent with the one of your choice ## Save this template using the 'Save' button #set( $class = $doc.name.substring(0,$doc.name.indexOf("Class"))) #set($defaultparent = "kmbase.${class}Class") #set($defaultweb = "kmbase") #includeForm("XWiki.ClassSheet") but now when you create a class, it is XWiki/2.0 and should be: {{velocity}} {{html wiki=true}} ## replace Main with the Space where you want your documents to be created ## replace the default parent with the one of your choice ## Save this template using the 'Save' button #set( $class = $doc.name.substring(0,$doc.name.indexOf("Class"))) #set($defaultparent = "kmbase.${class}Class") #set($defaultweb = "kmbase") #includeForm("XWiki.ClassSheet") {{/html}} {{/velocity}} What's the best solution to your mind in order to have something working in all the cases? Pascal

16 years, 3 months

3
15
0 0

[xwiki-devs] [Proposal] Modifications to Observation module

by Vincent Massol

Hi, There's a pb with the current implementation: When we get the Observation manager implementation and list the registered listeners we only get the components that have been initialized *before* we get the Observation manager component. Thus if we want to be sure all listeners will receive events we need to ensure they're loaded first. This is hard to do. I'm proposing instead to modify the observation module: * Modify EventListener to be a @ComponentRole * Add List<Event> EventListener.getEvents() (the events that the listener handles) * Inject List<EventListener> in DefaultObservationManager. Thus when the Observation Manager is looked up, all listener components are created and injected. * Keep add/removeListener in ObservationManager so that listeners can be manually added/removed (for ex if a new listener component is added dynamically in the system) but with following signatures: - addListener(EventListener); - removeListener(EventListener); WDYT? Thanks -Vincent

16 years, 3 months

5
12
0 0

[xwiki-devs] xwiki 1.9-rc1 issues

by Pascal Voitot

Hello, I have recompiled a XWiki 1.9-RC1 for jetty+derby and I have some little problems and I prefer asking before thinking: - I don't see the icons in the administration page and the last item "OpenOffice Importer" seems badly HTML formed and displays " http://www.mandubian.org/xwiki/bin/download/XWiki/OfficeImporterAdmin/icon.…) no-repeat;">OpenOffice Server" Please see the attached screenshot - I can't view Blog.WebHome because there is some bad SQL for Derby apparently Caused by: com.xpn.xwiki.XWikiException: Error number 3223 in 3: Exception while searching documents with SQL [select distinct doc.space, doc.name, publishDate.value from XWikiDocument as doc , DBStringListProperty as categories join categories.list as category, BaseObject obj, IntegerProperty isPublished, IntegerProperty hidden, DateProperty publishDate where (doc.hidden <> true or doc.hidden is null) and doc.fullName <> 'Blog.BlogPostTemplate' and obj.name = doc.fullName and obj.className = 'Blog.BlogPostClass' and publishDate.id.id = obj.id and publishDate.id.name = 'publishDate' and isPublished.id.id = obj.id and isPublished.id.name = 'published' and hidden.id.id = obj.id and hidden.id.name = 'hidden' and (doc.creator = 'XWiki.Admin' or (isPublished.value = 1 and hidden.value = 0)) and obj.id = categories.id.id and categories.id.name='category' and category in ('Blog.News') order by publishDate.value desc] Wrapped Exception: could not execute query at com.xpn.xwiki.store.XWikiHibernateStore.searchDocumentsNamesInternal(XWikiHibernateStore.java:2302) at com.xpn.xwiki.store.XWikiHibernateStore.searchDocumentsNames(XWikiHibernateStore.java:2266) at com.xpn.xwiki.store.XWikiHibernateStore.searchDocumentsNames(XWikiHibernateStore.java:2747) at com.xpn.xwiki.store.XWikiCacheStore.searchDocumentsNames(XWikiCacheStore.java:267) at com.xpn.xwiki.api.XWiki.searchDocuments(XWiki.java:406) at sun.reflect.GeneratedMethodAccessor325.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:585) 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) ... 154 more 2009-05-29 12:01:25,585 [http://localhost:8080/xwiki/bin/view/Blog/] [1857040122@qtp0-6] WARN util.JDBCExceptionReporter - SQL Error: 20000, SQLState: XJ061 2009-05-29 12:01:25,585 [http://localhost:8080/xwiki/bin/view/Blog/] [1857040122@qtp0-6] ERROR util.JDBCExceptionReporter - The 'absolute()' method is only allowed on scroll cursors. [ERROR] Exception in macro #getPagedBlogEntries at Blog.WebHome[line 141, column 5] [ERROR] Exception in macro #getBlogEntries at Blog.WebHome[line 17, column 3] [ERROR] Exception in macro #printBlog at Blog.WebHome[line 7, column 3] org.xwiki.velocity.XWikiVelocityException: Failed to evaluate content with id [Blog.WebHome] any idea? Pascal

16 years, 3 months

1
0
0 0

[xwiki-devs] [GSoC] Publishing a blog post at gsoc.myxwiki.post

by Tharindu Madushanka

Hi, Here is my experience when I tried to publish a post to blog in gsoc.myxwiki. And I want to clarify few things about it. I have created a blog post called RunningSeleniumTests to be published. After created it I have saved it and used small button to publish the post. But it did not publish or told me any reason why it did not publish. Questions 1. Is it only allowed to be published after acceptance by some person in admin group? After that, I thought I should try to change some rights of the objects and then changed the rights and only added edit rights to XWikiAdminGroup I think. and I just saved. After that only I realized I can't edit the post any more. Is it a bug? because I have created the post and changed rights, but then I can't edit it any more ? And also eventhough it is not published you can even view it by adding the link to your normal page. Eventhough its not published we can view it using the link. http://gsoc.myxwiki.org/xwiki/bin/view/XMPPIntegration/RunningSeleniumTests Finally what I did was added the link to my main page rather than waiting it to be published. :) 2. Could anyone please tell me some tips to resolve this ? Kind Regards, -Tharindu

16 years, 3 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r20576 - platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki

by Sergiu Dumitriu

asiri (SVN) wrote: > Author: asiri > Date: 2009-05-27 22:12:57 +0200 (Wed, 27 May 2009) > New Revision: 20576 > > Added: > platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporterSuggest.xml > Modified: > platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporter.xml > Log: > XAOFFICE-14: Improve the Office Importer Application User Experience > > * Modularized the suggest mechanism by introducing XWiki.OfficeImporterSuggest page and the use of plain.vm template. > > Added: platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporterSuggest.xml > =================================================================== > --- platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporterSuggest.xml (rev 0) > +++ platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki/OfficeImporterSuggest.xml 2009-05-27 20:12:57 UTC (rev 20576) > @@ -0,0 +1,44 @@ > +#if("" == "$!{request.xpage}") > + #warning("This page contains the office importer auto-suggest script") > +#end > +#set($ok = $response.setContentType("text/xml")) > +#set($typeParam = "$!{request.type}") > +#set($numberParam = "$!{request.number}") > +#set($inputParam = "$!{request.input}") > +<results> > +#if("spaces" == $typeParam) > + #set($number = $util.parseInt($numberParam)) > + #if($number == 0)#set($number = 10)#end > + #set($matchingSpaces = $xwiki.searchSpacesNames("where lower(doc.space) like '%$inputParam.toLowerCase()%'", $number, 0, [])) You should sanitize the inputParam, otherwise it will cause problems with ' and %. > + #foreach($space in $matchingSpaces) > + <rs id="$velocityCount" info="">$space</rs> > + #end > +#end > +</results> > +</content> > +</xwikidoc> -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 3 months

3
2
0 0

[xwiki-devs] Macro requiring js/css

by glenn_engel＠agilent.com

Hi, I want to resurface this question in case it is something that could be addressed in the 2.0 release. I have a macro that requires some js support (jquery) and would thus like to have additional files referenced in the head section of the page when the macro is used. It was suggested that I could specify dependencies of css and js files for a macro by using getPluging("jsfx") and invoking the use method. >From what I can tell this method does not work so I'm wondering if the 'context' obtained as suggested is not the proper context to add additional elements to the rendered page. Here is what I've done: To get the context, I added this: @Requirement private Execution execution; And then in my macro execution method I added the following: ExecutionContext executionContext = execution.getContext(); XWikiContext context = (XWikiContext) executionContext.getProperty("xwikicontext"); XWiki xwiki = context.getWiki(); AbstractSkinExtensionPlugin plugin = (AbstractSkinExtensionPlugin) xwiki.getPlugin("jsfx", context); plugin.use("/foo/bar.js",context); When I utilize this from my macro execution callback it doesn't emit any code in the header. (using jsfx as a velocity macro does work though). Is the context obtained via this method the right one or is there a different one somehow attached to the rendering agent? Thanks, Glenn

16 years, 3 months

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