Update to 1.4.

6 files changed, 97 insertions, 94 deletions

diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile
index 039a3cc18143..36a96474c794 100644
--- a/java/icedtea-web/Makefile
+++ b/java/icedtea-web/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	icedtea-web
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	java www
 MASTER_SITES=	http://icedtea.wildebeest.org/download/source/ \
 		http://icedtea.classpath.org/download/source/
@@ -24,7 +23,9 @@ JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.6+
 USE_PERL5_BUILD=yes
 USE_XORG=	x11
-USES=		pkgconfig
+USES=		pkgconfig shebangfix
+SHEBANG_FILES=	javac.in jrunscript.in
+
 WANT_GNOME=	yes
 
 EXTRACT_CMD=	${GZIP_CMD}
@@ -36,11 +37,12 @@ PLIST_FILES=	bin/itweb-javaws bin/itweb-settings \
 		share/applications/itweb-javaws.desktop \
 		share/applications/itweb-settings.desktop \
 		share/pixmaps/itweb-javaws.png
-PORTDATA=	about.jar about.jnlp netx.jar
+PORTDATA=	about.jar about.jnlp javaws_splash.png netx.jar
 PORTDOCS=	netx
 
-CONFIGURE_ARGS=	--with-ecj=no --with-jdk-home="${JAVA_HOME}"
-SH=		${LOCALBASE}/bin/bash
+CONFIGURE_ARGS=	--with-asm=no --with-ecj=no --with-emma=no --with-jacoco=no
+CONFIGURE_ARGS+=--with-jdk-home="${JAVA_HOME}"
+SH=		${bash_CMD}
 
 OPTIONS_DEFINE=	PLUGIN RHINO TEST
 OPTIONS_DEFAULT=PLUGIN
@@ -56,7 +58,7 @@ CONFIGURE_ARGS+=--disable-docs
 
 .if ${PORT_OPTIONS:MPLUGIN}
 USE_GECKO=	libxul libxul19
-USE_GNOME=	glib20 gtk20
+USE_GNOME=	glib20
 USE_WEBPLUGINS=	native
 WEBPLUGINS_DIR=	${PREFIX}/lib
 WEBPLUGINS_FILES=IcedTeaPlugin.so
@@ -65,7 +67,6 @@ PLIST_FILES+=	lib/IcedTeaPlugin.so
 PORTDATA+=	plugin.jar
 PORTDOCS+=	plugin
 
-CONFIGURE_ARGS+=--with-gtk=2
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 .else
 CONFIGURE_ARGS+=--disable-plugin
