From cbfc548c6f996a99ad3e5dd9dcb01ab76d3a3289 Mon Sep 17 00:00:00 2001
From: clay_shooter <clay_shooter>
Date: Sat, 1 Oct 2011 15:18:56 +0000
Subject: [PATCH] Finally moved up to 1.15.  Also added 3137337 JNLP Example

---
 docs/ReleaseNotes.html                        |   7 +-
 samples/com/jacob/samples/applet/AppTest.java |  58 ------------
 samples/com/jacob/samples/applet/Applet.html  |  20 ++++
 samples/com/jacob/samples/applet/Applet.jnlp  |  27 ++++++
 .../jacob/samples/applet/JacobTestApplet.java |  88 ++++++++++++++++++
 samples/com/jacob/samples/applet/Readme.txt   |  59 ++++++++++++
 .../test/safearray/SafeArrayBasicTest.java    | Bin 20648 -> 20018 bytes
 7 files changed, 200 insertions(+), 59 deletions(-)
 delete mode 100644 samples/com/jacob/samples/applet/AppTest.java
 create mode 100644 samples/com/jacob/samples/applet/Applet.html
 create mode 100644 samples/com/jacob/samples/applet/Applet.jnlp
 create mode 100644 samples/com/jacob/samples/applet/JacobTestApplet.java
 create mode 100644 samples/com/jacob/samples/applet/Readme.txt
diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index e220cbe..771f064 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -1,7 +1,7 @@
 <HTML>
 <BODY>
 <!--  ---------  -->
-<h2>JACOB 1.15 M4</h2>
+<h2>JACOB 1.15</h2>
 <h3>What's New</h3>
 <ul>
 <li>
@@ -65,6 +65,11 @@
   <tr>
     <td colspan="2"><b>Feature Requests</b></td>
   </tr> 
+  <tr>
+  </tr>
+    <td width="13%" valign="top">3137337</td>
+    <td width="87%" valign="top">Add JNLP Applet example. Read the README to understand what jar 
+        file signing and file placement is required</td>
   <tr>
     <td width="13%" valign="top">2963102</td>
     <td width="87%" valign="top">Convert API to use var args and remove the many overloaded Dispatch 
