Skip to content

Commit

Permalink
Merge pull request #229 from sukunis/mde_integration_status
Browse files Browse the repository at this point in the history
MDE enabled in the standard configuration of importer
  • Loading branch information
jburel authored Jun 30, 2021
2 parents df10828 + 5dbb0a9 commit ba3e5d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/config/container.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@
<entry name="omero.client.import.offline.url">http://localhost:8000/ome/import</entry>
<entry name="omero.client.import.offline.enabled" type="boolean">false</entry>
<!-- mde on/off -->
<entry name="omero.client.import.mde.enabled" type="boolean">false</entry>
<entry name="omero.client.import.mde.enabled" type="boolean">true</entry>
<!-- mde config file location (. for in config dir; omero for local user omero dir) -->
<entry name="omero.client.import.mde.path">.</entry>
<entry name="omero.client.import.mde.path">omero</entry>
<!-- escape ice special characters, see https://doc.zeroc.com/ice/3.6/properties-and-configuration/configuration-file-syntax -->
<entry name="omero.client.login_escape_characters">#=\s\\</entry>
</services>
Expand Down
4 changes: 2 additions & 2 deletions src/config/containerImporter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@
<entry name="/services/DEBUGGER/postTimeout" type="integer">2000</entry>
<entry name="/services/DEBUGGER/emailAddress">[email protected]</entry>
<!-- mde on/off -->
<entry name="omero.client.import.mde.enabled" type="boolean">false</entry>
<entry name="omero.client.import.mde.enabled" type="boolean">true</entry>
<!-- mde config file location (. for in config dir; omero for local user omero dir) -->
<entry name="omero.client.import.mde.path">.</entry>
<entry name="omero.client.import.mde.path">omero</entry>
<!-- escape ice special characters, see https://doc.zeroc.com/ice/3.6/properties-and-configuration/configuration-file-syntax -->
<entry name="omero.client.login_escape_characters">#=\s\\</entry>
</services>
Expand Down

0 comments on commit ba3e5d0

Please sign in to comment.