Author: asiri Date: 2009-07-15 20:57:45 +0200 (Wed, 15 Jul 2009) New Revision: 21967 Added: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ internal/DefaultWikiMacroBuilder.java platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ internal/DefaultWikiMacroInitializer.java platform/core/trunk/xwiki-properties/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/internal/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/ internal/macro/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/ internal/macro/wikibridge/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/ internal/macro/wikibridge/DefaultWikiMacroManager.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/ internal/macro/wikibridge/WikiMacroEventListener.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroBuilder.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroBuilderException.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroDescriptor.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroInitializer.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroManager.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroParameterDescriptor.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/java/org/xwiki/rendering/macro/ wikibridge/WikiMacroParameters.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/resources/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/resources/META-INF/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/main/resources/META-INF/components.txt platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ RenderingTests.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/internal/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ internal/macro/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ internal/macro/wikibridge/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/ internal/macro/wikibridge/MockWikiMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/macro/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/macro/ wikibridge/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/java/org/xwiki/rendering/macro/ wikibridge/DefaultWikiMacroManagerTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/resources/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/resources/META-INF/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/resources/META-INF/components.txt platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-wikibridge/src/test/resources/wikimacro1.test platform/xwiki-applications/trunk/wiki-macro-bridge/ platform/xwiki-applications/trunk/wiki-macro-bridge/src/ platform/xwiki-applications/trunk/wiki-macro-bridge/src/main/ platform/xwiki-applications/trunk/wiki-macro-bridge/src/main/ resources/ platform/xwiki-applications/trunk/wiki-macro-bridge/src/main/ resources/XWiki/ platform/xwiki-applications/trunk/wiki-macro-bridge/src/main/ resources/XWiki/WikiMacroClass.xml platform/xwiki-applications/trunk/wiki-macro-bridge/src/main/ resources/XWiki/WikiMacroParameterClass.xml Removed: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/util/ColorConverter.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/util/EnumConverter.java sandbox/xwiki-core-properties/ Modified: enterprise/trunk/pom.xml enterprise/trunk/wiki/pom.xml platform/core/trunk/pom.xml platform/core/trunk/xwiki-core/pom.xml platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ XWiki.java platform/core/trunk/xwiki-core/src/main/resources/META-INF/ components.txt platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/doc/ XWikiDocumentRenderingTest.java platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/doc/ XWikiDocumentTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/block/AbstractBlock.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/macro/DefaultMacroManager.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/internal/transformation/ MacroTransformation.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/macro/AbstractMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/macro/AbstractNoParameterMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/macro/descriptor/AbstractMacroDescriptor.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/macro/descriptor/DefaultMacroDescriptor.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ java/org/xwiki/rendering/macro/descriptor/ DefaultParameterDescriptor.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/ java/org/xwiki/rendering/internal/macro/DefaultMacroManagerTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/ java/org/xwiki/rendering/macro/descriptor/ DefaultMacroDescriptorTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-box/src/main/java/org/xwiki/rendering/internal/macro/ box/DefaultBoxMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-box/src/main/java/org/xwiki/rendering/macro/box/ AbstractBoxMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-box/src/test/java/org/xwiki/rendering/macro/box/ TestBoxMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-chart/src/main/java/org/xwiki/rendering/internal/ macro/chart/ChartMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-code/src/main/java/org/xwiki/rendering/internal/ macro/code/CodeMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-footnotes/ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ macro/footnote/FootnoteMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-footnotes/src/main/java/org/xwiki/rendering/internal/ macro/footnote/PutFootnotesMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-html/src/main/java/org/xwiki/rendering/internal/ macro/html/HTMLMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-id/src/main/java/org/xwiki/rendering/internal/macro/ id/IdMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-include/src/main/java/org/xwiki/rendering/internal/ macro/include/IncludeMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-message/src/main/java/org/xwiki/rendering/internal/ macro/message/MessageMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-rss/src/main/java/org/xwiki/rendering/internal/macro/ rss/RssMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-script/src/main/java/org/xwiki/rendering/internal/ macro/script/DefaultScriptMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-script/src/main/java/org/xwiki/rendering/macro/ script/AbstractJRSR223ScriptMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-script/src/main/java/org/xwiki/rendering/macro/ script/AbstractScriptMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-toc/src/main/java/org/xwiki/rendering/internal/macro/ toc/TocMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-useravatar/src/main/java/org/xwiki/rendering/ internal/macro/useravatar/UserAvatarMacro.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki- rendering-macro-velocity/src/main/java/org/xwiki/rendering/internal/ macro/velocity/VelocityMacro.java platform/web/trunk/standard/pom.xml platform/xwiki-applications/trunk/pom.xml Log: XWIKI-3171: Replace direct call to beanutil/convertutil with our own BeanManager component XWIKI-3213: Support creating wiki content based rendering macros * Implemented above feature (XWIKI-3213) * Please note that this is a huge patch (my biggest commit I think). I might have done some mistakes so it could use some reviewing.