diff --git a/samples/com/jacob/samples/applet/AppTest.java b/samples/com/jacob/samples/applet/AppTest.java
deleted file mode 100644
index ca9cc82..0000000
--- a/samples/com/jacob/samples/applet/AppTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.jacob.samples.applet;
-
-import java.applet.Applet;
-import java.awt.Button;
-import java.awt.FlowLayout;
-import java.awt.TextField;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import com.jacob.activeX.ActiveXComponent;
-import com.jacob.com.Dispatch;
-import com.jacob.com.Variant;
-
-/**
- * Applet test case
- */
-public class AppTest extends Applet implements ActionListener {
-	/**
-	 * unique identifier added by Eclipse because this class is serializable
-	 */
-	private static final long serialVersionUID = -6676420357823607065L;
-
-	TextField in;
-
-	TextField out;
-
-	Button calc;
-
-	ActiveXComponent sC = null;
-
-	/**
-	 * startup method
-	 */
-	public void init() {
-		setLayout(new FlowLayout());
-		add(in = new TextField("1+1", 16));
-		add(out = new TextField("?", 16));
-		add(calc = new Button("Calculate"));
-		calc.addActionListener(this);
-
-	}
-
-	/**
-	 * action method that receives button actions
-	 * 
-	 * @param ev
-	 *            the event
-	 */
-	public void actionPerformed(ActionEvent ev) {
-		if (sC == null) {
-			String lang = "VBScript";
-			sC = new ActiveXComponent("ScriptControl");
-			Dispatch.put(sC, "Language", lang);
-		}
-		Variant v = Dispatch.call(sC, "Eval", in.getText());
-		out.setText(v.toString());
-	}
-}
diff --git a/samples/com/jacob/samples/applet/Applet.html b/samples/com/jacob/samples/applet/Applet.html
new file mode 100644
index 0000000..0c2f6b2
--- /dev/null
+++ b/samples/com/jacob/samples/applet/Applet.html
@@ -0,0 +1,20 @@
+<html>
+	<head>
+		<title>Jacob Test Applet</title>
+	</head>
+	<body>
+		<applet code="com.jacob.samples.applet.JacobTestApplet"
+			name="JacobTestApplet"  
+			width="400" 
+			height="50" 
+			alt="Please install java first! (Java is available for free at www.java.com)">
+			<param name="jnlp_href" value="Applet.jnlp">
+			Java is not working! Several reasons:<br/>
+			1.) Your Browser is not able to execute java (-> get a different browser e.g. firefox.com)<br/>
+			2.) Java is not installed (-> install java e.g. java.com)<br/>
+			3.) Java is disabled/deactivated (-> enable java in your web browser)<br/>
+			4.) Your security settings are too tight (->enable java the settings)<br/>
+			5.) Contact support @ nepatec<br/>
+		</applet>
+	</body>
+</html>
diff --git a/samples/com/jacob/samples/applet/Applet.jnlp b/samples/com/jacob/samples/applet/Applet.jnlp
new file mode 100644
index 0000000..9b25bef
--- /dev/null
+++ b/samples/com/jacob/samples/applet/Applet.jnlp
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <jnlp href="Applet.jnlp" spec="1.0+" version="1.1">
+ 		
+ 	<information>
+       		<title>Jacob Test Applet</title>
+		<vendor>ttreeck, nepatec GmbH &amp; Co. KG</vendor>
+		<offline-allowed />
+     	</information>
+     	
+	<security> 
+		<all-permissions/> 
+	</security> 
+
+	<resources>
+       		<j2se href="http://java.sun.com/products/autodl/j2se" version="1.6.0_20+" />
+			<jar href="lib/JacobTestApplet.jar-selfSigned.jar" main="true" version="1.0.0" />
+			<jar href="lib/jacob-signed.jar" version="1.0.0" />
+			<nativelib href="lib/jacob-dll-1.15-M3-signed.jar"/>
+	</resources>
+		
+	<applet-desc 
+         	name="JacobTestApplet"
+         	main-class="com.jacob.samples.applet.JacobTestApplet"
+         	width="400"
+         	height="50">
+	</applet-desc>
+ </jnlp>
diff --git a/samples/com/jacob/samples/applet/JacobTestApplet.java b/samples/com/jacob/samples/applet/JacobTestApplet.java
new file mode 100644
index 0000000..6e7b4d3
--- /dev/null
+++ b/samples/com/jacob/samples/applet/JacobTestApplet.java
@@ -0,0 +1,88 @@
+package com.jacob.samples.applet;
+
+import java.applet.Applet;
+import java.awt.Button;
+import java.awt.FlowLayout;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import com.jacob.activeX.ActiveXComponent;
+import com.jacob.com.Dispatch;
+import com.jacob.com.Variant;
+
+/**
+ * Example applet to demonstrate:
+ * 1. The use of jacob from an applet
+ * 2. To show how to distribute the jacob native lib with the applet (also works with webstart)
+ * 
+ * Comment on 2.:
+ * The way shown here is quite straight forward and it is not necessary to use 
+ * a mechanism like the "DLLFromJARClassLoader" or something similar...
+ * 
+ *  @author ttreeck, www.nepatec.de
+ * 
+ */
+
+public class JacobTestApplet extends Applet implements ActionListener {
+
+	private static final long serialVersionUID = 4492492907986849158L;
+
+	TextField in;
+	TextField out;
+	Button calc;
+	ActiveXComponent sC = null;
+
+	/**
+	 * startup method
+	 */
+	@Override
+	public void init() {
+		setLayout(new FlowLayout());
+		add(this.in = new TextField("1+1", 16));
+		add(this.out = new TextField("?", 16));
+		add(this.calc = new Button("Calculate"));
+		this.calc.addActionListener(this);
+
+	}
+
+	/**
+	 * Returns information about this applet. 
+	 * According to the java spec:
+	 * "An applet should override this method to return a String containing information about the author, version, and copyright of the applet." 
+	 * 
+	 * @return information about the applet. 
+	 */
+	@Override
+	public String getAppletInfo() {
+		return "Jacob Test Applet. Written by ttreeck, nepatec GmbH & Co. KG.\nhttp://www.nepatec.de";
+	}
+	
+	/**
+	 * Returns information about the parameters that are understood by this applet.
+	 * According to the java spec:
+	 * "An applet should override this method to return an array of Strings describing these parameters."
+	 * 
+	 * @return array with a set of three Strings containing the name, the type, and a description. 
+	 */
+
+	@Override
+	public String[][] getParameterInfo(){
+        return new String[][]{};
+	}
+
+	/**
+	 * action method that receives button actions
+	 * 
+	 * @param ev the event
+	 */
+	public void actionPerformed(ActionEvent ev) {
+		if (this.sC == null) {
+			String lang = "VBScript";
+			this.sC = new ActiveXComponent("ScriptControl");
+			Dispatch.put(this.sC, "Language", lang);
+		}
+		Variant v = Dispatch.call(this.sC, "Eval", this.in.getText());
+		this.out.setText(v.toString());
+	}
+}
\ No newline at end of file
diff --git a/samples/com/jacob/samples/applet/Readme.txt b/samples/com/jacob/samples/applet/Readme.txt
new file mode 100644
index 0000000..2347c72
--- /dev/null
+++ b/samples/com/jacob/samples/applet/Readme.txt
@@ -0,0 +1,59 @@
+There is an easy and elegant way to load DLLs from Applets and JavaWebStart Applications.
+
+Both JavaWebStart and Applets support JNLP (Applets since 1.6.0_10 aka plugin2). 
+Within a jnlp file it is possible to specify a nativelib and that's it!
+So what do you need to do?
+
+1.) package the jacob-1.XX-xXX.dll into a jar file (root level of the jar, not into a subfolder) and put it into your applications lib folder next to your other libs (e.g. jacob.jar)
+2.) Specify all your libraries in your jnlp file like this:
+
+<?xml version="1.0" encoding="UTF-8"?>
+ <jnlp href="MyApplicaton.jnlp" spec="1.0+" version="1.1">
+ 		
+ 	<information>
+       		<title>My cool Application or Applet</title>
+		<vendor>nepatec GmbH &amp; Co. KG</vendor>
+		<offline-allowed />
+     	</information>
+     	
+	<security> 
+		<all-permissions/> 
+	</security> 
+
+	<resources>
+       		<j2se href="http://java.sun.com/products/autodl/j2se" version="1.6.0_10+" />
+			<jar href="MyCoolApp.jar" main="true" version="1.0.0" />
+			<jar href="jacob.jar" version="1.0.0" />
+			<nativelib href="jacob-1.XX-xXX.jar"/>
+	</resources>
+
+	<!-- Use either this for an applet -->		
+	<applet-desc 
+         	name="MyCoolApp"
+         	main-class="de.nepatec.app.MyCoolApplet"
+         	width="265"
+         	height="60">
+	</applet-desc>
+
+	<!-- or this for an web start application -->	
+	<application-desc main-class="de.nepatec.app.MyCoolApp">
+		<argument>some crazy arguments</argument>      
+	</application-desc>
+ </jnlp>
+
+3.) Sign all the jars or set up a policy file (cp. Applet Security below)
+4.) Deploy your application and start it via webstart or as an applet (from an webpage)
+
+
+General comments:
+
+- If you sign the jar files you need the <security> tag - when using a policy file it can be removed
+- furthermore it is recommended that all libs are signed with an official certificate (e.g. from verisign, thawte etc) so that the browser doesn't pop a warning stating 'untrusted' application...
+- to check the validity of your jnlp file the tool JaNeLA (link cp. sources below) is recommended.
+
+[Sources]
+New Applet:	 https://jdk6.dev.java.net/plugin2/
+Applet JNLP: 	 https://jdk6.dev.java.net/plugin2/jnlp/
+Applet Security: http://java.sun.com/developer/onlineTraining/Programming/JDCBook/appA.html
+JNLP API: 	 http://www.oracle.com/technetwork/java/javase/index-141367.html
+JNLP Verifier:	 http://pscode.org/janela/
\ No newline at end of file
diff --git a/unittest/com/jacob/test/safearray/SafeArrayBasicTest.java b/unittest/com/jacob/test/safearray/SafeArrayBasicTest.java
index a41f220efbdb641ea6978ffa75affcf01da080be..df04e4d52a23303553151f3fb34bc3a0062d9bf1 100644
GIT binary patch
delta 2070
zcmcgtT})GF82&2KQrlypLwa05+5+YDi1b(*9BnC-T8gGWL|}1q$(X{BEGQ6{sf%RU
z92;AvbPtO`Oq7`H=faqHXN>#FZgz)WZ^mi1t7XY{vFyrq?{|Jmlyw2KEGIpEzw^D{
z`@YZn^L(E#n{He(&8JL4KHWvH`FK7r=N~yyW$LpEEWl)X1ROQBS==PKN&eKdgv6#^
zL0d=JB#Y74i<^Kz*%jO^6CJuHY0G3mz+Yv@>jh>ttdV4BXcE_%uWi81%|1NXJd7#-
z`z8T*%7@Two<WuMBs`W`tCh~3VFKw^_Sd5>ID$xpkMw?Q-&xN0#&M@>4^}F=^%JK_
zHp8~XZqZM2P2{$mqy2-Zx7(4hxyiDEPizNpPiUua;$ynU?F*{zb^BJlCUD&}`TIc_
z+hxR}N3;%X%UiuFf^l|?oq!VXBbTm(#S!9Yaksn?zc^ZoI9|Y?6{3N>7?Xk9<McN3
ze5%=4hwmk4H|{xS$<qwQ-|gM4`s=K2#YFXKRQ2zGW!tN|H!o~8X*C<?YgRL7c;4x1
z+@NO(D=ty<F204hSNWfOk0Ixod;;+WZ;<NW1EIm_k=Zr5z27Kp0AUURuiYv!KXvq*
z)R|e&6u$Ay6mkCd9vkp-lMnATO&9y-3!j4TeZ@I>ir%~_$@p3NplGpP4q-^1E!lq)
zEwVOuC^aDim}?cEB9cODBboxM*iuR>-cYDVH4a!)t#^VO>&HS+g1_x!9jOl!AqAI1
zZ<n&K`lDILu}+sQNLBW;h{`~mNlIZK!pd{i+e<P8%pHqZ?$}ZHBn!G3=hA65s`BZ>
zjyzruM=6IIS8{uN=8ct`CD}>RA7w|_33`vPF!kS0;ec*8N^D!Srk^u-wh**qG$LY3
zti@8~ApVFf;KOJyEXfuWqG3cj2b<Q%E?;+M;D}8Z^E4dWj;pbD>W)eOoI2?rb%pS4
zm(ff6;fO!0vx^yH@!H2KdM$n!RXxu?^AFsHvptK%pT>>CZ;MQ#9q%Sy#Dl~z_b1lj
z$lldReoNF@jB1&ahX|7bBnPR|H7F#HV!U?{U-gb)cb|fxR1kBiLEKOE(|Xv(bFDoR
z$PR9i&aZth(S8kH*%$to+J3q3)S4)rIJKYOQ)d&0O2=BR#tLtGfHW(uyYN}M8n@Fv
zla*F3JW9*(XQVQUN?lK6WGrU*6n>X!#_yTExRtBLKvu$;EYHTnY#Us;EXHyNXeUcw
WTd=1;)@<P7H-{!0lJ?Kv^!poj+s_pM

delta 2625
zcmc&$Uu=_A6u+fgM!$7iH!LlUvn~C%wJTj2uytMOy3%#5tqz+-iJ5Le9HOyx#+XGA
zl^8%?*iIA}#teM%!9QPk@WJ4lA(|Ljf-z!D+_ReKgYWpe_xrx~TT`&QMAP*2+;h)8
z=iJ{p=bm1F&+y?@!-Z_K#M+p&G?7%9vnhkL^i=}ntcL;y|2DDDA}ojxG?|M9=?|lo
zN(M)(SV00gT`*iRNEF<X?bM_rtjzX{z1Ox7_AJJ$pt5m?Rnt)I!8*6_gR#`Bcr)qz
znYc&A2UB=Odn)Rq^G#k@{G@3Pbj^ECxdP4Fee^|hKV-i(p8~a57L5`!(YnJ;;o#F9
z;PE*rZo~bqJ5EFE&z69C{##QB>y?fKo!&ZHbAHBj9Jj8VCq?&$J54`JX39!jf7N^#
ztG=qw)>%kp>!8rN)oQL|p&WWgoIF!G^>JSxBy0Po>Fc(xxX!0OcJS5A+zY94*h8WA
zov@Z~e}&uho&)75l{&bOl@2bgL1{yb3PP7UJ$tqMRM2ZUf?v1yP}0{<@h%D8g0?fD
zYu-~vo`HUQ6suW#5%imFuY#^SoRr(~3^;vUIY%B6*_y5s-HGkKO-08ur$i;&-T?pq
z$JFBL(;+tDdJ$38B8DDt?}q$_o7b=&D^z+Nlx})@H-S=%YYbkLNMu`y0&WY|8dCpl
zEHSSizMu5I1X``=lRn<}ANlI^{ib_pF%X39Yk~6{Jl^TqgSEMr*Yn@w?+Ar9yfXLh
z`yz$H_D#l|MNFTCs|d-vifzhEa)cdYb8La8whqu;_f9$zaWoWvQ}o|<*;F(K4=YhV
z399+Jvzu41G|*V}KCrj9LG+&WH1J~5ql1^>{g*+f(00|#85iRdY=IqBr<i|e3EHmM
zL-gH{6H`umZ}~L9E4CbSi|t6o*a#kHodNZLHohWsC1%G7+15?BVvmFK5Az}L`7qM9
z9G?f9Pe<uu+#BV-{@IJW9xvd0Ib@|`m!IZGhOl~n<S`Y!D*hiN_CSUkkPO}56E8qd
zU&S+~9&#pmZOGOHy_|fo=1rNWyGe&?Vb<PFvC)0q_ni^+=ICWngB)!Q3LhOz@h&=%
zdII$O)SMb8hh}<g0kWH8YTqo!!{kiwf+(MU3v?~bTm9h!)1cQ59IcGc$ap&qW_WQO
z%kVu{)<(B8!@B+bkUl?t81&2W8KH4VWKM%x`$cL2P-V>0+u6ms7qC!j!mkE?-;2Q4
zPX~*tX8&Xg>+)nkM7C<S(WjF^!Ivj(ol!P}zdi|kkF&TavRp<*8{70$&Z3$r=K?VE
zZY~4*qoAvWFy-<*yL`gFo*%%@_533!twK>KbyKOp@mVcAHy}!Ymw{SloYV74@o5sV
F`V06j=F|WH

