Re: [xwiki-devs] [xwiki-notifications] r15292 - in platform: core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus xwiki-applications/trunk/officeimporter/src/main/resources/Import

11 Jan 2009

asiri (SVN) wrote:
...
Author: asiri
Date: 2009-01-10 19:37:55 +0100 (Sat, 10 Jan 2009)
New Revision: 15292
Added:
   platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/OfficeImporterVelocityBridge.java
Modified:
   platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporter.java
   platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/OfficeImporterVelocityContextInitializer.java
   platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml
   platform/xwiki-applications/trunk/officeimporter/src/main/resources/Import/Importer.xml
Log:
XWIKI-3083: Develop the initial feature set for the Office Importer module
* Added error reporting support.
* Error messages need to be improved.
Modified: platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml
===================================================================

--- platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml	2009-01-10 17:42:24 UTC (rev 15291)
+++ platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml	2009-01-10 18:37:55 UTC (rev 15292)
@@ -96,6 +96,7 @@
           <role-hint>htmltopresentation</role-hint>
           <field-name>htmlToPresentationTransformer</field-name>
         </requirement>
+        <instantiation-strategy>singleton</instantiation-strategy>
       </requirements>      
     </component>
     <!-- Velocity -->
@@ -104,7 +105,7 @@
       <role-hint>officeimporter</role-hint>
       <implementation>org.xwiki.officeimporter.internal.OfficeImporterVelocityContextInitializer
       </implementation>
-      <instantiation-strategy>singleton</instantiation-strategy>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
No, you should leave it as a singleton, since the context initializer
does not hold any state. It will be invoked manually for each request by
another component in the velocity module.
...
<requirements>
         <requirement>
           <role>org.xwiki.officeimporter.OfficeImporter</role>
-- 
Sergiu Dumitriu
http://purl.org/net/sergiu/

    