Hi Thomas,
Configuration properties must have namespaces specified.
For ex it shouldn't be "cacheHint=jbosscache" but something like:
cache.defaultCacheHint=jbosscache
cache.localCacheHint=jbosscache/local
You have to do that anyway when using the configuration components
(unless you've used an empty string which isn't correct).
Thanks
-Vincent
On Oct 15, 2008, at 3:19 PM, tmortagne (SVN) wrote:
> Author: tmortagne
> Date: 2008-10-15 15:18:38 +0200 (Wed, 15 Oct 2008)
> New Revision: 13576
>
> Modified:
> platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/
> resources/xwiki.cfg.vm
> platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/
> resources/xwiki.properties.vm
> Log:
> XTCONFRES-24: Move cache components configuration from xwiki.cfg to
> xwiki.properties
>
> Modified: platform/xwiki-tools/trunk/xwiki-configuration-resources/
> src/main/resources/xwiki.cfg.vm
> ===================================================================
> --- platform/xwiki-tools/trunk/xwiki-configuration-resources/src/
> main/resources/xwiki.cfg.vm 2008-10-15 13:15:33 UTC (rev 13575)
> +++ platform/xwiki-tools/trunk/xwiki-configuration-resources/src/
> main/resources/xwiki.cfg.vm 2008-10-15 13:18:38 UTC (rev 13576)
> @@ -180,6 +180,7 @@
>
> #-------------------------------------------------------------------------------------
> # Cache
> +# [DEPRECATED since 1.7M1: this way to configure cache provider is
> deprecated, you should use xwiki.properties instead.]
> #-------------------------------------------------------------------------------------
>
> #-# [Since 1.5M2]
>
> Modified: platform/xwiki-tools/trunk/xwiki-configuration-resources/
> src/main/resources/xwiki.properties.vm
> ===================================================================
> --- platform/xwiki-tools/trunk/xwiki-configuration-resources/src/
> main/resources/xwiki.properties.vm 2008-10-15 13:15:33 UTC (rev 13575)
> +++ platform/xwiki-tools/trunk/xwiki-configuration-resources/src/
> main/resources/xwiki.properties.vm 2008-10-15 13:18:38 UTC (rev 13576)
> @@ -3,3 +3,15 @@
> # As time progresses more and more component will get their
> configurations from
> # this file.
>
> +
> #-------------------------------------------------------------------------------------
> +# Cache
> +
> #-------------------------------------------------------------------------------------
> +
> +#-# [Since 1.7M1]
> +#-# The cache component implementation to use as "normal" (can be
> local or distributed depending on the implementation)
> +#-# cache component.
> +# cacheHint=jbosscache
> +
> +#-# [Since 1.7M1]
> +#-# The cache component to use as local cache component.
> +# localCacheHint=jbosscache/local
> \ No newline at end of file
>
> _______________________________________________
> notifications mailing list
> notifications(a)xwiki.org
> http://lists.xwiki.org/mailman/listinfo/notifications
hmm the code doesn't look commented.
Asiri can you please fix this for all the new code you've asked to
commit in trunks? At the minimum in places where it's required and at
the maximum it should pass our checkstyle rules.
Note: You should also add @version and @since tags.
Thanks
-Vincent
On Oct 16, 2008, at 5:28 PM, sdumitriu (SVN) wrote:
> Author: sdumitriu
> Date: 2008-10-16 17:28:20 +0200 (Thu, 16 Oct 2008)
> New Revision: 13636
>
> Removed:
> platform/xwiki-plugins/trunk/webdav/src/main/resources/
> platform/xwiki-plugins/trunk/webdav/src/test/resources/
> Modified:
> platform/xwiki-plugins/trunk/webdav/pom.xml
> platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/xwiki/
> plugin/webdav/XWikiDavApi.java
> platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/xwiki/
> plugin/webdav/XWikiDavPlugin.java
> Log:
> [cleanup] Apply codestyle, add license headers, fix dependencies
>
>
> Modified: platform/xwiki-plugins/trunk/webdav/pom.xml
> ===================================================================
> --- platform/xwiki-plugins/trunk/webdav/pom.xml 2008-10-16 15:18:16
> UTC (rev 13635)
> +++ platform/xwiki-plugins/trunk/webdav/pom.xml 2008-10-16 15:28:20
> UTC (rev 13636)
> @@ -1,20 +1,48 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +
> +<!--
> + *
> + * 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.
> + *
> +-->
> +
> <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.0http://maven.apache.org/maven-v4_0_0.xsd
> ">
> - <modelVersion>4.0.0</modelVersion>
> - <groupId>com.xpn.xwiki.platform.plugins</groupId>
> - <artifactId>xwiki-plugin-webdav</artifactId>
> - <name>xwiki-webdav-plugin</name>
> - <version>0.0.1-SNAPSHOT</version>
> - <dependencies>
> - <dependency>
> - <groupId>com.xpn.xwiki.platform</groupId>
> - <artifactId>xwiki-core</artifactId>
> - <version>1.6-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>com.xpn.xwiki.platform</groupId>
> - <artifactId>xwiki-webdav</artifactId>
> - <version>0.0.1-SNAPSHOT</version>
> - </dependency>
> - </dependencies>
> -</project>
> \ No newline at end of file
> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0http://maven.apache.org/maven-v4_0_0.xsd
> ">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>com.xpn.xwiki.platform.plugins</groupId>
> + <artifactId>xwiki-plugins</artifactId>
> + <version>11-SNAPSHOT</version>
> + </parent>
> + <artifactId>xwiki-plugin-webdav</artifactId>
> + <name>XWiki Platform - Plugins - WebDAV plugin</name>
> + <version>0.0.1-SNAPSHOT</version>
> + <dependencies>
> + <dependency>
> + <groupId>com.xpn.xwiki.platform</groupId>
> + <artifactId>xwiki-core</artifactId>
> + <version>1.7-SNAPSHOT</version>
> + </dependency>
> + <dependency>
> + <groupId>com.xpn.xwiki.platform</groupId>
> + <artifactId>xwiki-webdav</artifactId>
> + <version>0.0.1-SNAPSHOT</version>
> + </dependency>
> + </dependencies>
> +</project>
>
> Modified: platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/
> xwiki/plugin/webdav/XWikiDavApi.java
> ===================================================================
> --- platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/xwiki/
> plugin/webdav/XWikiDavApi.java 2008-10-16 15:18:16 UTC (rev 13635)
> +++ platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/xwiki/
> plugin/webdav/XWikiDavApi.java 2008-10-16 15:28:20 UTC (rev 13636)
> @@ -1,3 +1,23 @@
> +/*
> + * See the NOTICE file distributed with this work for additional
> + * information regarding copyright ownership.
> + *
> + * This is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU Lesser General Public License as
> + * published by the Free Software Foundation; either version 2.1 of
> + * the License, or (at your option) any later version.
> + *
> + * This software is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this software; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
> + */
> +
> package com.xpn.xwiki.plugin.webdav;
>
> import com.xpn.xwiki.XWikiContext;
> @@ -6,16 +26,18 @@
> import com.xpn.xwiki.api.Document;
> import com.xpn.xwiki.plugin.webdav.utils.XWikiDavUtils;
>
> -public class XWikiDavApi extends Api {
> -
> - private XWikiDavPlugin plugin;
> -
> - public XWikiDavApi(XWikiDavPlugin plugin, XWikiContext context) {
> - super(context);
> - this.plugin = plugin;
> - }
> -
> - public String getDavURL(Document doc, Attachment attachment) {
> - return XWikiDavUtils.getDavURL(doc, attachment);
> - }
> +public class XWikiDavApi extends Api
> +{
> + private XWikiDavPlugin plugin;
> +
> + public XWikiDavApi(XWikiDavPlugin plugin, XWikiContext context)
> + {
> + super(context);
> + this.plugin = plugin;
> + }
> +
> + public String getDavURL(Document doc, Attachment attachment)
> + {
> + return XWikiDavUtils.getDavURL(doc, attachment);
> + }
> }
>
> Modified: platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/
> xwiki/plugin/webdav/XWikiDavPlugin.java
> ===================================================================
> --- platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/xwiki/
> plugin/webdav/XWikiDavPlugin.java 2008-10-16 15:18:16 UTC (rev 13635)
> +++ platform/xwiki-plugins/trunk/webdav/src/main/java/com/xpn/xwiki/
> plugin/webdav/XWikiDavPlugin.java 2008-10-16 15:28:20 UTC (rev 13636)
> @@ -1,3 +1,23 @@
> +/*
> + * See the NOTICE file distributed with this work for additional
> + * information regarding copyright ownership.
> + *
> + * This is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU Lesser General Public License as
> + * published by the Free Software Foundation; either version 2.1 of
> + * the License, or (at your option) any later version.
> + *
> + * This software is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this software; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> + * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
> + */
> +
> package com.xpn.xwiki.plugin.webdav;
>
> import com.xpn.xwiki.XWikiContext;
> @@ -5,19 +25,21 @@
> import com.xpn.xwiki.plugin.XWikiDefaultPlugin;
> import com.xpn.xwiki.plugin.XWikiPluginInterface;
>
> -public class XWikiDavPlugin extends XWikiDefaultPlugin {
> +public class XWikiDavPlugin extends XWikiDefaultPlugin
> +{
> + public XWikiDavPlugin(String name, String className,
> XWikiContext context)
> + {
> + super(name, className, context);
> + init(context);
> + }
>
> - public XWikiDavPlugin(String name, String className, XWikiContext
> context) {
> - super(name, className, context);
> - init(context);
> - }
> + public String getName()
> + {
> + return "webdav";
> + }
>
> - public String getName() {
> - return "webdav";
> - }
> -
> - public Api getPluginApi(XWikiPluginInterface plugin, XWikiContext
> context) {
> - return new XWikiDavApi((XWikiDavPlugin) plugin, context);
> - }
> -
> + public Api getPluginApi(XWikiPluginInterface plugin,
> XWikiContext context)
> + {
> + return new XWikiDavApi((XWikiDavPlugin) plugin, context);
> + }
> }
>
> _______________________________________________
> notifications mailing list
> notifications(a)xwiki.org
> http://lists.xwiki.org/mailman/listinfo/notifications
hello,
I would like to be able to import an external Javascript using its URL in
the head of the HTML page using the same model as JSX extension...
something like:
$xwiki.jsx.use("url:http://my_url_to_my_external_js")
but JSX always translates the URL into a JSX action...
It would really be practical for importing external JS APIs...
What do you think about this possible extension to Skin extension?
Is there already another way of doing this?
regards
Pascal
Hi Thomas,
Hmmm.... I think this would be best done as it's done in the
DefaultRenderingConfiguration class, i.e. with a configuration
component which is in charge of returning the values and in charge of
setting the default values.
WDYT?
Thanks
-Vincent
On Oct 15, 2008, at 3:10 PM, tmortagne (SVN) wrote:
> Author: tmortagne
> Date: 2008-10-15 15:09:38 +0200 (Wed, 15 Oct 2008)
> New Revision: 13574
>
> Modified:
> platform/core/trunk/xwiki-cache/xwiki-cache-api/src/main/java/org/
> xwiki/cache/internal/DefaultCacheManager.java
> Log:
> XWIKI-2741: Add a CacheManager component based on configuration
> component to get default cache and local cache hint
> * add default hints to use when configuration is not found in
> xwiki.properties
>
> Modified: platform/core/trunk/xwiki-cache/xwiki-cache-api/src/main/
> java/org/xwiki/cache/internal/DefaultCacheManager.java
> ===================================================================
> --- platform/core/trunk/xwiki-cache/xwiki-cache-api/src/main/java/
> org/xwiki/cache/internal/DefaultCacheManager.java 2008-10-15
> 13:06:40 UTC (rev 13573)
> +++ platform/core/trunk/xwiki-cache/xwiki-cache-api/src/main/java/
> org/xwiki/cache/internal/DefaultCacheManager.java 2008-10-15
> 13:09:38 UTC (rev 13574)
> @@ -43,6 +43,16 @@
> public class DefaultCacheManager implements CacheManager,
> Initializable, Composable
> {
> /**
> + * The default cache implementation.
> + */
> + private static final String DEFAULT_CACHE_HINT = "jbosscache";
> +
> + /**
> + * The default local cache implementation.
> + */
> + private static final String DEFAULT_LOCALCACHE_HINT =
> "jbosscache/local";
> +
> + /**
> * The component manager to use to find cache components.
> */
> private ComponentManager componentManager;
> @@ -60,12 +70,12 @@
> /**
> * The role hint of configured default cache component.
> */
> - private String cacheHint;
> + private String cacheHint = DEFAULT_CACHE_HINT;
>
> /**
> * The role hint of configured default local cache component.
> */
> - private String localCacheHint;
> + private String localCacheHint = DEFAULT_LOCALCACHE_HINT;
>
> /**
> * {@inheritDoc}
jvdrean (SVN) wrote:
> Author: jvdrean
> Date: 2008-10-10 11:53:57 +0200 (Fri, 10 Oct 2008)
> New Revision: 13481
> Log:
> XE-319 : Write an integration tests framework for the new wysiwyg editor
>
> Initial version, the XHTML assertions must be reviewed since some behaviors looks weird.
Should we test the internal HTML? Or the generated wiki syntax? Marius,
do all the browsers have the same markup? AFAIK, no, so this is a point
against testing HTML. Testing the wiki syntax implies testing not just
the editor, but also the html parser.
--
Sergiu Dumitriu
http://purl.org/net/sergiu/
Actually we should have it as a build best practice to always specify
an id inside an <execution> element since this has already caused
other problems in the past.
Thanks
-Vincent
On Oct 13, 2008, at 5:23 AM, sdumitriu (SVN) wrote:
> Author: sdumitriu
> Date: 2008-10-13 05:23:01 +0200 (Mon, 13 Oct 2008)
> New Revision: 13521
>
> Modified:
> platform/core/branches/xwiki-core-1.6/xwiki-core/pom.xml
> Log:
> XWIKI-2757: Empty .jar produced after build
> Fixed.
> Merged from trunk@13520
>
>
> Modified: platform/core/branches/xwiki-core-1.6/xwiki-core/pom.xml
> ===================================================================
> --- platform/core/branches/xwiki-core-1.6/xwiki-core/pom.xml
> 2008-10-13 03:21:34 UTC (rev 13520)
> +++ platform/core/branches/xwiki-core-1.6/xwiki-core/pom.xml
> 2008-10-13 03:23:01 UTC (rev 13521)
> @@ -626,6 +626,9 @@
> <artifactId>maven-jar-plugin</artifactId>
> <executions>
> <execution>
> + <!-- We must have an ID here, as otherwise the
> configuration is used for generating the normal jar, too.
> + See XWIKI-2757 -->
> + <id>build-test-jar</id>
> <goals>
> <goal>test-jar</goal>
> </goals>
Hi Sergiu,
On Oct 11, 2008, at 3:15 AM, sdumitriu (SVN) wrote:
> Author: sdumitriu
> Date: 2008-10-11 03:15:50 +0200 (Sat, 11 Oct 2008)
> New Revision: 13504
>
> Modified:
> platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/
> XWikiDocument.java
> Log:
> XWIKI-2587: Saving a blank wiki page throws exception in Oracle
> Fixed.
>
>
> 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 2008-10-10 23:36:43 UTC (rev 13503)
> +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/
> XWikiDocument.java 2008-10-11 01:15:50 UTC (rev 13504)
> @@ -420,6 +420,9 @@
>
> public void setContent(String content)
> {
> + if (content == null) {
> + content = "";
> + }
I think this requires some comment explanations (explaining that with
an Oracel DB the content can be null whereas in other DBs it's never
null) since normally content cannot be null (we don't check for null
as a general practice).
Thanks
-Vincent
>
> if (!content.equals(this.content)) {
> setContentDirty(true);
> setWikiNode(null);