Re: [xwiki-devs] [xwiki-notifications] r18899 - in platform/core/branches/xwiki-core-1.8/xwiki-core/src/main: java/com/xpn/xwiki java/com/xpn/xwiki/doc java/com/xpn/xwiki/internal resources/META-INF resources/META-INF/plexus
tmortagne (SVN) wrote:
Author: tmortagne Date: 2009-04-21 14:46:05 +0200 (Tue, 21 Apr 2009) New Revision: 18899
XWIKI-3563: Allow setting the default rendering syntax wiki by wiki
Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/CoreConfiguration.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/CoreConfiguration.java 2009-04-21 12:30:36 UTC (rev 18898) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/CoreConfiguration.java 2009-04-21 12:46:05 UTC (rev 18899) @@ -19,16 +19,19 @@ */ package com.xpn.xwiki;
- * - * @version $Id$ + * + * @version $Id: CoreConfiguration.java 18237 2009-04-04 22:30:29Z vmassol $
This shows that the file doesn't have the proper svn:keywords.
Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2009-04-21 12:30:36 UTC (rev 18898) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2009-04-21 12:46:05 UTC (rev 18899) @@ -293,9 +293,9 @@ - private DocumentNameFactory documentNameFactory = - (DocumentNameFactory) Utils.getComponent(DocumentNameFactory.class.getName()); - + private DocumentNameFactory documentNameFactory = + (DocumentNameFactory) Utils.getComponent(DocumentNameFactory.ROLE); +
Are you sure this change is good?
Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultCoreConfiguration.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultCoreConfiguration.java 2009-04-21 12:30:36 UTC (rev 18898) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultCoreConfiguration.java 2009-04-21 12:46:05 UTC (rev 18899) @@ -19,12 +19,17 @@ +@Component
Are you sure the 1.8 branch supports this kind of components? -- Sergiu Dumitriu http://purl.org/net/sergiu/
On Tue, Apr 21, 2009 at 19:33, Sergiu Dumitriu <[email protected]> wrote:
tmortagne (SVN) wrote:
Author: tmortagne Date: 2009-04-21 14:46:05 +0200 (Tue, 21 Apr 2009) New Revision: 18899
XWIKI-3563: Allow setting the default rendering syntax wiki by wiki
Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/CoreConfiguration.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/CoreConfiguration.java 2009-04-21 12:30:36 UTC (rev 18898) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/CoreConfiguration.java 2009-04-21 12:46:05 UTC (rev 18899) @@ -19,16 +19,19 @@ */ package com.xpn.xwiki;
- * - * @version $Id$ + * + * @version $Id: CoreConfiguration.java 18237 2009-04-04 22:30:29Z vmassol $
This shows that the file doesn't have the proper svn:keywords.
This is weird i configured subversive to apply it automatically and it used to work. At least it worked perfectly yesterday for new files like UnescapeHTMLFilter I created yesterday.
Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2009-04-21 12:30:36 UTC (rev 18898) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2009-04-21 12:46:05 UTC (rev 18899) @@ -293,9 +293,9 @@ - private DocumentNameFactory documentNameFactory = - (DocumentNameFactory) Utils.getComponent(DocumentNameFactory.class.getName()); - + private DocumentNameFactory documentNameFactory = + (DocumentNameFactory) Utils.getComponent(DocumentNameFactory.ROLE); +
Are you sure this change is good?
DocumentNameFactory.ROLE is exactly the same thing than DocumentNameFactory.class.getName() except that it's better to use ROLE since it's its job to give the component role identifier in 1.8 (since 1.9 the identifier is the Class itself with the new api).
Modified: platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultCoreConfiguration.java =================================================================== --- platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultCoreConfiguration.java 2009-04-21 12:30:36 UTC (rev 18898) +++ platform/core/branches/xwiki-core-1.8/xwiki-core/src/main/java/com/xpn/xwiki/internal/DefaultCoreConfiguration.java 2009-04-21 12:46:05 UTC (rev 18899) @@ -19,12 +19,17 @@ +@Component
Are you sure the 1.8 branch supports this kind of components?
The whole rendering is using this kind of components.
-- Sergiu Dumitriu http://purl.org/net/sergiu/
_______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
-- Thomas Mortagne
participants (2)
-
Sergiu Dumitriu -
Thomas Mortagne