NDT-DEV email list created

Revision: 1111
Author:   

Date:     Mon Jun 23 19:06:26 2014 UTC
Log:      Swap out json-smart for json-simple to avoid security exceptions  
in the java applet


http://code.google.com/p/ndt/source/detail?r=1111

Added:
 /trunk/Applet/lib
 /trunk/Applet/lib/json-simple-1.1.1.jar
Deleted:
 /trunk/Applet/src/edu/internet2/ndt/lib
Modified:
 /trunk/Applet/Makefile.am
 /trunk/Applet/src/edu/internet2/ndt/JSONUtils.java
 /trunk/conf/tcpbw100.default.html
 /trunk/src/fakewww.c

=======================================
--- /dev/null   
+++ /trunk/Applet/lib/json-simple-1.1.1.jar     Mon Jun 23 19:06:26 2014 UTC
Binary file, no diff available.
=======================================
--- /trunk/Applet/Makefile.am   Wed Jun 18 07:54:29 2014 UTC
+++ /trunk/Applet/Makefile.am   Mon Jun 23 19:06:26 2014 UTC
@@ -17,8 +17,8 @@

 GCJLINK = $(GCJLD)
 CLASSPATH_ENV =
-jsonlib = lib/json-smart-1.1.1.jar
-NDTGCJFLAGS = -d bin -sourcepath src -cp src/edu/internet2/ndt/$(jsonlib)
+jsonlib = lib/json-simple-1.1.1.jar
+NDTGCJFLAGS = -d bin -sourcepath src -cp $(jsonlib)
 NDTJARSIGNERFLAG = -keystore
 TEMPDIRS = bin dist

@@ -89,9 +89,11 @@

 #Include all classes into jar
 Tcpbw100.jar:  $(TEMPDIRS) all.class
-       cp -r src/edu/internet2/ndt/locale  bin/edu/internet2/ndt/
+       mkdir -p bin/edu/internet2/ndt/locale
+       cp -r src/edu/internet2/ndt/locale/*  bin/edu/internet2/ndt/locale
        $(NDTJAR) $(NDTJARFLAG) MANIFEST.MF dist/Tcpbw100.jar -C bin .
-       cp -r src/edu/internet2/ndt/lib  dist
+       mkdir -p dist/lib
+       cp -r lib/*  dist/lib
        if test -n "$(CERTIFICATE_FILE)"; then \
 		$(NDTJARSIGNER) $(NDTJARSIGNERFLAG) $(CERTIFICATE_FILE) $(ndt_DATA)  
$(ALIAS); \
 		$(NDTJARSIGNER) $(NDTJARSIGNERFLAG) $(CERTIFICATE_FILE) dist/$(jsonlib)  
$(ALIAS); \
@@ -110,4 +112,4 @@
                        
src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties \
                        
src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties \
                        
src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties \
-                       src/edu/internet2/ndt/lib/json-smart-1.1.1.jar
+                       $(jsonlib)
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/JSONUtils.java	Wed May 28 11:17:18  
2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/JSONUtils.java	Mon Jun 23 19:06:26  
2014 UTC
@@ -1,7 +1,7 @@
 package edu.internet2.ndt;

-import net.minidev.json.JSONObject;
-import net.minidev.json.JSONValue;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
 import java.util.Iterator;
 import java.util.Map;

=======================================
--- /trunk/conf/tcpbw100.default.html   Fri Jun 20 14:26:21 2014 UTC
+++ /trunk/conf/tcpbw100.default.html   Mon Jun 23 19:06:26 2014 UTC
@@ -30,7 +30,7 @@
      built into the java program.  -->

 <table align=center><tr><td>
-<applet code=Tcpbw100.class ARCHIVE="Tcpbw100.jar"
+<applet code=edu.internet2.ndt.Tcpbw100.class  
ARCHIVE="Tcpbw100.jar,lib/json-simple-1.1.1.jar"
    width=700 height=320>
 <!--
   <PARAM NAME="H" VALUE="ncren.net">
=======================================
--- /trunk/src/fakewww.c        Wed Mar 20 15:05:33 2013 UTC
+++ /trunk/src/fakewww.c        Mon Jun 23 19:06:26 2014 UTC
@@ -73,7 +73,7 @@
   "/Tcpbw100$3.class", "/Tcpbw100$OsfwWorker.class",
   "/Tcpbw100$Message.class", "/Tcpbw100$StatusPanel$1.class",
   "/Tcpbw100$clsFrame$1.class", "/Tcpbw100$TestWorker.class",
-  "/crossdomain.xml", 0 };
+  "/lib/json-simple-1.1.1.jar", "/crossdomain.xml", 0 };

 typedef struct allowed {
   char* filename;