From b52c6fd01f43914fc63eb78552efab445838cc2c Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 8 Dec 2009 15:17:36 +0000
Subject: [PATCH] LMS-1275 minor: code inside plugin/PLUGIN-NAME/shared/basic
should be compiled by GWT
SVN: 13748
---
.../systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml | 3 +++
openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml | 2 --
.../openbis/generic/shared/util/WebClientFilesUpdater.java | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml
index 45b0ff9dcde..bf7b69bb682 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml
@@ -31,16 +31,19 @@
<script src="demo-dictionary.js"/>
<public path="plugin/demo/client/web/public"/>
<source path="plugin/demo/client/web/client"/>
+ <source path="plugin/demo/shared/basic"/>
<!-- Generic plugin -->
<script src="generic-dictionary.js"/>
<public path="plugin/generic/client/web/public"/>
<source path="plugin/generic/client/web/client"/>
+<source path="plugin/generic/shared/basic"/>
<!-- Screening plugin -->
<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"/>
<!-- Automatically generated part - END -->
<!-- Do not define servlets here, use web.xml -->
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml
index bbb3c8e251a..42e1f044e6a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml
@@ -3,7 +3,5 @@
<module>
<inherits name='ch.systemsx.cisd.openbis.OpenBIS-without-entry-point' />
- <source path="plugin/screening/shared/basic" />
-
<entry-point class='ch.systemsx.cisd.openbis.generic.client.web.client.application.Client' />
</module>
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
index 2392e81f9a2..b56fd7f69c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
@@ -42,7 +42,9 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.Def
public final class WebClientFilesUpdater
{
@Private
- static final String SOURCE_TAG_TEMPLATE = "<source path=\"plugin/%s/client/web/client\"/>";
+ static final String SOURCE_TAG_TEMPLATE =
+ "<source path=\"plugin/%1$s/client/web/client\"/>\n"
+ + "\t\t<source path=\"plugin/%1$s/shared/basic\"/>";
@Private
static final String SCRIPT_TAG_TEMPLATE = "<script src=\"%s-dictionary.js\"/>";
--
GitLab