[Bigdata-commit] SF.net SVN: bigdata:[7925] branches/RDR/build.xml

[<tho...@us...>]

Revision: 7925
          http://sourceforge.net/p/bigdata/code/7925
Author:   thompsonbry
Date:     2014-03-11 13:25:05 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
Fix for RDR CI branch.  The CI junit tests were failing to locate index.html.  This commit fixes that issue in local CI runs.  However, there are still some unresolved issues with where to place the contents of bigdata-war/src, as discussed below.  For the moment, I have taken the coward's way out and simply modified CI to look in dist/bigdata/var/jetty.  This leaves open an ambiguity since the files are also in the JAR and it is unclear whether we can actually run the NSS using the JAR (and outside of the IDE) because the files are currently in the classes/bigdata-war/src directory of the JAR rather than at classes/.  This probably means that they can not be discovered.  The problem with putting them in the right location is that it makes it difficult to override those files (class path ordering problems could cause a different version of jetty.xml to be silently used).

{{{
- There is still an issue with the location to which we deploy the WAR
  resources.  The JAR had classes/bigdata-war/src/... in recent
  commits of the RDR branch.  This was causing "ant test" to fail
  since the WAR resources were not being located.  That can be fixed
  either by copying those files to the correct location in the classes
  directory (per below) or by adding the dist/bigdata/var/jetty path
  to the classpath for CI.

			<!-- Copy WAR resources for the embedded NanoSparqlServer.     -->
			<!-- TODO: This could cause problem since the files exist in   -->
			<!-- both the JAR and the staged artifact (bigdata/var/jetty). -->
			<fileset dir="${bigdata.dir}/bigdata-war/src">
				<include name="**"/>
			</fileset>

  See also this line in the "run-junit" target, which has very much
  the same effect (CI works).

        <!--pathelement location="${dist.var.jetty}" -->

  This raises a question (again) about how we are to configure jetty.
  It also raises the question of whether we can ALWAYS rely on
  jetty.xml and web.xml to start the NSS, either using a version on
  the classpath or a version identified by the JETTY_XXX environment
  variables.  This would be quite nice since it would let us simplify
  the NanoSparqlServer newInstance() code base significantly.

  One approach is to change the WAR.  Rather than having the JAR's
  classes embedded into it, the WAR could just have those files that
  are in bigdata-war and the bigdata.jar could deployed into the
  WEB-INF/classes/lib directory. This could be done when we stage the
  WAR.
}}}

See #730 (embedded jetty configuration).

Modified Paths:
--------------
    branches/RDR/build.xml

Modified: branches/RDR/build.xml
===================================================================
--- branches/RDR/build.xml	2014-03-11 06:59:48 UTC (rev 7924)
+++ branches/RDR/build.xml	2014-03-11 13:25:05 UTC (rev 7925)
@@ -277,7 +277,16 @@
 			<fileset dir="${bigdata.dir}/bigdata-sails/src/resources/sesame-server">
 				<include name="META-INF/**" />
 			</fileset>
-			<!-- Copy WAR resources for the embedded NanoSparqlServer -->
+			<!-- Copy WAR resources for the embedded NanoSparqlServer.     -->
+			<!-- TODO: This could cause problem since the files exist in   -->
+			<!-- both the JAR and the staged artifact (bigdata/var/jetty). -->
+			<!-- This makes it difficult to override the ones in the JAR.  -->
+			<!-- See also "run-junit" for an alterative to getting CI to run. -->
+			<!-- newer approach. -->
+			<!--fileset dir="${bigdata.dir}/bigdata-war/src">
+				<include name="**"/>
+			</fileset-->
+			<!-- older approach. -->
 			<fileset dir="." includes="bigdata-war/src/**"/>
 		</copy>
 	</target>
@@ -2074,6 +2083,7 @@
         <pathelement location="${sesame-sparql-test.jar}" />
         <pathelement location="${sesame-store-test.jar}" />
         <pathelement location="${sesame-rio-test.jar}" />
+        <pathelement location="${dist.var.jetty}"/>
         <pathelement location="${dist.lib}/bigdata.jar" />
         <pathelement location="${dist.lib}/colt.jar" />
         <pathelement location="${dist.lib}/highscalelib.jar" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.