October 2009 - xwiki-devs@xwiki.org

[xwiki-devs] [Proposal] Introduce isOpenOfficeServerAvailable() method to WysiwygService
by Asiri Rathnayake 01 Oct '09

01 Oct '09

Hi, I'm not exactly sure if that is the best method name, but we need such a method so that we can disable fileUpload tab (or display a message) in officeimporter wysiwyg plugin if there is no OpenOffice server running. Thanks. - Asiri

3 7

Re: [xwiki-devs] [xwiki-notifications] r24164 - platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/openoffice
by Vincent Massol 01 Oct '09

01 Oct '09

On Oct 1, 2009, at 1:02 PM, asiri (SVN) wrote: > Author: asiri > Date: 2009-10-01 13:02:17 +0200 (Thu, 01 Oct 2009) > New Revision: 24164 > > Modified: > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/ > officeimporter/internal/openoffice/DefaultOpenOfficeManager.java > Log: > XWIKI-4121: Restrict openoffice server manipulations to main xwiki. > > * Implemented. > > * Improved code. > > Modified: platform/core/trunk/xwiki-officeimporter/src/main/java/org/ > xwiki/officeimporter/internal/openoffice/DefaultOpenOfficeManager.java > =================================================================== > --- platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/ > officeimporter/internal/openoffice/DefaultOpenOfficeManager.java > 2009-10-01 09:41:25 UTC (rev 24163) > +++ platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/ > officeimporter/internal/openoffice/DefaultOpenOfficeManager.java > 2009-10-01 11:02:17 UTC (rev 24164) > @@ -29,6 +29,7 @@ > import net.sf.jodconverter.office.OfficeException; > import net.sf.jodconverter.office.OfficeManager; > > +import org.xwiki.bridge.DocumentAccessBridge; > import org.xwiki.component.annotation.Component; > import org.xwiki.component.annotation.Requirement; > import org.xwiki.component.logging.AbstractLogEnabled; > @@ -52,10 +53,16 @@ > private OpenOfficeConfiguration ooConfig; > > /** > + * Used to query the context document's wiki. > + */ > + @Requirement > + private DocumentAccessBridge docBridge; > + > + /** > * The {@link OfficeManager} used to control / connect > openoffice server. > */ > private OfficeManager officeManager; > - > + > /** > * Current oo server process state. > */ > @@ -64,40 +71,42 @@ > /** > * Flag indicating whether the officeManager is initialized or > not. > */ > - private boolean officeManagerInitialized; > + private boolean initialized; > > /** > * The {@link OfficeDocumentConverter} used to convert office > documents. > - */ > + */ > private OfficeDocumentConverter documentConverter; > > /** > * Initializes the internal {@link OfficeManager}. > */ > - private void initializeOfficeManager() throws > OpenOfficeManagerException > + private void initialize() throws OpenOfficeManagerException > { > - OfficeConnectionMode connectionMode = > OfficeConnectionMode.socket(ooConfig.getServerPort()); > - if (ooConfig.getServerType() == > OpenOfficeConfiguration.SERVER_TYPE_INTERNAL) { > - File officeHome = new File(ooConfig.getHomePath()); > - File officeProfile = new File(ooConfig.getProfilePath()); > - ManagedProcessOfficeManagerConfiguration configuration = > - new > ManagedProcessOfficeManagerConfiguration(connectionMode); > - configuration.setOfficeHome(officeHome); > - configuration.setTemplateProfileDir(officeProfile); > - > configuration.setMaxTasksPerProcess(ooConfig.getMaxTasksPerProcess()); > - > configuration > .setTaskExecutionTimeout(ooConfig.getTaskExecutionTimeout()); > - this.officeManager = new > ManagedProcessOfficeManager(configuration); > - } else if (ooConfig.getServerType() == > OpenOfficeConfiguration.SERVER_TYPE_EXTERNAL_LOCAL) { > - ExternalProcessOfficeManager > externalProcessOfficeManager = > - new ExternalProcessOfficeManager(connectionMode); > - externalProcessOfficeManager.setConnectOnStart(true); > - this.officeManager = externalProcessOfficeManager; > - } else { > - this.currentState = ManagerState.CONF_ERROR; > - throw new OpenOfficeManagerException("Invalid > configuration."); > + if (!initialized) { > + OfficeConnectionMode connectionMode = > OfficeConnectionMode.socket(ooConfig.getServerPort()); > + if (ooConfig.getServerType() == > OpenOfficeConfiguration.SERVER_TYPE_INTERNAL) { > + File officeHome = new File(ooConfig.getHomePath()); > + File officeProfile = new > File(ooConfig.getProfilePath()); > + ManagedProcessOfficeManagerConfiguration > configuration = > + new > ManagedProcessOfficeManagerConfiguration(connectionMode); > + configuration.setOfficeHome(officeHome); > + configuration.setTemplateProfileDir(officeProfile); > + > configuration.setMaxTasksPerProcess(ooConfig.getMaxTasksPerProcess()); > + > configuration > .setTaskExecutionTimeout(ooConfig.getTaskExecutionTimeout()); > + this.officeManager = new > ManagedProcessOfficeManager(configuration); > + } else if (ooConfig.getServerType() == > OpenOfficeConfiguration.SERVER_TYPE_EXTERNAL_LOCAL) { > + ExternalProcessOfficeManager > externalProcessOfficeManager = > + new ExternalProcessOfficeManager(connectionMode); > + externalProcessOfficeManager.setConnectOnStart(true); > + this.officeManager = externalProcessOfficeManager; > + } else { > + this.currentState = ManagerState.CONF_ERROR; > + throw new OpenOfficeManagerException("Invalid > configuration."); > + } > + this.documentConverter = new > OfficeDocumentConverter(officeManager); > + this.initialized = true; > } > - this.documentConverter = new > OfficeDocumentConverter(officeManager); > - this.officeManagerInitialized = true; > } > > /** > @@ -121,10 +130,10 @@ > */ > public void start() throws OpenOfficeManagerException > { > - if (ManagerState.CONNECTED != currentState) { > - if (!officeManagerInitialized) { > - initializeOfficeManager(); > - } > + if (isConnected()) { > + return; > + } else if (isMainXWiki()) { > + initialize(); > try { > officeManager.start(); > currentState = ManagerState.CONNECTED; > @@ -133,6 +142,8 @@ > currentState = ManagerState.ERROR; > throw new OpenOfficeManagerException("Error while > connecting / starting openoffice.", ex); > } > + } else { > + throw new OpenOfficeManagerException("OpenOffice server > administration is forbidden for sub-wikis."); > } > } > > @@ -141,7 +152,9 @@ > */ > public void stop() throws OpenOfficeManagerException > { > - if (ManagerState.CONNECTED == currentState) { > + if (!isConnected()) { > + return; > + } else if (isMainXWiki()) { > try { > officeManager.stop(); > currentState = ManagerState.NOT_CONNECTED; > @@ -150,8 +163,31 @@ > currentState = ManagerState.ERROR; > throw new OpenOfficeManagerException("Error while > disconnecting / shutting down openoffice.", ex); > } finally { > - this.officeManagerInitialized = false; > + this.initialized = false; > } > + } else { > + throw new OpenOfficeManagerException("OpenOffice server > administration is forbidden for sub-wikis."); > } > } > + > + /** > + * Utility method for checking if current context document is > from main xwiki. > + * > + * @return true if the current context document is from main > xwiki. > + */ > + private boolean isMainXWiki() > + { > + String currentWiki = > docBridge.getCurrentDocumentName().getWiki(); > + return (currentWiki != null) && currentWiki.equals("xwiki"); This is bad.... We shouldn't hardcode the main wiki name. What if we change it later on? We'll need to check every places. It needs to be centralized and there's already a method for this in the XWiki class AFAIK. Thanks -Vincent > + } > + > + /** > + * Utility method for checking OpenOffice server instance state. > + * > + * @return true if the OpenOffice server is connected. > + */ > + private boolean isConnected() > + { > + return (currentState == ManagerState.CONNECTED); > + } > }

2 2

Re: [xwiki-devs] [xwiki-notifications] r24165 - platform/xwiki-applications/trunk/officeimporter/src/main/resources/XWiki
by Vincent Massol 01 Oct '09

01 Oct '09

On Oct 1, 2009, at 1:02 PM, asiri (SVN) wrote: > Author: asiri > Date: 2009-10-01 13:02:54 +0200 (Thu, 01 Oct 2009) > New Revision: 24165 > > Modified: > platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/XWiki/OfficeImporterAdmin.xml > Log: > XAOFFICE-23: Add UI support for restricting openoffice server > manipulations to main xwiki. > > * Implemented. > > Modified: platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/XWiki/OfficeImporterAdmin.xml > =================================================================== > --- platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/XWiki/OfficeImporterAdmin.xml 2009-10-01 11:02:17 UTC (rev > 24164) > +++ platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/XWiki/OfficeImporterAdmin.xml 2009-10-01 11:02:54 UTC (rev > 24165) > @@ -88,7 +88,10 @@ > #set($serverType=$msgServerTypeExternalRemote) > #end > > -#if($hasAdmin) > +#set($isMainXWiki=($context.database == "xwiki")) > +#set($enableControls=($hasAdmin && $isMainXWiki)) Again something bad.... (same reason). Thanks -Vincent > + > +#if($enableControls) > <form action="$xwiki.requestURL" enctype="multipart/form-data" > method="post"> > #end > {table} > @@ -101,11 +104,11 @@ > <p>$msgServerProfile</p>|<p> > $ooconfig.profilePath</p> > #end > <p>$msgServerState</p>|<p> > $oomanager.serverState</p> > -#if($hasAdmin) > +#if($enableControls) > <p>$msgActions</p>|<p><input name="action" > type="radio" value="start" checked="checked"/> $actionStart<br/ > ><input name="action" type="radio" value="stop"/> > $actionStop<br/>#if($actionRestart)<input name="action" > type="radio" value="restart"/> $actionRestart<br/>#end</ > p> > #end > {table} > -#if($hasAdmin) > +#if($enableControls) > <p><input type="submit" value="$msgUpdate"/></p> > </form> > #end

2 1

[xwiki-devs] [VOTE] Put a new line at the beginning and the end of group content in xwiki/2.0 renderer
by Thomas Mortagne 01 Oct '09

01 Oct '09

Hi devs, I would like to modify the xwiki/2.0 renderer to print the group with a trailing and ending new line: 1.A ((( * list1 * list 2 ))) instead of 1.B (((* list1 * list 2))) for example but it also mean: 2.A | ((( * list ))) | second cell instead of 2.B | (((* list with one item))) Here are my arguments: * i tough of that idea at first because it's not very easy/clean to support well the escaping of an ending ) before a ending group in an events based renderer, the problem is that you need to bufferize at least 4 events (if not more) to know when you print the ) character that it will be followed by end group syntax when printed. For example it can be the last character of paragraph in the last cell or last row of a table before the end of the group * i prefer to "break" 2.A done on purpose than 1.A done on purpose since it's not possible to support both currently * even with 2.A it's more readable to have it in its own line IMO Here is my +1 -- Thomas Mortagne

6 8

Re: [xwiki-devs] Why Xwiki WYSIWYG Editor displays content is the same as Wiki Editor?
by Leon Wang 01 Oct '09

01 Oct '09

Hi Everyone, Hi Marius, Here is the screen shot link: http://picasaweb.google.com/lh/photo/XWqNdRICk3o-27h9bm0rYA?feat=directlink "Also, are there any JavaScript errors in the Firebug console or any exceptions in the server log?" The browser did not give my any error message. "Did you build the XWiki trunk or a branch? Is it up to date? " I built the trunk.I download the source code about two weeks ago and built it. "Have you changed anything inthe WYSIWYG sources?" I did not change anything. I was wondering is there any configuration of xwiki is missing. I moved the jar file to Xwiki Enterprise 1.93 that I install on Windows by using Installer and it works fine. And I moved the wysiwyg 1.93 jar file to the xwiki that I built is still look like that. So any ideas, guys? Thank you for your help!

2 1

[xwiki-devs] Why Xwiki WYSIWYG Editor displays content is the same as Wiki Editor?
by Leon Wang 01 Oct '09

01 Oct '09

Hi Everyone, I successfully build Xwiki from Source Code with your help. Thank you very much. Now I find when I use the WYSIWYG Editor edit content it only can display the content like what Wiki Editor did. Please see the screenshot below, It can not display the format of the content in a WYSIWYG way. I do not know what is wrong with it. I also tired it using different browsers, it is still the same. Could anyone give me a clue what might go wrong? Thank you in advance! Leon

2 1

[xwiki-devs] [Idea] Objects containing other objects as well as properties.
by Caleb James DeLisle 01 Oct '09

01 Oct '09

Hello, I was wondering if it would be worthwhile to try working on allowing objects to contain other objects as well as properties (like Java) It would require major changes to the schema but would allow for users to define containers which could hold any Java object in storage. What do you think? Caleb James DeLisle

1 0