X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=META-INF%2Fspring%2Feclipse.jetty.xml;h=11a15d70441780f29e1cc5c3b8124749fa546519;hb=fbdb49a3505493176e6295b429256c889c397328;hp=17dea187bc1e9ed9a370564a040701b9403fda7d;hpb=b8b775235639af6b9ef495831ab37eee211d325a;p=gpl%2Fargeo-tp.git

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 17dea18..11a15d7 100644
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -7,9 +7,8 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
-	<flow:flow name="eclipse/org.argeo.tp.jetty"
-		parent="template.importJettyZip">
-		<flow:arg name="jettyVersion" value="8.1.16.v20140903" />
+	<flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
+		<flow:arg name="jettyVersion" value="9.3.12.v20160915" />
 	</flow:flow>
 
 	<!-- Jetty specs and templates -->
@@ -21,16 +20,42 @@
 		abstract="true">
 		<bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
 			<property name="uri"
-				value="http://www.eclipse.org/downloads/jetty/@{jettyVersion}/dist/jetty-distribution-@{jettyVersion}.zip" />
+				value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/@{jettyVersion}/jetty-distribution-@{jettyVersion}.zip" />
 			<property name="license">
 				<util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
 			</property>
 			<property name="includes">
 				<map>
-					<entry key="jetty-distribution-@{jettyVersion}/lib/jetty-*.jar"
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
+						value="org.argeo.tp.jetty" />
+					<entry
+						key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
 						value="org.argeo.tp.jetty" />
-					<entry key="jetty-distribution-@{jettyVersion}/lib/servlet-api-*.jar"
-						value="org.argeo.tp.javax" />
 				</map>
 			</property>
 			<property name="excludes">
@@ -38,13 +63,15 @@
 					<value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
 				</list>
 			</property>
-			<property name="sourcesProvider">
-				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-					<property name="uri"
-						value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" />
-					<property name="osgiFactory" ref="osgiFactory" />
-				</bean>
-			</property>
+			<!-- FIXME sources missing (use git as in http://stackoverflow.com/a/13681834 ?) -->
+			<!-- <property name="sourcesProvider"> -->
+			<!-- <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
+			<!-- <property name="uri" -->
+			<!-- value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" 
+				/> -->
+			<!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+			<!-- </bean> -->
+			<!-- </property> -->
 			<property name="osgiFactory" ref="osgiFactory" />
 		</bean>
 	</flow:flow>