You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/30 00:29:00 UTC
svn commit: r1307148 - in /lucene/dev/branches/lucene3930: lucene/
solr/example/ solr/example/lib/
Author: rmuir
Date: Thu Mar 29 22:29:00 2012
New Revision: 1307148
URL: http://svn.apache.org/viewvc?rev=1307148&view=rev
Log:
LUCENE-3930: fix servlet-api.jar
Added:
lucene/dev/branches/lucene3930/solr/example/lib/servlet-api-LICENSE-ASL.txt
- copied unchanged from r1307101, lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-LICENSE-ASL.txt
lucene/dev/branches/lucene3930/solr/example/lib/servlet-api-NOTICE.txt
- copied unchanged from r1307101, lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-NOTICE.txt
Removed:
lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-3.0.jar
lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-LICENSE-ASL.txt
lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-NOTICE.txt
Modified:
lucene/dev/branches/lucene3930/lucene/common-build.xml
lucene/dev/branches/lucene3930/solr/example/ (props changed)
lucene/dev/branches/lucene3930/solr/example/build.xml
lucene/dev/branches/lucene3930/solr/example/ivy.xml
Modified: lucene/dev/branches/lucene3930/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/common-build.xml?rev=1307148&r1=1307147&r2=1307148&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/common-build.xml Thu Mar 29 22:29:00 2012
@@ -253,6 +253,8 @@
</target>
<target name="resolve" depends="ivy-availability-check,ivy-fail">
+ <!-- todo, make this a property or something.
+ only special cases need bundles -->
<ivy:retrieve type="jar,bundle" log="download-only"/>
</target>
<target name="ivy-availability-check" unless="ivy.available">
Modified: lucene/dev/branches/lucene3930/solr/example/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/build.xml?rev=1307148&r1=1307147&r2=1307148&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/example/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/example/build.xml Thu Mar 29 22:29:00 2012
@@ -18,11 +18,20 @@
<project name="solr-example" default="resolve" xmlns:ivy="antlib:org.apache.ivy.ant">
<description>Solr Example</description>
- <target name="resolve" depends="common.resolve">
+ <target name="resolve">
+ <sequential>
+ <!-- jetty libs in lib/ -->
+ <ivy:retrieve conf="default" type="jar" log="download-only"/>
+ <!-- start.jar -->
+ <!-- TODO: put this in ivy.xml -->
<ivy:retrieve inline="true" organisation="org.eclipse.jetty"
module="jetty-start" revision="8.1.2.v20120308"
transitive="false" type="jar" log="download-only"
pattern="start.jar"/>
+ <!-- servlet-api.jar -->
+ <ivy:retrieve conf="servlet" log="download-only" type="orbit"
+ pattern="lib/servlet-api-3.0.jar"/>
+ </sequential>
</target>
<import file="../common-build.xml"/>
Modified: lucene/dev/branches/lucene3930/solr/example/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/ivy.xml?rev=1307148&r1=1307147&r2=1307148&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/example/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/example/ivy.xml Thu Mar 29 22:29:00 2012
@@ -18,6 +18,10 @@
-->
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="example"/>
+ <configurations>
+ <conf name="default" description="jetty jars"/>
+ <conf name="servlet" description="servlet-api jar"/>
+ </configurations>
<dependencies>
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.2.v20120308" transitive="false"/>
@@ -31,10 +35,8 @@
<dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.2.v20120308" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.1.2.v20120308" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="8.1.2.v20120308" transitive="false"/>
- <!-- bogus
- broken
- bogus
- don't use
- <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/> -->
+ <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
+ <artifact name="javax.servlet" type="orbit" ext="jar"/>
+ </dependency>
</dependencies>
</ivy-module>