@@ -98,9 +99,14 @@ pre-extract:
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/javac.in
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    ${WRKSRC}/launcher/javaws.in
+	${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
+	    ${WRKSRC}/*.desktop.in
+	${REINPLACE_CMD} -E 's|/bin/(ba)?sh|${bash_CMD}|' \
+	    ${WRKSRC}/launcher/*.in \
+	    ${WRKSRC}/plugin/tests/LiveConnect/build \
+	    ${WRKSRC}/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
+	${REINPLACE_CMD} -e 's|%%JAR%%|${JAR}|' \
+	    ${WRKSRC}/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
 
 .if ${PORT_OPTIONS:MTEST}
 post-build:
@@ -111,10 +117,7 @@ post-build:
 
 post-install:
 	${MKDIR} ${DESKTOPDIR}
-	${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
-	    ${WRKSRC}/itweb-javaws.desktop ${WRKSRC}/itweb-settings.desktop
-	${INSTALL_DATA} ${WRKSRC}/itweb-javaws.desktop \
-	    ${WRKSRC}/itweb-settings.desktop ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.desktop ${DESKTOPDIR}
 	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/javaws.png \
 	    ${PREFIX}/share/pixmaps/itweb-javaws.png
diff --git a/java/icedtea-web/distinfo b/java/icedtea-web/distinfo
index 66d69ea12df7..04029e17c689 100644
--- a/java/icedtea-web/distinfo
+++ b/java/icedtea-web/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icedtea-web-1.3.2.tar.gz) = bd25d9a9565271b716e54a19ffe8e34ab339666f72c99da743155320b9ac27f0
-SIZE (icedtea-web-1.3.2.tar.gz) = 1038957
+SHA256 (icedtea-web-1.4.tar.gz) = e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb
+SIZE (icedtea-web-1.4.tar.gz) = 1364883
diff --git a/java/icedtea-web/files/patch-Makefile.in b/java/icedtea-web/files/patch-Makefile.in
index 7afedb58d404..240d9d53ab21 100644
--- a/java/icedtea-web/files/patch-Makefile.in
+++ b/java/icedtea-web/files/patch-Makefile.in
@@ -1,39 +1,29 @@
---- Makefile.in.orig	2013-04-11 12:15:37.816212000 -0400
-+++ Makefile.in	2013-04-26 18:51:02.000000000 -0400
-@@ -256,14 +256,14 @@
+--- Makefile.in.orig	2013-05-03 15:23:56.312803000 -0400
++++ Makefile.in	2013-06-11 16:38:52.000000000 -0400
+@@ -233,7 +233,7 @@
  #end of exported autoconf copies
  
  # binary names
 -javaws := $(shell echo javaws | sed '@program_transform_name@')
-+itweb_javaws := $(shell echo itweb-javaws | sed '@program_transform_name@')
++javaws := $(shell echo itweb-javaws | sed '@program_transform_name@')
  itweb_settings := $(shell echo itweb-settings | sed '@program_transform_name@')
  
  # the launcher needs to know $(bindir) and $(datadir) which can be different at
- # make-time from configure-time
- edit_launcher_script = sed \
-   -e 's|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g' \
--  -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \
-+  -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(itweb_javaws)|g' \
-   -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \
-   -e 's|[@]JAVA[@]|$(JAVA)|g' \
-   -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g'
-@@ -743,8 +743,8 @@
- # Top-Level Targets
+@@ -739,7 +739,7 @@
  # =================
  
--all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
+ all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
 - javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop
-+all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(itweb_javaws) \
 + itweb-javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop
  
  check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
  
-@@ -764,24 +764,26 @@
- @ENABLE_PLUGIN_TRUE@	${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir)
+@@ -760,24 +760,26 @@
  @ENABLE_PLUGIN_TRUE@	${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
  	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
+ 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
 -	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
-+	${INSTALL_SCRIPT} launcher.build/$(itweb_javaws) $(DESTDIR)$(bindir)
++	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
  	${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
 -	${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
 +	${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
@@ -60,18 +50,16 @@
  @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 done)
  
  uninstall-local:
-@@ -790,8 +792,8 @@
+@@ -786,7 +788,7 @@
  	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
  	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp
  	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
 -	rm -f $(DESTDIR)$(mandir)/man1/javaws.1
--	rm -f $(DESTDIR)$(bindir)/$(javaws)
 +	rm -f $(DESTDIR)$(mandir)/man1/itweb-javaws.1
-+	rm -f $(DESTDIR)$(bindir)/$(itweb_javaws)
+ 	rm -f $(DESTDIR)$(bindir)/$(javaws)
  	rm -f $(DESTDIR)$(bindir)/$(itweb_settings)
  	rm -rf $(DESTDIR)$(htmldir)
- 
-@@ -879,8 +881,8 @@
+@@ -945,8 +947,8 @@
  
  netx-source-files.txt:
  	find $(NETX_SRCDIR) -name '*.java' | sort > $@
@@ -82,7 +70,7 @@
  
  stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
  	mkdir -p $(NETX_DIR)
-@@ -892,7 +894,8 @@
+@@ -958,7 +960,8 @@
  	(cd $(NETX_RESOURCE_DIR); \
  	 for files in $$(find . -type f); \
  	 do \
@@ -92,7 +80,7 @@
  	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
  	 done)
  	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
-@@ -920,10 +923,10 @@
+@@ -986,7 +989,7 @@
  	rm -f stamps/netx.stamp
  
  clean-desktop-files:
@@ -100,12 +88,8 @@
 +	rm -f itweb-javaws.desktop
  	rm -f itweb-settings.desktop
  
--# extras -- used to create about.jar for javaws.
-+# extras -- used to create about.jar for itweb-javaws.
- extra-source-files.txt:
- 	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
- 
-@@ -935,7 +938,8 @@
+ # extras -- used to create about.jar for javaws.
+@@ -1001,7 +1004,8 @@
  	(cd $(NETX_EXTRA_DIR); \
  	 for files in $$(find . -type f); \
  	 do \
@@ -115,43 +99,18 @@
  	   $(NETX_EXTRA_DIST_DIR)/$${files}; \
  	 done)
  	mkdir -p stamps
-@@ -949,7 +953,7 @@
- extra-lib/about.jar: stamps/extra-class-files.stamp
- 	$(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
- 
--launcher.build/$(javaws): launcher/javaws.in
-+launcher.build/$(itweb_javaws): launcher/javaws.in
- 	mkdir -p launcher.build
- 	$(edit_launcher_script) < $< > $@
- 
-@@ -958,14 +962,14 @@
- 	$(edit_launcher_script) < $< > $@
- 
- clean-launchers:
--	rm -f launcher.build/$(javaws)
-+	rm -f launcher.build/$(itweb_javaws)
- 	rm -f launcher.build/$(itweb_settings)
- 	if [ -e launcher.build ] ; then \
+@@ -1030,8 +1034,8 @@
  	  rmdir launcher.build ; \
  	fi
  
 -javaws.desktop: javaws.desktop.in
 -	sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
 +itweb-javaws.desktop: javaws.desktop.in
-+	sed "s#PATH_TO_JAVAWS#$(bindir)/$(itweb_javaws)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
++	sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
  
  itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
  	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
-@@ -1019,7 +1023,7 @@
- 	fi
- 
- stamps/check-pac-functions.stamp: stamps/bootstrap-directory.stamp
--	./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
-+	$(SHELL) ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
- 	  $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) ; \
- 	mkdir -p stamps && \
- 	touch $@
-@@ -1074,7 +1078,7 @@
+@@ -1146,7 +1150,7 @@
  	      notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
  	      $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
  	      if [ -n "$$notSrcFiles" ] ; then \
@@ -160,7 +119,7 @@
  	      fi ; \
  	      cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
  	      if [ -f $(META_MANIFEST) ]; \
-@@ -1129,7 +1133,7 @@
+@@ -1201,7 +1205,7 @@
  	      path="`dirname $$slashed_dir`" ; \
  	      file="`basename $$slashed_dir`.jar" ; \
  	      echo "copying $$dir.jar to $$path as $$file" ; \
@@ -169,7 +128,7 @@
  	      cp $$dir".jar" "$$path"/"$$file" ; \
  	    fi ; \
  	  done ; \
-@@ -1228,7 +1232,7 @@
+@@ -1308,7 +1312,7 @@
  	whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
  	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
  	class_names= ; \
@@ -178,7 +137,16 @@
  	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
  	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
  	  INLCUDE="NO" ; \
-@@ -1412,7 +1416,7 @@
+@@ -1334,7 +1338,7 @@
+ 	mv $(SOFTKILLER) $(TESTS_DIR)/
+ 
+ stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
+- javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \
++ itweb-javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \
+  stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public $(TESTS_DIR)/softkiller \
+  stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\
+  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
+@@ -1497,7 +1501,7 @@
  $(UNIT_CLASS_NAMES):
  	cd $(NETX_UNIT_TEST_DIR) ; \
  	class_names= ; \
@@ -187,7 +155,7 @@
  	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
  	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
  	  class_names="$$class_names $$class_name" ; \
-@@ -1423,10 +1427,7 @@
+@@ -1508,10 +1512,7 @@
   $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
  	filename=" " ; \
  	cd $(NETX_UNIT_TEST_SRCDIR) ; \
@@ -198,15 +166,15 @@
 +	tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
  	cd $(NETX_UNIT_TEST_DIR) ; \
  	class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- 	CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):. \
-@@ -1684,9 +1685,7 @@
+ 	CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \
+@@ -1995,9 +1996,7 @@
  @ENABLE_PLUGIN_TRUE@	 $(PLUGIN_TEST_SRCS) ;
  @ENABLE_PLUGIN_TRUE@	$(BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
  @ENABLE_PLUGIN_TRUE@	  plugin/tests/LiveConnect/*.class ;
 -@ENABLE_PLUGIN_TRUE@	cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
 -@ENABLE_PLUGIN_TRUE@	  plugin/tests/LiveConnect ;
 -@ENABLE_PLUGIN_TRUE@	echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
-+@ENABLE_PLUGIN_TRUE@	echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
++@ENABLE_PLUGIN_TRUE@	@echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
  @ENABLE_PLUGIN_TRUE@	mkdir -p stamps
  @ENABLE_PLUGIN_TRUE@	touch stamps/plugin-tests.stamp
  
diff --git a/java/icedtea-web/files/patch-launcher-javaws.in b/java/icedtea-web/files/patch-launcher-javaws.in
index a8917295168b..9c81542be193 100644
--- a/java/icedtea-web/files/patch-launcher-javaws.in
+++ b/java/icedtea-web/files/patch-launcher-javaws.in
@@ -1,16 +1,19 @@
---- launcher/javaws.in.orig	2012-03-05 11:04:20.493026000 -0500
-+++ launcher/javaws.in	2012-03-05 19:04:39.000000000 -0500
-@@ -1,11 +1,11 @@
--#!/bin/bash
-+#!%%LOCALBASE%%/bin/bash
- 
- JAVA=@JAVA@
- LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@
- LAUNCHER_FLAGS=-Xms8m
+--- launcher/javaws.in.orig	2013-05-03 15:08:24.149521000 -0400
++++ launcher/javaws.in	2013-06-10 19:49:57.000000000 -0400
+@@ -6,7 +6,7 @@
  CLASSNAME=net.sourceforge.jnlp.runtime.Boot
  BINARY_LOCATION=@JAVAWS_BIN_LOCATION@
+ SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@
 -PROGRAM_NAME=javaws
 +PROGRAM_NAME=itweb-javaws
  CP=@JRE@/lib/rt.jar
  
- JAVA_ARGS=( )
+ PROPERTY_NAME=deployment.jre.dir
+@@ -86,6 +86,6 @@
+   k=$((k+1))
+ done
+ 
+-exec -a "javaws" "${COMMAND[@]}"
++exec -a "itweb-javaws" "${COMMAND[@]}"
+ 
+ exit $?
diff --git a/java/icedtea-web/files/patch-netx-XDesktopEntry.java b/java/icedtea-web/files/patch-netx-XDesktopEntry.java
new file mode 100644
index 000000000000..a16de3eb52ee
--- /dev/null
+++ b/java/icedtea-web/files/patch-netx-XDesktopEntry.java
@@ -0,0 +1,11 @@
+--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig	2013-05-03 15:08:24.357518000 -0400
++++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java	2013-06-11 11:04:56.000000000 -0400
+@@ -102,7 +102,7 @@
+         }
+ 
+         //Shortcut executes the jnlp from cache and system preferred java..
+-        fileContents += "Exec=" + "javaws" + " \"" + cacheFile.getAbsolutePath() + "\"\n";
++        fileContents += "Exec=" + "itweb-javaws" + " \"" + cacheFile.getAbsolutePath() + "\"\n";
+ 
+         return new StringReader(fileContents);
+ 
diff --git a/java/icedtea-web/files/patch-tests-JNLPClassLoaderTest.java b/java/icedtea-web/files/patch-tests-JNLPClassLoaderTest.java
new file mode 100644
index 000000000000..b413981aec33
--- /dev/null
+++ b/java/icedtea-web/files/patch-tests-JNLPClassLoaderTest.java
@@ -0,0 +1,18 @@
+--- tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java.bak	2013-05-03 15:08:24.647515000 -0400
++++ tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	2013-06-11 17:32:48.000000000 -0400
+@@ -114,7 +114,7 @@
+     static private File createTempJar(String jarName, String manifestContents) throws Exception {
+         File dir = new File(cleanExec(null /* current working dir */, "mktemp", "-d"));
+         cleanExec(dir, "/bin/bash", "-c", "echo '" + manifestContents + "' > Manifest.txt");
+-        cleanExec(dir, "jar", "-cfm", jarName, "Manifest.txt");
++        cleanExec(dir, "%%JAR%%", "-cfm", jarName, "Manifest.txt");
+         return new File(dir.getAbsolutePath() + "/" + jarName);
+     }
+ 
+@@ -260,4 +260,4 @@
+          });
+         assertFalse(classLoader.hasMainJar());
+     }
+-}
+\ No newline at end of file
++}