Permalink
Browse files

fix for scheme passthrough patch

  • Loading branch information...
1 parent 874031e commit 939b5a1e3a7a80a930168412848588358b1a96bb @timf timf committed Jul 9, 2010
View
2 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"
View
2 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"
View
18 service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
@@ -37,9 +37,13 @@
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;
- }
}
View
2 ...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"

0 comments on commit 939b5a1

Please sign in to comment.