From 939b5a1e3a7a80a930168412848588358b1a96bb Mon Sep 17 00:00:00 2001
From: Tim Freeman <tim@timfreeman.org>
Date: Fri, 9 Jul 2010 11:41:55 -0500
Subject: [PATCH] fix for scheme passthrough patch

---
 .../other/authz-callout-ACTIVE.xml             |  2 +-
 .../other/authz-callout-sql.xml                |  2 +-
 .../workspace/sqlauthz/AuthzDecisionLogic.java | 18 +++++-------------
 .../other/authz-callout-sql.xml                |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml b/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
index 935e0b9c..c87e3605 100644
--- a/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
+++ b/service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
@@ -33,11 +33,11 @@
          class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">
 
         <constructor-arg ref="other.AuthzDataSource" />
+        <constructor-arg value="$GLOBAL{allow.other.schemes}" />
 
         <property name="repoDir" value="$CUMULUS{cumulus.repo.dir}" />
         <property name="repoHost" value="$SSH{service.sshd.contact.string}" />
         <property name="repoScheme" value="scp://" />
-        <property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
      </bean>
 
     <bean id="nimbus-rm.service.binding.RepoAdaptor"
diff --git a/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml b/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
index 935e0b9c..c87e3605 100644
--- a/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
+++ b/service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
@@ -33,11 +33,11 @@
          class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">
 
         <constructor-arg ref="other.AuthzDataSource" />
+        <constructor-arg value="$GLOBAL{allow.other.schemes}" />
 
         <property name="repoDir" value="$CUMULUS{cumulus.repo.dir}" />
         <property name="repoHost" value="$SSH{service.sshd.contact.string}" />
         <property name="repoScheme" value="scp://" />
-        <property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
      </bean>
 
     <bean id="nimbus-rm.service.binding.RepoAdaptor"
diff --git a/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java b/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
index 7a572618..854335be 100644
--- a/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
+++ b/service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
@@ -37,9 +37,13 @@ public class AuthzDecisionLogic extends DecisionLogic
     private boolean                     schemePassthrough;
 
     public  AuthzDecisionLogic(
-        DataSource ds)
+        DataSource ds,
+        String schemePassthroughStr)
     {
         this.authDB = new AuthzDBAdapter(ds);
+        this.schemePassthrough =
+                schemePassthroughStr != null
+                    && schemePassthroughStr.trim().equalsIgnoreCase("true");
     }
 
     public String translateExternaltoInternal(
@@ -414,16 +418,4 @@ public void unpropagationFinished(
             throw new WorkspaceException("Workspace database exception occured ", wsdbex);
         }
     }
-
-    public void setSchemePassthrough(String schemePassthroughStr)
-    {
-        this.schemePassthrough =
-                schemePassthroughStr != null
-                    && schemePassthroughStr.trim().equalsIgnoreCase("true");
-    }
-
-    public boolean getSchemePassthrough()
-    {
-        return schemePassthrough;
-    }
 }
diff --git a/service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml b/service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
index 935e0b9c..c87e3605 100644
--- a/service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
+++ b/service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
@@ -33,11 +33,11 @@
          class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">
 
         <constructor-arg ref="other.AuthzDataSource" />
+        <constructor-arg value="$GLOBAL{allow.other.schemes}" />
 
         <property name="repoDir" value="$CUMULUS{cumulus.repo.dir}" />
         <property name="repoHost" value="$SSH{service.sshd.contact.string}" />
         <property name="repoScheme" value="scp://" />
-        <property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
      </bean>
 
     <bean id="nimbus-rm.service.binding.RepoAdaptor"