summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEmmanuel Raviart <eraviart@entrouvert.com>2004-09-04 07:49:28 +0000
committerEmmanuel Raviart <eraviart@entrouvert.com>2004-09-04 07:49:28 +0000
commit5b925b28df42a8d3a31084cd21f241301d7bcc72 (patch)
treec7e9fa6178eb3a0b377830d7d8b3ea118dfdcc6d /java
parent76c318374de0edf6f60fe218c9fe7822ab1f21fd (diff)
downloadlasso-5b925b28df42a8d3a31084cd21f241301d7bcc72.tar.gz
lasso-5b925b28df42a8d3a31084cd21f241301d7bcc72.tar.xz
lasso-5b925b28df42a8d3a31084cd21f241301d7bcc72.zip
Corrected Java.
Diffstat (limited to 'java')
-rw-r--r--java/Makefile.am3
-rw-r--r--java/coldfusion/src/CFLasso.java15
2 files changed, 11 insertions, 7 deletions
diff --git a/java/Makefile.am b/java/Makefile.am
index 24ebfca4..cf2fa6b6 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -41,7 +41,8 @@ lasso_wrap.c lasso.java: $(top_srcdir)/swig/Lasso.i
# FIXME There must be a better way to do this with SWIG
$(JAVA_PATH)lasso.java: lasso.java
mkdir -p $(JAVA_PATH)
- test -f $(JAVA_PATH)lasso.java || cp $(srcdir)/*.java $(JAVA_PATH)
+ rm -f $(JAVA_PATH)/*
+ cp $(srcdir)/*.java $(JAVA_PATH)
clean-local:
rm -f *.class
diff --git a/java/coldfusion/src/CFLasso.java b/java/coldfusion/src/CFLasso.java
index af6ea798..237d9001 100644
--- a/java/coldfusion/src/CFLasso.java
+++ b/java/coldfusion/src/CFLasso.java
@@ -25,9 +25,12 @@
/*
* Simple wrapper for JLasso, to ease its use by ColdFusion applications.
*
- * To use it:
+ * To compile it:
* $ javac -classpath ../../lasso.jar CFLasso.java
- * Edit ColdFusion file bin/jvm.config:
+ * To test it:
+ * $ export LD_LIBRARY_PATH=../../.libs/
+ * $ java -classpath ../../lasso.jar:. CFLasso
+ * To use it, edit ColdFusion file bin/jvm.config:
* - Add libjlasso.so directory to java.library.path variable.
* - Add classes directory to java.class.path variable.
*/
@@ -40,7 +43,7 @@ public class CFLasso {
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);
+ com.entrouvert.lasso.lassoConstants.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",
@@ -58,11 +61,11 @@ public class CFLasso {
server = getServer();
login = new com.entrouvert.lasso.Login(server);
- login.initAuthnRequest(com.entrouvert.lasso.lasso.httpMethodRedirect);
+ login.initAuthnRequest(com.entrouvert.lasso.lassoConstants.httpMethodRedirect);
authnRequest = login.getAuthnRequest();
authnRequest.setIsPassive(false);
- authnRequest.setNameIdPolicy(com.entrouvert.lasso.lasso.libNameIdPolicyTypeFederated);
- authnRequest.setConsent(com.entrouvert.lasso.lasso.libConsentObtained);
+ authnRequest.setNameIdPolicy(com.entrouvert.lasso.lassoConstants.libNameIdPolicyTypeFederated);
+ authnRequest.setConsent(com.entrouvert.lasso.lassoConstants.libConsentObtained);
if (relayState != null)
authnRequest.setRelayState(relayState);
login.buildAuthnRequestMsg("https://sp1/metadata");