svn commit: r376055 - in /lucene/hadoop/trunk: build.xml src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java src/webapps/index.html

[cu...@apache.org]

Author: cutting
Date: Wed Feb  8 12:39:16 2006
New Revision: 376055

URL: http://svn.apache.org/viewcvs?rev=376055&view=rev
Log:
Fix HADOOP-28.  Jsp pages are now pre-compiled to servlets that can access package-private classes.

Added:
    lucene/hadoop/trunk/src/webapps/index.html
Modified:
    lucene/hadoop/trunk/build.xml
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java

Modified: lucene/hadoop/trunk/build.xml
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/build.xml?rev=376055&r1=376054&r2=376055&view=diff
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Wed Feb  8 12:39:16 2006
@@ -23,6 +23,7 @@
 
   <property name="build.dir" value="build"/>
   <property name="build.classes" value="${build.dir}/classes"/>
+  <property name="build.src" value="${build.dir}/src"/>
   <property name="build.webapps" value="${build.dir}/webapps"/>
   <property name="build.examples" value="${build.dir}/examples"/>
   <property name="build.docs" value="${build.dir}/docs"/>
@@ -53,7 +54,7 @@
   <path id="classpath">
     <pathelement location="${build.classes}"/>
     <fileset dir="${lib.dir}">
-      <include name="*.jar" />
+      <include name="**/*.jar" />
     </fileset>
   </path>
 
@@ -71,7 +72,8 @@
   <target name="init">
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.webapps}"/>
+    <mkdir dir="${build.src}"/>
+    <mkdir dir="${build.webapps}/WEB-INF"/>
     <mkdir dir="${build.examples}"/>
 
     <mkdir dir="${test.build.dir}"/>
@@ -81,8 +83,8 @@
       <fileset dir="${conf.dir}" includes="**/*.template"/>
     </touch>
 
-    <copy todir="${build.webapps}/jobtracker">
-      <fileset dir="${src.webapps}/jobtracker"/>
+    <copy todir="${build.webapps}/">
+      <fileset file="${src.webapps}/index.html"/>
     </copy>
 
     <copy todir="${conf.dir}" verbose="true">
@@ -95,9 +97,19 @@
   <!-- Compile the Java files                                 -->
   <!-- ====================================================== -->
   <target name="compile" depends="init">
+    <jspc 
+     srcdir="${src.webapps}"
+     includes="**/*.jsp"
+     destdir="${build.src}"
+     package="org.apache.hadoop.mapred"
+     uriroot="${src.webapps}/jobtracker"
+     webxml="${build.webapps}/WEB-INF/web.xml">
+      <classpath refid="classpath"/>
+    </jspc>
+
     <javac 
      encoding="${build.encoding}" 
-     srcdir="${src.dir}"
+     srcdir="${src.dir};${build.src}"
      includes="org/apache/hadoop/**/*.java"
      destdir="${build.classes}"
      debug="${javac.debug}"
@@ -107,6 +119,7 @@
      deprecation="${javac.deprecation}">
       <classpath refid="classpath"/>
     </javac>    
+
   </target>
 
   <target name="compile-examples" depends="compile">

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java?rev=376055&r1=376054&r2=376055&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java Wed Feb  8 12:39:16 2006
@@ -61,8 +61,8 @@
 	    } catch (UnsupportedEncodingException e) {
 	    }
 	}
-	File jobtracker = new File(path, "jobtracker");
-        WebApplicationContext context = server.addWebApplication(null, "/", jobtracker.getCanonicalPath());
+        WebApplicationContext context =
+          server.addWebApplication(null,"/",new File(path).getCanonicalPath());
 
         SocketListener socketListener = new SocketListener();
         socketListener.setPort(port);

Added: lucene/hadoop/trunk/src/webapps/index.html
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/webapps/index.html?rev=376055&view=auto
==============================================================================
--- lucene/hadoop/trunk/src/webapps/index.html (added)
+++ lucene/hadoop/trunk/src/webapps/index.html Wed Feb  8 12:39:16 2006
@@ -0,0 +1,19 @@
+<html>
+
+<head>
+<title>Hadoop Administration</title>
+</head>
+
+<body>
+
+<h1>Hadoop Administration</h1>
+
+<ul>
+
+<li><a href="jobtracker.jsp">JobTracker</a></li>
+
+</ul>
+
+</body>
+
+</html>