Re-add W3C SAC

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 9e844f34ee7ee6ff8ac1773d186d9efd066aeef5..8edad39764f972aea30609863c736d899384d2a6 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -39,6 +39,7 @@
                                <ref bean="org.quartz-scheduler.quartz" />
                                <ref bean="org.quartz-scheduler.quartz.jobs" />
                                <ref bean="bitronix.tm" />
+                               <ref bean="misc/org.w3c.css.sac" />
                                <ref bean="com.steadystate.css" />
 
                                <!-- Apache Commons -->

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index e96936b6c54150d4fba7f51d0d04de24205d931e..0034306de98dcab634d67bc3701b26c70dc24e67 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -183,30 +183,30 @@
                </bean>
        </flow:flow>
 
-<!--   <flow:flow name="misc/org.w3c.css.sac" spec="spec.version"> -->
-<!--           <flow:arg name="version" value="1.3" /> -->
-<!--           <bean parent="template.archiveWrapper"> -->
-<!--                   <property name="uri" -->
-<!--                           value="http://www.w3.org/2002/06/sacjava-@{version}.zip" /> -->
-<!--                   <property name="license"> -->
-<!--                           <util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" /> -->
-<!--                   </property> -->
-<!--                   <property name="wrappers"> -->
-<!--                           <map> -->
-<!--                                   <entry key="sac-@{version}/sac.jar"> -->
-<!--                                           <bean id="org.w3c.css.sac" parent="template.bndWrapper" /> -->
-<!--                                   </entry> -->
-<!--                           </map> -->
-<!--                   </property> -->
-<!--                   <property name="sourcesProvider"> -->
-<!--                           <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
-<!--                                   <property name="uri" -->
-<!--                                           value="http://www.w3.org/2002/06/sacjava-@{version}.zip" /> -->
-<!--                                   <property name="osgiFactory" ref="osgiFactory" /> -->
-<!--                           </bean> -->
-<!--                   </property> -->
-<!--           </bean> -->
-<!--   </flow:flow> -->
+       <flow:flow name="misc/org.w3c.css.sac" spec="spec.version">
+               <flow:arg name="version" value="1.3" />
+               <bean parent="template.archiveWrapper">
+                       <property name="uri"
+                               value="http://www.w3.org/2002/06/sacjava-@{version}.zip" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+                       </property>
+                       <property name="wrappers">
+                               <map>
+                                       <entry key="sac-@{version}/sac.jar">
+                                               <bean id="org.w3c.css.sac" parent="template.bndWrapper" />
+                                       </entry>
+                               </map>
+                       </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://www.w3.org/2002/06/sacjava-@{version}.zip" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+       </flow:flow>
 
        <bean id="net.sf.jxl" p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
                parent="template.mavenWrapper">