From 9a7f93545a84ef3bec16d596306b225d0f08e591 Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Tue, 24 Jan 2012 13:46:05 +0000 Subject: [PATCH] LMS-2754 spring application context, GWT configuration, initial build.xml SVN: 24275 --- openbis_standard_technologies/.classpath | 6 +- openbis_standard_technologies/build/antrun.sh | 6 ++ openbis_standard_technologies/build/build.xml | 9 ++ .../etc/web-client.properties | 102 ++++++++++++++++++ .../resource/server/spring-servlet.xml | 33 ++++++ .../resource/server/web.xml | 30 ++++++ .../source/java/.gitignore | 0 .../ch/systemsx/cisd/openbis/OpenBIS.gwt.xml | 21 ++++ .../cisd/openbis/OpenBISFirefox.gwt.xml | 21 ++++ .../cisd/openbis/OpenBISSafari.gwt.xml | 21 ++++ .../client/application/StandardClient.java | 53 +++++++++ .../cisd/openbis/client/web/public/index.html | 59 ++++++++++ .../source/java/service.properties | 90 ++++++++++++++++ ...andard-technologies-applicationContext.xml | 24 +++++ .../sourceTest/java/tests.xml | 13 +++ 15 files changed, 487 insertions(+), 1 deletion(-) create mode 100755 openbis_standard_technologies/build/antrun.sh create mode 100644 openbis_standard_technologies/build/build.xml create mode 100644 openbis_standard_technologies/etc/web-client.properties create mode 100644 openbis_standard_technologies/resource/server/spring-servlet.xml create mode 100644 openbis_standard_technologies/resource/server/web.xml delete mode 100644 openbis_standard_technologies/source/java/.gitignore create mode 100644 openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml create mode 100644 openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISFirefox.gwt.xml create mode 100644 openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISSafari.gwt.xml create mode 100644 openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/client/application/StandardClient.java create mode 100644 openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/public/index.html create mode 100644 openbis_standard_technologies/source/java/service.properties create mode 100644 openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml create mode 100644 openbis_standard_technologies/sourceTest/java/tests.xml diff --git a/openbis_standard_technologies/.classpath b/openbis_standard_technologies/.classpath index 05fcfe28af1..587db0f66eb 100644 --- a/openbis_standard_technologies/.classpath +++ b/openbis_standard_technologies/.classpath @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="source/java"/> + <classpathentry kind="src" path="sourceTest/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="output" path="targets/classes"/> + <classpathentry combineaccessrules="false" kind="src" path="/rtd_phosphonetx"/> + <classpathentry combineaccessrules="false" kind="src" path="/screening"/> + <classpathentry kind="lib" path="/libraries/gwt2.4/gwt-user.jar"/> + <classpathentry kind="output" path="targets/www/WEB-INF/classes"/> </classpath> diff --git a/openbis_standard_technologies/build/antrun.sh b/openbis_standard_technologies/build/antrun.sh new file mode 100755 index 00000000000..5ff1a62b259 --- /dev/null +++ b/openbis_standard_technologies/build/antrun.sh @@ -0,0 +1,6 @@ +#! /bin/bash + +ME="$0" +MYDIR=${ME%/*} +cd $MYDIR +ant -lib ../../build_resources/lib/ecj.jar "$@" diff --git a/openbis_standard_technologies/build/build.xml b/openbis_standard_technologies/build/build.xml new file mode 100644 index 00000000000..7841f11bf61 --- /dev/null +++ b/openbis_standard_technologies/build/build.xml @@ -0,0 +1,9 @@ +<project name="openbis_standard_technologies" default="dist" basedir=".."> + <import file="../../screening/build/build.xml" /> + <import file="../../rtd_phosphonetx/build/build.xml" /> + <project-classpath name="ecp" classes="${classes}" /> + <project-classpath name="ecp.gwt" classes="${targets}/www/WEB-INF/classes" /> + + <target name="dist" depends="compile"> + </target> +</project> \ No newline at end of file diff --git a/openbis_standard_technologies/etc/web-client.properties b/openbis_standard_technologies/etc/web-client.properties new file mode 100644 index 00000000000..febe36110a0 --- /dev/null +++ b/openbis_standard_technologies/etc/web-client.properties @@ -0,0 +1,102 @@ +# Enable moving entities to trash (non-permanent deletion). +# Default value: true +enable-trash = true + +# Default view mode that should be used if user doesn't have it specified in URL. +# Options: 'NORMAL' (standard mode - default), 'SIMPLE' (readonly mode with simplified GUI) +# +#default-view-mode = SIMPLE + +# Maximal number of visible columns in tables. Default: 50. +max-visible-columns = 20 +data-set-types-with-image-overview = MICROSCOPY_IMAGE, .*IMG.* + +# Configuration of entity (experiment, sample, data set, material) detail views. +# Allows to hide chosen sections. +# +# Mandatory properties: +# - view (entity detail view id) +# - types (list of entity type codes) +# Optional properties: +# - hide-sections (list of section ids) +# - hide-smart-view (removes "Smart View" from Data Set Detail View -> Data View) (generic_dataset_viewer) +# - hide-file-view (removes "File View" from Data Set Detail View -> Data View) (generic_dataset_viewer) +# Available sections in entity-detail-views: +# generic_dataset_viewer +# data-set-data-section +# data-set-parents-section +# data-set-children-section +# query-section +# generic_experiment_viewer +# data-sets-section +# attachment-section +# query-section +# container-sample-section +# generic_sample_viewer +# container-sample-section +# derived-samples-section +# parent-samples-section +# data-sets-section +# attachment-section +# query-section +# generic_material_viewer +# query-section +# +# Example: +# +#detail-views = sample-view, experiment-view, data-view +# +#sample-view.view = generic_sample_viewer +#sample-view.types = STYPE1, STYPE2 +#sample-view.hide-sections = derived-samples-section, container-sample-section +# +#experiment-view.view = generic_experiment_viewer +#experiment-view.types = ETYPE1, ETYPE2 +#experiment-view.hide-sections = data-sets-section +# +#data-view.view = generic_dataset_viewer +#data-view.types = DSTYPE +#data-view.hide-smart-view = false +#data-view.hide-file-view = true + +detail-views = plate-or-well-view, image-data-view, image-analysis-data-view, microscopy-dataset-view + +#experiment-view.view = generic_experiment_viewer +#experiment-view.types = SIRNA_HCS +#experiment-view.hide-sections = data-sets-section, attachment-section + +plate-or-well-view.view = generic_sample_viewer +plate-or-well-view.types = PLATE.*, .*WELL.* +plate-or-well-view.hide-sections = container-sample-section, derived-samples-section, parent-samples-section + +image-data-view.view = generic_dataset_viewer +image-data-view.types = HCS_IMAGE.* +image-data-view.hide-sections = data-set-parents-section, data-set-children-section, plate-layout-dataset-section +image-data-view.hide-smart-view = false +image-data-view.hide-file-view = true + +image-analysis-data-view.view = generic_dataset_viewer +image-analysis-data-view.types = HCS_ANALYSIS_WELL_FEATURES.* +image-analysis-data-view.hide-sections = data-set-parents-section, data-set-children-section +image-analysis-data-view.hide-smart-view = false +image-analysis-data-view.hide-file-view = true + +microscopy-dataset-view.view = generic_dataset_viewer +microscopy-dataset-view.types = MICROSCOPY_IMAGE, .*IMG.* +microscopy-dataset-view.hide-sections = data-set-children-section, data-set-parents-section +microscopy-dataset-view.hide-smart-view = false +microscopy-dataset-view.hide-file-view = true + +technologies = proteomics, screening + +# Relative path of cache. Default value is 'cache'. +proteomics.cache-folder = ../../../web-client-data-cache +# Minimum free disk space needed for the cache. Default value is 1 GB. +#proteomics.minimum-free-disk-space-in-MB = 1024 +# Maximum retention time. Data older than this time will be removed from cache. Default value is a week. +#proteomics.maximum-retention-time-in-days = 7 + +screening.image-viewer-enabled = true +# Material properties of the configured type will be rendered as links +# to the material detail view. +screening.material-details-property-type = GENE_SYMBOLS diff --git a/openbis_standard_technologies/resource/server/spring-servlet.xml b/openbis_standard_technologies/resource/server/spring-servlet.xml new file mode 100644 index 00000000000..45697255499 --- /dev/null +++ b/openbis_standard_technologies/resource/server/spring-servlet.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + + <!-- + // Note: obviously it is not possible to have a mix of 'urlMappings' and annotated configuration. + --> + <context:annotation-config /> + + <context:component-scan base-package="ch.systemsx.cisd.openbis" use-default-filters="false"> + <context:include-filter type="annotation" + expression="org.springframework.stereotype.Controller" /> + </context:component-scan> + + <!-- + // Commons-based implementation of the MultipartResolver interface. + // Needs 'commons-fileupload' library. + --> + <bean id="multipartResolver" + class="org.springframework.web.multipart.commons.CommonsMultipartResolver"> + <!-- Default is 10240 (10kB). Set to 1MB (1048576). --> + <property name="maxInMemorySize" value="1048576" /> + </bean> +</beans> diff --git a/openbis_standard_technologies/resource/server/web.xml b/openbis_standard_technologies/resource/server/web.xml new file mode 100644 index 00000000000..c0b59c17bee --- /dev/null +++ b/openbis_standard_technologies/resource/server/web.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE web-app [ + <!ENTITY common SYSTEM "web-common.xml"> + <!ENTITY biscommon SYSTEM "bis-common.xml"> +]> +<web-app> + + <display-name>openBIS</display-name> + <description>openBIS server</description> + + &common; + + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>classpath:standard-technologies-applicationContext.xml</param-value> + <description>File for Spring beans.</description> + </context-param> + + <context-param> + <param-name>infoClass</param-name> + <param-value>ch.systemsx.cisd.openbis.BuildAndEnvironmentInfo</param-value> + </context-param> + + &biscommon; + + <!-- + // Additional servlets + --> + +</web-app> diff --git a/openbis_standard_technologies/source/java/.gitignore b/openbis_standard_technologies/source/java/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml new file mode 100644 index 00000000000..f15126d1e83 --- /dev/null +++ b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml @@ -0,0 +1,21 @@ +<module> + <inherits name='ch.systemsx.cisd.openbis.OpenBIS-without-entry-point'/> + + <!-- + // Application entry point + --> + <entry-point class='ch.systemsx.cisd.openbis.client.web.client.application.StandardClient' /> + + <script src="proteomics-dictionary.js"/> + <public path="plugin/proteomics/client/web/public"/> + <source path="plugin/proteomics/client/web/client"/> + <source path="plugin/proteomics/shared/basic" /> + + <script src="screening-dictionary.js"/> + <public path="plugin/screening/client/web/public"/> + <source path="plugin/screening/client/web/client"/> + <source path="plugin/screening/shared/basic" /> + + <source path="client/web/client"/> + <public path="client/web/public"/> +</module> \ No newline at end of file diff --git a/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISFirefox.gwt.xml b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISFirefox.gwt.xml new file mode 100644 index 00000000000..6f6e396e1ad --- /dev/null +++ b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISFirefox.gwt.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.7.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.7.1/distro-source/core/src/gwt-module.dtd"> +<module rename-to="ch.systemsx.cisd.openbis.OpenBIS"> + <inherits name='ch.systemsx.cisd.openbis.OpenBIS-without-entry-point' /> + <set-property name="user.agent" value="gecko1_8" /> + + <entry-point class='ch.systemsx.cisd.openbis.client.web.client.application.StandardClient' /> + + <script src="proteomics-dictionary.js"/> + <public path="plugin/proteomics/client/web/public"/> + <source path="plugin/proteomics/client/web/client"/> + <source path="plugin/proteomics/shared/basic" /> + + <script src="screening-dictionary.js"/> + <public path="plugin/screening/client/web/public"/> + <source path="plugin/screening/client/web/client"/> + <source path="plugin/screening/shared/basic" /> + + <source path="client/web/client"/> + <public path="client/web/public"/> +</module> diff --git a/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISSafari.gwt.xml b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISSafari.gwt.xml new file mode 100644 index 00000000000..56d69335f62 --- /dev/null +++ b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/OpenBISSafari.gwt.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.7.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.7.1/distro-source/core/src/gwt-module.dtd"> +<module rename-to="ch.systemsx.cisd.openbis.OpenBIS"> + <inherits name='ch.systemsx.cisd.openbis.OpenBIS-without-entry-point' /> + <set-property name="user.agent" value="safari" /> + + <entry-point class='ch.systemsx.cisd.openbis.client.web.client.application.StandardClient' /> + + <script src="proteomics-dictionary.js"/> + <public path="plugin/proteomics/client/web/public"/> + <source path="plugin/proteomics/client/web/client"/> + <source path="plugin/proteomics/shared/basic" /> + + <script src="screening-dictionary.js"/> + <public path="plugin/screening/client/web/public"/> + <source path="plugin/screening/client/web/client"/> + <source path="plugin/screening/shared/basic" /> + + <source path="client/web/client"/> + <public path="client/web/public"/> +</module> diff --git a/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/client/application/StandardClient.java b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/client/application/StandardClient.java new file mode 100644 index 00000000000..36731b5080f --- /dev/null +++ b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/client/application/StandardClient.java @@ -0,0 +1,53 @@ +/* + * Copyright 2012 ETH Zuerich, CISD + * + * Licensed 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. + */ + +package ch.systemsx.cisd.openbis.client.web.client.application; + +import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.Client; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.DefaultClientPluginFactoryProvider; +import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.IClientPluginFactoryProvider; + +/** + * Client for standard set of technologies. + * + * @author Franz-Josef Elmer + */ +public class StandardClient extends Client +{ + private static final class ClientPluginFactoryProvider extends + DefaultClientPluginFactoryProvider + { + ClientPluginFactoryProvider(IViewContext<ICommonClientServiceAsync> originalViewContext) + { + super(originalViewContext); + registerPluginFactory(new ch.systemsx.cisd.openbis.plugin.proteomics.client.web.client.application.ClientPluginFactory( + originalViewContext)); + registerPluginFactory(new ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.ClientPluginFactory( + originalViewContext)); + } + + } + + @Override + protected IClientPluginFactoryProvider createPluginFactoryProvider( + final IViewContext<ICommonClientServiceAsync> commonContext) + { + return new ClientPluginFactoryProvider(commonContext); + } + +} diff --git a/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/public/index.html b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/public/index.html new file mode 100644 index 00000000000..e788f703925 --- /dev/null +++ b/openbis_standard_technologies/source/java/ch/systemsx/cisd/openbis/client/web/public/index.html @@ -0,0 +1,59 @@ +<!DOCTYPE html> +<html> +<head> +<title>openBIS - Biology Information System</title> + +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<!-- force IE to go to document mode IE8 standards (and avoid the dreadful quirks-mode) --> +<meta http-equiv="X-UA-Compatible" content="IE=edge" > + +<link rel="shortcut icon" href="images/favicon.ico" /> +<link rel="icon" type="image/png" href="images/favicon.png" /> +<link rel="stylesheet" type="text/css" href="resources/css/gxt-all.css" /> +<link rel="stylesheet" type="text/css" href="resources/css/debug-panel.css" /> + +<!-- +// This script loads your compiled module. If you add any GWT meta tags, they must be added before this line. +--> +<script language="javascript" + src="ch.systemsx.cisd.openbis.OpenBIS.nocache.js"></script> + +<!-- This snippet should be automatically included in all the HTML that wishes to use the debug panel. --> +<script type="text/javascript" language="javascript"> + var stats = window.__stats = []; + window.__gwtStatsEvent = function(evt) { + stats[stats.length] = evt; + var listener = window.__stats_listener; + listener && listener(evt); + return true; + } +</script> + +</head> +<!-- +// The body can have arbitrary html, or you can leave the body empty if you want to create a completely dynamic ui. +--> +<body> +<!-- Required by IE (GWT 1.7) --> +<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> +<div id="openbis_login_div" style="visibility: hidden"> +<form id="openbis_login_form" method="post" action="javascript:;"> +<table cellspacing="5"> + <tbody> + <tr style="padding-bottom: 5px"> + <td><span>User:</span></td> + <td><input type="text" id="openbis_login_username" + name="openbis-username" style="width: 150px;"></td> + </tr> + <tr style="padding-bottom: 5px"> + <td><span>Password:</span></td> + <td><input type="password" id="openbis_login_password" + name="openbis-password" style="width: 150px;"></td> + </tr> + </tbody> +</table> +<input style="margin-left: 200px" type="submit" id="openbis_login_submit" value="Login"> +</form> +</div> +</body> +</html> diff --git a/openbis_standard_technologies/source/java/service.properties b/openbis_standard_technologies/source/java/service.properties new file mode 100644 index 00000000000..85d9d98fbbf --- /dev/null +++ b/openbis_standard_technologies/source/java/service.properties @@ -0,0 +1,90 @@ +authentication-service = dummy-authentication-service + +# The time after which an inactive session is expired by the service (in minutes). +session-timeout = 720 + +# Authorization +# Supported: 'no-authorization' and 'active-authorization' +authorization-component-factory = active-authorization + +script-folder = ../openbis/source/ + +# Supported: currently only 'postgresql' is supported +database.engine = postgresql +database.create-from-scratch = false +# For debugging set this value to true. +database.script-single-step-mode = false +database.url-host-part = +database.kind = standard_technologies +database.owner = +database.owner-password = +database.admin-user = +database.admin-password = + +proteomics.database.engine = postgresql +proteomics.database.create-from-scratch = false +proteomics.database.script-single-step-mode = false +proteomics.database.url-host-part = +proteomics.database.basic-name = proteomics +proteomics.database.kind = dev +proteomics.database.owner = +proteomics.database.owner-password = +proteomics.database.admin-user = +proteomics.database.admin-password = +proteomics.script-folder = ../rtd_phosphonetx/source/sql/proteomics + +data-source-provider = dss-based-data-source-provider + +dss-based-data-source-provider.data-store-servers = dss-screening, my-dss +dss-based-data-source-provider.dss-screening.database-driver = org.postgresql.Driver +dss-based-data-source-provider.dss-screening.database-url = jdbc:postgresql://localhost/imaging_dev +dss-based-data-source-provider.my-dss. = dss-based-data-source-provider.dss-screening. + +crowd.service.host = crowd.systemsx.ch +crowd.service.port = 8443 +crowd.application.name = lims +crowd.application.password = + +mail.from = openbis@localhost +mail.smtp.host = file://targets/email +mail.smtp.user = user +mail.smtp.password = password + +# The database instance local unique identifier. Used when the new database is created. +database-instance = CISD + +# The URL of the CIFEX server +cifex-url = https://cifex.ethz.ch:443 + +trusted-cross-origin-domains= * + +# Hibernate Search +# The working directory. +hibernate.search.index-base = ./targets/indices_${database.kind} +# One of NO_INDEX, SKIP_IF_MARKER_FOUND, INDEX_FROM_SCRATCH. +# If not specified, default (SKIP_IF_MARKER_FOUND) is taken. +hibernate.search.index-mode = SKIP_IF_MARKER_FOUND +# Defines the maximum number of elements indexed before flushing the transaction-bound queue. +# Default is 1000. +hibernate.search.batch-size = 1000 +# Maximum number of search results +hibernate.search.maxResults = 100000 +# If 'async', the update of indices will be done in a separate thread. +hibernate.search.worker.execution=async + +web-client-configuration-file = etc/web-client.properties + +# Database Configurations for Query module +query-databases = 1, 2 + +1.label = openBIS meta data +1.data-space = CISD +1.database-driver = org.postgresql.Driver +1.database-url = jdbc:postgresql://localhost/openbis_${database.kind} +#1.database-username = +#1.database-pasword = + +2.label = Protein Data +2.creator-minimal-role = SPACE_USER +2.database-driver = org.postgresql.Driver +2.database-url = jdbc:postgresql://localhost/${proteomics.database.basic-name}_${proteomics.database.kind} diff --git a/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml b/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml new file mode 100644 index 00000000000..4e3bfb18d5e --- /dev/null +++ b/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tx="http://www.springframework.org/schema/tx" + xmlns:plugins="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + + <import resource="applicationContext.xml"/> + <import resource="proteomics-plugin-applicationContext.xml"/> + <import resource="screening-plugin-applicationContext.xml"/> + + <plugins:annotation-config /> + + <plugins:component-scan base-package="ch.systemsx.cisd.openbis"> + <plugins:exclude-filter type="annotation" + expression="org.springframework.stereotype.Controller" /> + </plugins:component-scan> + +</beans> \ No newline at end of file diff --git a/openbis_standard_technologies/sourceTest/java/tests.xml b/openbis_standard_technologies/sourceTest/java/tests.xml new file mode 100644 index 00000000000..7e8e25808d1 --- /dev/null +++ b/openbis_standard_technologies/sourceTest/java/tests.xml @@ -0,0 +1,13 @@ +<suite name="All" verbose="2" > + <test name="All" annotations="JDK"> + <groups> + <run> + <exclude name="broken" /> + </run> + </groups> + <packages> + <package name="ch.systemsx.cisd.openbis.plugin.proteomics.*" /> + <package name="ch.systemsx.cisd.openbis.plugin.screening.*" /> + </packages> + </test> +</suite> -- GitLab