Index: main/plugin-odf-sync/plugin.xml
===================================================================
--- main/plugin-odf-sync/plugin.xml	(revision 16252)
+++ main/plugin-odf-sync/plugin.xml	(working copy)
@@ -41,7 +41,37 @@
 	<!-- +
 		 | Apogee implementation
 		 + -->
-	<feature name="synchronization.apogee">
+	<feature name="synchronization.apogee.impl">
+        <components>
+        	<component class="org.ametys.plugins.odfsync.apogee.ApogeeImportManager" 
+        			   role="org.ametys.plugins.odfsync.apogee.ApogeeImportManager">
+        			<program-workflow-name>program</program-workflow-name>
+			     	<course-workflow-name>course</course-workflow-name>
+			     	<orgunit-workflow-name>orgunit</orgunit-workflow-name>		   
+        	</component>
+        			   
+        	<component class="org.ametys.plugins.odfsync.apogee.ApogeeSynchronizationManager" 
+        			   role="org.ametys.plugins.odfsync.apogee.ApogeeSynchronizationManager"/>		
+        			      
+            <component class="org.ametys.plugins.odfsync.apogee.CodeConversionHelper" 
+                       role="org.ametys.plugins.odfsync.apogee.CodeConversionHelper">
+                <degrees>degrees_conversion.xml</degrees>
+                <disciplines>disciplines_conversion.xml</disciplines>
+                <educationTypes>educationTypes_conversion.xml</educationTypes>
+                <levels>levels_conversion.xml</levels>
+                <teachingTerms>teachingTerms_conversion.xml</teachingTerms>
+            </component>
+        </components>
+        
+        <extensions>
+    	   <extension point="org.ametys.plugins.odfsync.ODFSyncManager"
+			           id="org.ametys.plugins.odfsync.apogee.ApogeeODFSyncManager"
+			           class="org.ametys.plugins.odfsync.apogee.ApogeeODFSyncManager">
+           </extension>  
+		</extensions>
+	</feature>
+	<!-- Could be used without the ApogeeODFSyncManager -->
+	<feature name="synchronization.apogee.datasource">
         <config>
             <param type="string" id="odf.apogee.administrative.year">
                 <label i18n="true">PLUGINS_ODF_APOGEE_YEAR</label>
@@ -85,35 +115,11 @@
         </config>
         
         <components>
-        	<component class="org.ametys.plugins.odfsync.apogee.ApogeeImportManager" 
-        			   role="org.ametys.plugins.odfsync.apogee.ApogeeImportManager">
-        			<program-workflow-name>program</program-workflow-name>
-			     	<course-workflow-name>course</course-workflow-name>
-			     	<orgunit-workflow-name>orgunit</orgunit-workflow-name>		   
-        	</component>
-        			   
-        	<component class="org.ametys.plugins.odfsync.apogee.ApogeeSynchronizationManager" 
-        			   role="org.ametys.plugins.odfsync.apogee.ApogeeSynchronizationManager"/>		
-        			      
-            <component class="org.ametys.plugins.odfsync.apogee.CodeConversionHelper" 
-                       role="org.ametys.plugins.odfsync.apogee.CodeConversionHelper">
-                <degrees>degrees_conversion.xml</degrees>
-                <disciplines>disciplines_conversion.xml</disciplines>
-                <educationTypes>educationTypes_conversion.xml</educationTypes>
-                <levels>levels_conversion.xml</levels>
-                <teachingTerms>teachingTerms_conversion.xml</teachingTerms>
-            </component>
-            
            <component role="org.ametys.plugins.odfsync.apogee.DefaultApogeeDAO"
                     class="org.ametys.plugins.odfsync.apogee.DefaultApogeeDAO"/>
-            
         </components>
         
         <extensions>
-    	   <extension point="org.ametys.plugins.odfsync.ODFSyncManager"
-			           id="org.ametys.plugins.odfsync.apogee.ApogeeODFSyncManager"
-			           class="org.ametys.plugins.odfsync.apogee.ApogeeODFSyncManager">
-           </extension>  
            <extension point="org.ametys.runtime.datasource.DataSourceExtensionPoint" 
                        id="odf.apogee.datasource.jdbc.pool"
                        logger="odf.apogee.datasource.jdbc.pool">
@@ -133,7 +139,7 @@
                 <sqlMap datasource="odf.apogee.datasource.jdbc.pool" config="/WEB-INF/param/odf/apogee/educationalElements.xml"/>  
                 <sqlMap datasource="odf.apogee.datasource.jdbc.pool" config="/WEB-INF/param/odf/apogee/orgUnits.xml"/>
             </extension>
-		</extensions>
+        </extensions>	   
 	</feature>
 
 	<!-- +