On Feb 13, 2010, at 5:22 PM, Marius Dumitru Florea wrote:
> Vincent Massol wrote:
>> Hi Asiri,
>>
>> On Feb 13, 2010, at 5:03 PM, asiri (SVN) wrote:
>>
>>> Author: asiri
>>> Date: 2010-02-13 17:03:01 +0100 (Sat, 13 Feb 2010)
>>> New Revision: 27005
>>>
>>> Modified:
>>>
>>> platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/importer/XWikiImportService.java
>>> Log:
>>> * Added missing @Requirement annotation which was causing total failure of
>>> wysiwyg office imports.
>>> * This typo does not seem to be present in any other branches.
>>>
>>> Modified:
>>> platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/importer/XWikiImportService.java
>>> ===================================================================
>>> ---
>>> platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/importer/XWikiImportService.java
>>> 2010-02-13 15:40:57 UTC (rev 27004)
>>> +++
>>> platform/web/trunk/xwiki-gwt-wysiwyg-server/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/importer/XWikiImportService.java
>>> 2010-02-13 16:03:01 UTC (rev 27005)
>>> @@ -67,6 +67,7 @@
>>> /**
>>> * The component used to parse attachment references.
>>> */
>>> + @Requirement
>>> private AttachmentReferenceResolver<String> attachmentReferenceResolver;
>>
>> Are you sure about this?
>>
>> In the 2.2 branch we have:
>>
>> /**
>> * The component used to parse attachment references.
>> */
>> @Requirement("current")
>> private AttachmentReferenceResolver attachmentReferenceResolver;
>
> My mistake. I removed the annotation in revision 26759. I wanted to
> remove only the hint (there's no current document for GWT-RPC requests)
> and it seems I removed the entire annotation..
>
> Asiri, thanks for catching this!
In this case it's still wrong in the 2.2 branch right now....
-Vincent
>
> Marius
_______________________________________________
devs mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/devs
