SWIG high-level binding now uses camelCase.

Updated SWIG binding to support Java high-level classes.

Simplified java/Makefile.am (but now, it needs to be reworked by an
autotools expert).

ColdFusion simple Java test compiles ok.

3 files changed, 31 insertions, 68 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index d1f037ec..308b8897 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -27,41 +27,27 @@ libjlasso_la_LDFLAGS =	-no-undefined -avoid-version -module
 javashare_DATA = lasso.jar
 JAVA_JAR = lasso.jar
 
-SWIG_OUTPUTS = $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in
+SWIG_OUTPUTS = $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE)JNI.java
 JAVA_CRUFT = $(JAVA_PATH)$(JAVA_MODULE).class $(JAVA_MODULE)_wrap.o \
 	$(JAVA_JAR) \
-	$(JAVA_PATH)$(JAVA_MODULE)JNI.java
+	$(JAVA_PATH)$(JAVA_MODULE).java
 
 # The SWIG outputs are included in the distribution so SWIG is not
 # required to use the Java interface
-EXTRA_DIST = lasso-fragment.java $(SWIG_OUTPUTS)
+EXTRA_DIST = $(SWIG_OUTPUTS)
 
 CLEANFILES = $(JAVA_CRUFT)
 MAINTAINERCLEANFILES = $(SWIG_OUTPUTS)
 
 
