Changeset 29751 for gs3-extensions/solr/trunk

Timestamp:

2015-02-18T19:14:04+13:00 (9 years ago)

Author:

ak19

Message:

On windows, ant is unable to move xercesImppl.jar file from GS3 web lib to tomcat lib, since it is on the classpath while ant is running the add-service target for solr. Similarly, can't make build.xml in toplevel GS3 move the xalan related jar files including xercesImpl.jar into tomcat after unpacking tomcat, because ant is running these commands and xercesImpl.jar is still on the PATH. The current solution is that ext\solr\build.xml repackages solr.war with copies of xalan.jar and related jar files from GS3's web lib. Now both GS3 and solr have their own copies of xalan and the related jar files (instead of the recent change, that a single shared copy of each jar exists in tomcat\lib), but these are both still guaranteed to be identical between GS3 and solr, since the solr ones are copied from GS3. As the solr.war is repackaged to contain the correct jar files, when tomcat is run, hey are unpacked and the /solr servlet can run successfully.

File:

• gs3-extensions/solr/trunk/src/build.xml (modified) (2 diffs)

gs3-extensions/solr/trunk/src/build.xml

@@ -180 +180 @@
     <copy todir="${web.libdir}">
       <filelist id="logging-bridge" dir="lib/ext" files="jcl-over-slf4j-1.6.6.jar"/>
-    </copy> 
-
-    <echo>Moving xalan related jar files from  ${web.libdir} to ${tomcat.lib.dir}, to share with solr</echo>
-    <move todir="${tomcat.lib.dir}">
-      <filelist dir="${web.libdir}" files="${shared-xalan-jars}" />
-    </move>
+    </copy>
     
     <echo>Copying ${basedir}/webapps/solr.war to ${tomcat.dir}/webapps</echo>
     <copy todir="${tomcat.dir}/webapps" file="webapps/solr.war" />
+    <unwar src="${tomcat.dir}/webapps/solr.war" dest="${tomcat.dir}/webapps/solr"/>
+    <echo>Copying xalan related jar files from  ${web.libdir} into ${tomcat.dir}/webapps/solr.war</echo>
+    <copy todir="${tomcat.dir}/webapps/solr/WEB-INF/lib">
+      <filelist dir="${web.libdir}" files="${shared-xalan-jars}" />
+    </copy>
+    <jar destfile="${tomcat.dir}/webapps/solr.war" basedir="${tomcat.dir}/webapps/solr" />
+    <!-- delete the webapps\solr temporary dir: tomcat will unpack the modified war file on startup-->
+    <delete failonerror="true" dir="${tomcat.dir}/webapps/solr" />
+    
     <echo>Generating solr context file in ${tomcat.context.dir}</echo>
     
@@ -273 +277 @@
     <delete failonerror="false" file="${web.libdir}/jcl-over-slf4j-1.6.6.jar"/>
 
-    <!-- moving shared xalan related jar files back from tomcat lib to GS3 web lib -->
-    <move todir="${web.libdir}">
-      <filelist dir="${tomcat.lib.dir}" files="${shared-xalan-jars}" />
-    </move>
-
     <!--http://stackoverflow.com/questions/2140637/how-do-i-build-a-list-of-file-names-->
   </target>