# HG changeset patch
# User Mike Sullivan <Mike.Sullivan@Oracle.COM>
# Date 1429554186 25200
# Node ID 5ddf681dc2fae0ba3bfe9d92609ae5240dbc1be2
# Parent  6a2ebd1d6b272c29e8b5c6e9d8308ed0852d8c62
backout 20480319 - needs more work

diff -r 6a2ebd1d6b27 -r 5ddf681dc2fa components/tomcat/Makefile
--- a/components/tomcat/Makefile	Mon Apr 20 10:04:29 2015 -0700
+++ b/components/tomcat/Makefile	Mon Apr 20 11:23:06 2015 -0700
@@ -45,10 +45,10 @@
 COMPONENT_ARCHIVE_HASH_2= \
     sha256:e9f414555c41e9584da1f6953af28208ece5cd4664ef2fea297e6a6aadc4377e
 COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2)
-COMPONENT_ARCHIVE_3= ecjsrc-4.3.1.jar
+COMPONENT_ARCHIVE_3= ecj-4.3.1.jar
 COMPONENT_ARCHIVE_HASH_3= \
-    sha256:2f6e214af951ed247a5bbc018df29706e2365cc2e9f7866e536b4cce0da8b66a
-COMPONENT_ARCHIVE_URL_3= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3)
+    sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295
+COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3)
 
 TPNO=			20718
 
@@ -61,13 +61,6 @@
 COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR)
 COMPONENT_BUILD_TARGETS=download deploy
 
-# Build ECJ jar from sources.
-COMPONENT_PRE_BUILD_ACTION= \
-	($(MKDIR) $(@D)/ECJ/scripts/binary/META-INF; cd $(@D)/ECJ ; \
-	    $(JAVA_HOME)/bin/jar xf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_3); \
-	    $(CP) META-INF/MANIFEST.MF scripts/binary/META-INF/; \
-	    $(ANT) )
-
 # Create configuration backup archive for custom user's deployments.
 COMPONENT_POST_BUILD_ACTION= \
 	(cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \
diff -r 6a2ebd1d6b27 -r 5ddf681dc2fa components/tomcat/patches/build.properties.patch
--- a/components/tomcat/patches/build.properties.patch	Mon Apr 20 10:04:29 2015 -0700
+++ b/components/tomcat/patches/build.properties.patch	Mon Apr 20 11:23:06 2015 -0700
@@ -25,7 +25,7 @@
  # The download will be moved to the archive area eventually. We are taking care of that in advance.
  # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar
 -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-+jdt.loc.1=file://${base.path}/ECJ/ecj.jar
++jdt.loc.1=${userland-files.loc}/ecj-${jdt.version}.jar
  jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
  
  # ----- Tomcat native library -----