-$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(top_srcdir)/swig/Lasso.i
+$(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java: $(top_srcdir)/swig/Lasso.i
 	here=`pwd`; \
-	$(SWIG) -v -java -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<; \
-	if test -r $(JAVA_MODULE)JNI.java; then \
-	  echo "Fixing SWIG 1.3.15+ broken Java API"; \
-	  rm -f $(JAVA_MODULE).java SWIGTYPE_*; \
-	  sed -e 's/class $(JAVA_MODULE)JNI/public class $(JAVA_MODULE)/' $(JAVA_MODULE)JNI.java > $(JAVA_MODULE).java; \
-	  sed -e 's/$(JAVA_MODULE)JNI/$(JAVA_MODULE)/g' $(JAVA_MODULE)_wrap.c > $(JAVA_MODULE)_wrap.c.new; \
-	  rm -f $(JAVA_MODULE)_wrap.c $(JAVA_MODULE)JNI.java; \
-	  mv $(JAVA_MODULE)_wrap.c.new $(JAVA_MODULE)_wrap.c; \
-	fi; \
-	mv $(JAVA_MODULE).java $(JAVA_MODULE).java.in
+	$(SWIG) -v -java -module $(JAVA_MODULE) -package $(JAVA_PACKAGE) -o $(JAVA_MODULE)_wrap.c $$here/$<
 
 # FIXME There must be a better way to do this with SWIG
-$(JAVA_PATH)$(JAVA_MODULE).java: $(JAVA_MODULE).java.in lasso-fragment.java
-	mkdir -p $(JAVA_PATH) 
-	cd $(JAVA_PATH) 
-	sed -e 's/^}//' $(JAVA_MODULE).java.in > $(JAVA_PATH)$(JAVA_MODULE).java.tmp
-	cat $(JAVA_PATH)$(JAVA_MODULE).java.tmp lasso-fragment.java > $@
-	echo "}" >> $@
-	rm -f $(JAVA_PATH)$(JAVA_MODULE).java.tmp
-
+$(JAVA_PATH)$(JAVA_MODULE).java: $(JAVA_MODULE).java
+	mkdir -p $(JAVA_PATH)
+	test -f $(JAVA_PATH)$(JAVA_MODULE).java || cp *.java $(JAVA_PATH)
 
 clean-local:
 	rm -f *.class
@@ -70,13 +56,11 @@ clean-local:
 all-local: $(JAVA_JAR)
 
 $(JAVA_PATH)$(JAVA_MODULE).class: $(JAVA_PATH)$(JAVA_MODULE).java
-	mkdir -p $(JAVA_PATH)
-	test -f $(JAVA_PATH)$(JAVA_MODULE).java || cp $(srcdir)/$(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_PATH)
-	$(JAVAC) $(JAVAC_FLAGS) $(JAVA_PATH)$(JAVA_MODULE).java
+	$(JAVAC) $(JAVAC_FLAGS) $(JAVA_PATH)*.java
 
 $(JAVA_JAR): $(JAVA_PATH)$(JAVA_MODULE).class 
 	rm -f $@
-	jar cf $@ $(JAVA_PATH)$(JAVA_MODULE).class 
+	jar cf $@ $(JAVA_PATH)*.class 
 
 $(DEPDIR)/libjlasso_la-lasso_wrap.Plo:
 	mkdir -p $(DEPDIR)
diff --git a/java/coldfusion/src/CFLasso.java b/java/coldfusion/src/CFLasso.java
index 824482bb..af6ea798 100644
--- a/java/coldfusion/src/CFLasso.java
+++ b/java/coldfusion/src/CFLasso.java
@@ -26,7 +26,7 @@
  * Simple wrapper for JLasso, to ease its use by ColdFusion applications.
  *
  * To use it:
- * $ javac -classpath ../lasso-devel/java/target/lasso.jar CFLasso.java
+ * $ javac -classpath ../../lasso.jar CFLasso.java
  * Edit ColdFusion file bin/jvm.config:
  *   - Add libjlasso.so directory to java.library.path variable.
  *   - Add classes directory to java.class.path variable.
@@ -34,41 +34,41 @@
 
 
 public class CFLasso {
-    protected com.entrouvert.lasso.LassoServer getServerContext() {
-        com.entrouvert.lasso.LassoServer serverContext = new com.entrouvert.lasso.LassoServer(
+    protected com.entrouvert.lasso.Server getServer() {
+        com.entrouvert.lasso.Server server = new com.entrouvert.lasso.Server(
             "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/metadata.xml'",
-	    NULL, //"/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/public-key.pem",
+	    null, //"/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/public-key.pem",
             "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/private-key-raw.pem",
             "/home/manou/projects/lasso/lasso-devel/tests/data/sp1-la/certificate.pem",
-            com.entrouvert.lasso.Lasso.signatureMethodRsaSha1);
-        serverContext.addProvider(
+            com.entrouvert.lasso.lasso.signatureMethodRsaSha1);
+        server.addProvider(
             "/home/manou/projects/lasso/lasso-devel/tests/data/idp1-la/metadata.xml",
             "/home/manou/projects/lasso/lasso-devel/tests/data/idp1-la/public-key.pem",
             "/home/manou/projects/lasso/lasso-devel/tests/data/ca1-la/certificate.pem");
-	return serverContext;
+	return server;
     }
 
     public String login(String relayState) {
-	com.entrouvert.lasso.LassoAuthnRequest authnRequest;
-	com.entrouvert.lasso.LassoLogin loginContext;
-	com.entrouvert.lasso.LassoServer serverContext;
+	com.entrouvert.lasso.AuthnRequest authnRequest;
+	com.entrouvert.lasso.Login login;
+	com.entrouvert.lasso.Server server;
 	String authnRequestUrl;
 
-	com.entrouvert.lasso.Lasso.init();
+	// com.entrouvert.lasso.lasso.init();
 
-	serverContext = getServerContext();
-        loginContext = new com.entrouvert.lasso.LassoLogin(serverContext, null);
-        loginContext.initAuthnRequest("https://idp1:1998/metadata");
-	authnRequest = (com.entrouvert.lasso.LassoAuthnRequest) loginContext.getRequest();
-        authnRequest.setPassive(false);
-        authnRequest.setNameIdPolicy(com.entrouvert.lasso.Lasso.libNameIdPolicyTypeFederated);
-        authnRequest.setConsent(com.entrouvert.lasso.Lasso.libConsentObtained);
+	server = getServer();
+        login = new com.entrouvert.lasso.Login(server);
+        login.initAuthnRequest(com.entrouvert.lasso.lasso.httpMethodRedirect);
+	authnRequest = login.getAuthnRequest();
+        authnRequest.setIsPassive(false);
+        authnRequest.setNameIdPolicy(com.entrouvert.lasso.lasso.libNameIdPolicyTypeFederated);
+        authnRequest.setConsent(com.entrouvert.lasso.lasso.libConsentObtained);
 	if (relayState != null)
 	    authnRequest.setRelayState(relayState);
-        loginContext.buildAuthnRequestMsg();
-        authnRequestUrl = loginContext.getMsgUrl();
+        login.buildAuthnRequestMsg("https://sp1/metadata");
+        authnRequestUrl = login.getMsgUrl();
 
-	com.entrouvert.lasso.Lasso.shutdown();
+	// com.entrouvert.lasso.lasso.shutdown();
 
 	return authnRequestUrl;
     }
diff --git a/java/lasso-fragment.java b/java/lasso-fragment.java
deleted file mode 100644
index 6e0d0542..00000000
--- a/java/lasso-fragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-    // START lasso-fragment.java
-
-    //
-    // -*- Mode: java; c-basic-offset: 4 -*-
-    //
-    // lasso-fragment.java - Inserted Java fragment for generated SWIG code
-    //
-    // $Id$
-    //
-
-    static
-    {
-        // Load a library whose "core" name is 'jlasso'
-        // Operating system specific stuff will be added to make from this an
-        // actual filename: Under Unix this will become libjlasso.so
-        // while under Windows it will likely become something like
-        // jlasso.dll
-        System.loadLibrary("jlasso");
-    }
-
-    // END lasso-fragment.java