From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 6 Oct 2016 15:48:35 +0000 (+0200)
Subject: Re-add W3C SAC
X-Git-Tag: v2.3.9~79
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=7bee127dfda4f87ae0353d3ccd35253718cfac18;hp=635c120fbcff53c9029fb86de79534ce0babbcb6;p=gpl%2Fargeo-tp.git

Re-add W3C SAC
---

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 9e844f3..8edad39 100644
--- 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 e96936b..0034306 100644
--- 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">