diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties index 2920c6361cc180769d08457d41c6a6212a157d51..e62da963013f10aceba315b7e9abeb94ba83d2ad 100644 --- a/datastore_server/dist/etc/service.properties +++ b/datastore_server/dist/etc/service.properties @@ -90,6 +90,32 @@ failure-interval = 10 # Globally used separator character which separates entities in a data set file name data-set-file-name-entity-separator = _ +# --------------------------------------------------------------------------- +# reporting and processing plugins configuration +# --------------------------------------------------------------------------- + +# Comma separated names of reporting plugins. Each plugin should have configuration properties prefixed with its name. +# If name has 'default-' prefix it will be used by default in data set Data View. +reporting-plugins = demo-reporter + +# Label of the plugin which will be shown for the users. +demo-reporter.label = Show Dataset Size +# Comma separated list of dataset type codes which can be handled by this plugin. +demo-reporter.dataset-types = UNKNOWN +# Plugin class specification (together with the list of packages this class belongs to). +demo-reporter.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo.DemoReportingPlugin +# The property file. Its content will be passed as a parameter to the plugin. +demo-reporter.properties-file = + +# Comma separated names of processing plugins. Each plugin should have configuration properties prefixed with its name. +processing-plugins = demo-processor + +# The configuration of the processing plugin is the same as the reporting plugins configuration. +demo-processor.label = Demo Processing +demo-processor.dataset-types = UNKNOWN +demo-processor.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo.DemoProcessingPlugin +demo-processor.properties-file = + # Data set validators used to accept or reject data sets to be registered. # Comma separated list of validator definitions. data-set-validators = validator diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties index 2850b10bac7b8fd0f3c39cf41c46df78a393608a..5634abf638480404d8035474afe070f8537a9927 100644 --- a/datastore_server/etc/service.properties +++ b/datastore_server/etc/service.properties @@ -1,5 +1,5 @@ # Unique code of this Data Store Server. Not more than 40 characters. -data-store-server-code = my-dss +data-store-server-code = standard # The root directory of the data store storeroot-dir = targets/store @@ -91,12 +91,13 @@ quiet-period = 3 # --------------------------------------------------------------------------- # Comma separated names of reporting plugins. Each plugin should have configuration properties prefixed with its name. +# If name has 'default-' prefix it will be used by default in data set Data View. reporting-plugins = demo-reporter # Label of the plugin which will be shown for the users. demo-reporter.label = Show Dataset Size # Comma separated list of dataset type codes which can be handled by this plugin. -demo-reporter.dataset-types = UNKNOWN +demo-reporter.dataset-types = HCS_IMAGE # Plugin class specification (together with the list of packages this class belongs to). demo-reporter.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo.DemoReportingPlugin # The property file. Its content will be passed as a parameter to the plugin. @@ -107,7 +108,7 @@ processing-plugins = demo-processor # The configuration of the processing plugin is the same as the reporting plugins configuration. demo-processor.label = Demo Processing -demo-processor.dataset-types = UNKNOWN +demo-processor.dataset-types = HCS_IMAGE demo-processor.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo.DemoProcessingPlugin demo-processor.properties-file = diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java index 68367f24d03ba1946e7f6fc9d5d5f97254e07d55..90cbd4311438f6673005b3139bc542eeec33ef73 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java @@ -197,13 +197,13 @@ public class DataViewSection extends SingleSectionPanel public void postRefresh(boolean wasSuccessful) { // - select first service that has 'default-' prefix in key + // (services should be listed in alphabetical order by label) // - if such service doesn't exist select 'Files (Smart View)' service final ListStore<DatastoreServiceDescriptionModel> modelsStore = getStore(); for (int i = 0; i < modelsStore.getCount(); i++) { final DatastoreServiceDescriptionModel serviceModel = modelsStore.getAt(i); - System.err.println(serviceModel.getBaseObject().getKey()); if (serviceModel.getBaseObject().getKey().startsWith( DEFAULT_SERVICE_KEY_PREFIX)) {