Re: [xwiki-devs] [xwiki-notifications] r33583 - in platform/core/trunk: . xwiki-bridge xwiki-bridge/src/main/java/org/xwiki/bridge xwiki-model/src/main/java/org/xwiki/model/internal/reference xwiki-model/src/main/resources/META-INF xwiki-model/src/test/java/org/x

Author: vmassol Date: 2010-12-17 14:07:48 +0100 (Fri, 17 Dec 2010) New Revision: 33583 Added: platform/core/trunk/xwiki-model/src/main/java/org/xwiki/model/internal/reference/ExplicitStringAttachmentReferenceResolver.java platform/core/trunk/xwiki-model/src/test/java/org/xwiki/model/internal/reference/ExplicitStringAttachmentReferenceResolverTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/transformation/ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/test/java/org/xwiki/rendering/transformation/TransformationContextTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/macro/DefaultMacroContentParser.java platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/macro/MacroContentParser.java platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformationContextTest.java Removed: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-box/src/main/java/org/xwiki/rendering/internal/macro/box/DefaultMacroContentParser.java platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-box/src/main/java/org/xwiki/rendering/internal/macro/box/MacroContentParser.java Modified: platform/core/trunk/pom.xml platform/core/trunk/xwiki-bridge/pom.xml platform/core/trunk/xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentModelBridge.java platform/core/trunk/xwiki-model/src/main/resources/META-INF/components.txt platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/transformation/TransformationContext.java 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/main/resources/META-INF/components.txt 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-include/src/test/java/org/xwiki/rendering/internal/macro/IncludeMacroTest.java platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/transformation/MacroTransformationContext.java platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/resources/META-INF/components.txt Log: XWIKI-5807: Add support for relative links/images in included documents * First implementation. Current limitation: Doesn't work when links are generated by macros in the included document. Modified: platform/core/trunk/pom.xml =================================================================== --- platform/core/trunk/pom.xml 2010-12-17 12:25:56 UTC (rev 33582) +++ platform/core/trunk/pom.xml 2010-12-17 13:07:48 UTC (rev 33583) @@ -192,6 +192,8 @@ <exclude>**/internal/**</exclude> <exclude>**/test/**</exclude> <!-- To be removed when we release 3.0 --> + <exclude>org/xwiki/bridge/DocumentModelBridge</exclude> + <exclude>org/xwiki/rendering/macro/box/AbstractBoxMacro</exclude> </excludes> </configuration> </plugin> Modified: platform/core/trunk/xwiki-bridge/pom.xml =================================================================== --- platform/core/trunk/xwiki-bridge/pom.xml 2010-12-17 12:25:56 UTC (rev 33582) +++ platform/core/trunk/xwiki-bridge/pom.xml 2010-12-17 13:07:48 UTC (rev 33583) @@ -46,6 +46,11 @@ </dependency> <dependency> <groupId>org.xwiki.platform</groupId> + <artifactId>xwiki-core-rendering-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.xwiki.platform</groupId> <artifactId>xwiki-core-observation-local</artifactId>