[sword-svn] r2064 - in trunk/bindings/corba: java java/src/org/crosswire/sword/orb orbitcpp

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-08-01 10:39:12 -0700 (Wed, 01 Aug 2007)
New Revision: 2064

Modified:
   trunk/bindings/corba/java/Makefile
   trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java
   trunk/bindings/corba/java/testclient
   trunk/bindings/corba/orbitcpp/testclient.cpp
Log:
Fixed an issue with security checking


Modified: trunk/bindings/corba/java/Makefile
===================================================================
--- trunk/bindings/corba/java/Makefile	2007-07-21 01:49:20 UTC (rev 2063)
+++ trunk/bindings/corba/java/Makefile	2007-08-01 17:39:12 UTC (rev 2064)
@@ -1,6 +1,7 @@
 TOMCAT_HOME=/opt/tomcat
-#SERVLET_LIB=${TOMCAT_HOME}/common/lib/servlet-api.jar
-SERVLET_LIB=${TOMCAT_HOME}/lib/servlet-api.jar
+SERVLET_LIB=${TOMCAT_HOME}/common/lib/servlet-api.jar
+#SERVLET_LIB=${TOMCAT_HOME}/lib/servlet-api.jar
+#instdir=/home/scribe/public_html/
 instdir=/home/swordweb/livehtml/webapp
 all: src/org/crosswire/sword/orb/SWMgr.java classes/org/crosswire/sword/orb/SwordOrb.class
 

Modified: trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java
===================================================================
--- trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java	2007-07-21 01:49:20 UTC (rev 2063)
+++ trunk/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java	2007-08-01 17:39:12 UTC (rev 2064)
@@ -76,11 +76,11 @@
 	public void valueUnbound(HttpSessionBindingEvent httpSessionBindingEvent) {
 		try {
 //			throw new Exception("value unbound; showing stacktrace");
-			getSWMgrInstance().terminate();
 			Vector orbs = (Vector)clients.get(remoteAddr);
 			if (orbs != null) {
 				orbs.remove(orb);
 			}
+			getSWMgrInstance().terminate();
 		}
 		catch (Exception e) {}	// we know this doesn't return properly cuz we killed the orb! :)
 //		catch (Exception e) {e.printStackTrace();}	// we know this doesn't return properly cuz we killed the orb! :)

Modified: trunk/bindings/corba/java/testclient
===================================================================
--- trunk/bindings/corba/java/testclient	2007-07-21 01:49:20 UTC (rev 2063)
+++ trunk/bindings/corba/java/testclient	2007-08-01 17:39:12 UTC (rev 2064)
@@ -1,3 +1,3 @@
 #!/bin/sh
 TOMCAT_HOME=/usr/local/tomcat
-/usr/java/j2sdk1.4.2_09/bin/java -cp $TOMCAT_HOME/common/lib/servlet-api.jar:classes org.crosswire.sword.orb.SwordOrb $*
+java -cp $TOMCAT_HOME/common/lib/servlet-api.jar:classes org.crosswire.sword.orb.SwordOrb $*

Modified: trunk/bindings/corba/orbitcpp/testclient.cpp
===================================================================
--- trunk/bindings/corba/orbitcpp/testclient.cpp	2007-07-21 01:49:20 UTC (rev 2063)
+++ trunk/bindings/corba/orbitcpp/testclient.cpp	2007-08-01 17:39:12 UTC (rev 2064)
@@ -52,7 +52,7 @@
 		mgr->setJavascript(true);
 		mgr->setGlobalOption("Textual Variants", "Secondary Reading");
 		mgr->setGlobalOption("Footnotes", "On");
-		module = mgr->getModuleByName("TR");
+		module = mgr->getModuleByName("NASB");
 /*
 		module->setKeyText("jas.1.19");
 		swordorb::StringList *attr = module->getEntryAttribute("Footnote", "", "body", true);
@@ -62,10 +62,9 @@
 		}
 */
 		int i = 0;
-		for (module->setKeyText("jas.2.14"); !module->error() && i < 30; module->next(), i++) {
+		for (module->setKeyText("gen.2.8"); !module->error() && i < 3; module->next(), i++) {
 			std::cout << "KeyText: " << module->getKeyText() << "\n";
 			std::cout << "Text: " << module->getRenderText() << "\n";
-			break;
 		}
 /*
 		swordorb::SearchHitList *searchResults;