NDT-DEV email list created

Revision: 901
Author:   

Date:     Wed Feb 12 07:16:35 2014 UTC
Log:      Merged AppletIssue120 branch into trunk
http://code.google.com/p/ndt/source/detail?r=901

Modified:
 /trunk
 /trunk/Applet/Makefile.am
 /trunk/configure.ac

=======================================
--- /trunk/Applet/Makefile.am   Wed Feb  5 13:38:45 2014 UTC
+++ /trunk/Applet/Makefile.am   Wed Feb 12 07:16:35 2014 UTC
@@ -18,6 +18,7 @@
 GCJLINK = $(GCJLD)
 CLASSPATH_ENV =
 NDTGCJFLAGS = -d bin -sourcepath src
+NDTJARSIGNERFLAG = -keystore
 TEMPDIRS = bin dist

 ndtdir = $(prefix)/ndt
@@ -87,6 +88,9 @@
 Tcpbw100.jar:  $(TEMPDIRS) all.class
        cp -r src/edu/internet2/ndt/locale  bin/edu/internet2/ndt/
        $(NDTJAR) $(NDTJARFLAG) MANIFEST.MF dist/Tcpbw100.jar -C bin .
+       if test -n "$(CERTIFICATE_FILE)"; then \
+		$(NDTJARSIGNER) $(NDTJARSIGNERFLAG) $(CERTIFICATE_FILE) $(ndt_DATA)  
$(ALIAS); \
+       else :; fi
        echo timestamp > classTcpbw100.stamp


=======================================
--- /trunk/configure.ac Wed Feb  5 13:31:05 2014 UTC
+++ /trunk/configure.ac Wed Feb 12 07:16:35 2014 UTC
@@ -88,7 +88,32 @@
        AM_CONDITIONAL(BUILD_APPLET, false)
 fi

-# Enabling.disabling flash client build
+# Using certificate to sign java applet
+AC_ARG_WITH(cert,
+               AC_HELP_STRING([--with-cert=<file>],
+                               [certificate file to be used to sign java 
applet]),
+               [cert="$withval"]
+)
+
+AC_ARG_WITH(alias,
+               AC_HELP_STRING([--with-alias=<alias>],
+				[alias to be used during java applet signing (NOTE: specifying alias  
is required when using --with-cert option]),
+               [alias="$withval"]
+)
+
+if test "$with_cert" != "no"; then
+       CERTIFICATE_FILE=$with_cert
+       ALIAS=$with_alias
+else
+       CERTIFICATE_FILE=""
+       ALIAS=$with_alias
+fi
+
+AC_SUBST(CERTIFICATE_FILE)
+AC_SUBST(ALIAS)
+
+
+# Enabling/disabling flash client build
 AC_ARG_ENABLE(flash, [  --enable-flash=[yes/no] turn on flash client build
               [default=yes]],, enable_flash=yes)

@@ -98,7 +123,6 @@
        AM_CONDITIONAL(BUILD_FLASH_CLT, false)
 fi

-
 AC_ARG_WITH(I2util,
                AC_HELP_STRING([--with-I2util=<dir>],
                                [defaults to building I2util under owamp if 
exists]),
@@ -263,9 +287,11 @@

 NDTJAR=jar
 NDTJARFLAG='-cmf'
+NDTJARSIGNER=jarsigner

 AC_SUBST(NDTJAR)
 AC_SUBST(NDTJARFLAG)
+AC_SUBST(NDTJARSIGNER)

 # Flash application compiler
 NDTMXMLC=mxmlc