Skip to content

Commit

Permalink
#61 update passing of ruleinputparam when calling from resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-conway
michael-conway committed Feb 16, 2021
1 parent 7054bff commit 0031fb6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 55 deletions.
2 changes: 1 addition & 1 deletion jargon-core/src/main/java/org/irods/jargon/core/pub/RuleProcessingAOImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public IRODSRuleExecResult executeRule(final String irodsRuleAsString,
log.info("executing rule: {}", irodsRuleAsString);
log.info("with configuration:{}", ruleInvocationConfiguration);
IrodsRuleFactory irodsRuleFactory = new IrodsRuleFactory(getIRODSAccessObjectFactory(), getIRODSAccount());
final IRODSRule irodsRule = irodsRuleFactory.instanceIrodsRule(irodsRuleAsString, null,
final IRODSRule irodsRule = irodsRuleFactory.instanceIrodsRule(irodsRuleAsString, inputParameterOverrides,
ruleInvocationConfiguration);
log.debug("translated rule: {}", irodsRule);

Expand Down
60 changes: 6 additions & 54 deletions jargon-core/test-scripts/sample-maven-settings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for additional
information regarding copyright ownership. The ASF licenses this file to
you under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to in writing, software distributed under the
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->

<!-- | This is the configuration file for Maven. It can be specified at two
levels: | | 1. User Level. This settings.xml file provides configuration
for a single user, | and is normally provided in ${user.home}/.m2/settings.xml.
| | NOTE: This location can be overridden with the CLI option: | | -s /path/to/user/settings.xml
| | 2. Global Level. This settings.xml file provides configuration for all
Maven | users on a machine (assuming they're all using the same Maven | installation).
It's normally provided in | ${maven.home}/conf/settings.xml. | | NOTE: This
location can be overridden with the CLI option: | | -gs /path/to/global/settings.xml
| | The sections in this sample file are intended to give you a running start
at | getting the most out of your Maven installation. Where appropriate,
the default | values (values used when the setting is not specified) are
provided. | | -->
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">


<!-- what follows is an example maven settings.xml profile for jargon testing. This is picked up by the jargon pom file and used to generate a testing.properties file in the
java test resources directory -->

<profiles>

<profile>
<id>jargonTest</id>
<id>nfsamazon</id>
<properties>
<jargon.test.data.directory>/Users/mikeconway/temp/irodsscratch/</jargon.test.data.directory>
<jargon.test.data.directory>/home/ubuntu/temp/irodsscratch/</jargon.test.data.directory>
<jargon.test.irods.admin>rods</jargon.test.irods.admin>
<jargon.test.irods.admin.password>test</jargon.test.irods.admin.password>
<jargon.test.irods.admin.password>rods</jargon.test.irods.admin.password>
<jargon.test.irods.user>test1</jargon.test.irods.user>
<jargon.test.irods.password>test</jargon.test.irods.password>
<jargon.test.irods.resource>test1-resc</jargon.test.irods.resource>
Expand All @@ -48,7 +21,6 @@ java test resources directory -->
<jargon.test.irods.resource3>test1-resc3</jargon.test.irods.resource3>
<jargon.test.irods.user3>test3</jargon.test.irods.user3>
<jargon.test.irods.password3>test</jargon.test.irods.password3>
<jargon.test.kerberos.user></jargon.test.kerberos.user>
<jargon.test.irods.host>localhost</jargon.test.irods.host>
<jargon.test.irods.port>1247</jargon.test.irods.port>
<jargon.test.irods.zone>test1</jargon.test.irods.zone>
Expand All @@ -61,35 +33,15 @@ java test resources directory -->
<jargon.test.option.exercise.audit>false</jargon.test.option.exercise.audit>
<jargon.test.option.exercise.workflow>true</jargon.test.option.exercise.workflow>
<jargon.test.option.exercise.filesystem.mount>true</jargon.test.option.exercise.filesystem.mount>
<test.option.mount.basedir>/Users/mikeconway/temp/basedir</test.option.mount.basedir>
<jargon.test.pam.user>pam</jargon.test.pam.user>
<jargon.test.pam.password>pam</jargon.test.pam.password>
<test.option.pam>false</test.option.pam>
<jargon.test.krb.user>kerberos</jargon.test.krb.user> <!-- kerberos@LOCAL -->
<jargon.test.krb.password>kerberos</jargon.test.krb.password>
<test.option.krb>false</test.option.krb>
<test.option.ssl.configured>false</test.option.ssl.configured>
<test.option.distributed.resources>false</test.option.distributed.resources>
<test.option.registration>true</test.option.registration>
<test.option.federated.zone>false</test.option.federated.zone>
<test.option.kerberos>false</test.option.kerberos>
<test.option.strictACL>false</test.option.strictACL>
<test.rest.port>8888</test.rest.port>
<jargon.test.federated.irods.admin>rods</jargon.test.federated.irods.admin>
<jargon.test.federated.irods.admin.password>test</jargon.test.federated.irods.admin.password>
<jargon.test.federated.irods.user>test1</jargon.test.federated.irods.user>
<jargon.test.federated.irods.password>test</jargon.test.federated.irods.password>
<jargon.test.federated.irods.resource>test1-resc</jargon.test.federated.irods.resource>
<jargon.test.federated.irods.host>fedzone2</jargon.test.federated.irods.host>
<jargon.test.federated.irods.port>1247</jargon.test.federated.irods.port>
<jargon.test.federated.irods.zone>fedzone2</jargon.test.federated.irods.zone>


</properties>
</profile>
</profiles>


<activeProfiles>
<activeProfile>jargonTest</activeProfile>
<activeProfile>nfsamazon</activeProfile>
</activeProfiles>

</settings>

0 comments on commit 0031fb6

Please sign in to comment.