svn commit: r1307119 - in /lucene/dev/branches/lucene3930/solr/example: build.xml ivy.xml lib/javax.servlet-api-3.0.jar start.jar

[rm...@apache.org]

Author: rmuir
Date: Thu Mar 29 21:26:22 2012
New Revision: 1307119

URL: http://svn.apache.org/viewvc?rev=1307119&view=rev
Log:
LUCENE-3930: get solr example working again: nuke bogus servlet-api that doesnt work, and fetch start.jar from ivy

Added:
    lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-3.0.jar   (with props)
Removed:
    lucene/dev/branches/lucene3930/solr/example/start.jar
Modified:
    lucene/dev/branches/lucene3930/solr/example/build.xml
    lucene/dev/branches/lucene3930/solr/example/ivy.xml

Modified: lucene/dev/branches/lucene3930/solr/example/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/build.xml?rev=1307119&r1=1307118&r2=1307119&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/example/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/example/build.xml Thu Mar 29 21:26:22 2012
@@ -15,8 +15,15 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
-<project name="solr-example" default="resolve">
+<project name="solr-example" default="resolve" xmlns:ivy="antlib:org.apache.ivy.ant">
   <description>Solr Example</description>
 
+  <target name="resolve" depends="common.resolve">
+    <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"/>
+  </target>
+
   <import file="../common-build.xml"/>
 </project>

Modified: lucene/dev/branches/lucene3930/solr/example/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/ivy.xml?rev=1307119&r1=1307118&r2=1307119&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/example/ivy.xml (original)
+++ lucene/dev/branches/lucene3930/solr/example/ivy.xml Thu Mar 29 21:26:22 2012
@@ -31,6 +31,10 @@
       <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"/>
-      <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
+      <!-- bogus
+           broken
+           bogus
+           don't use
+      <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/> -->
     </dependencies>
 </ivy-module>

Added: lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-3.0.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/example/lib/javax.servlet-api-3.0.jar?rev=1307119&view=auto
==============================================================================
Binary file - no diff available.