From f0a02b1c5ee6b5a8e6b47e60438a6b1a03c86755 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 13 Sep 2011 10:25:01 +0000
Subject: [PATCH] bis-common.xml removed from project screening. build.xml
modified to copy bis-common.xml from project openbis into the right place.
SVN: 22908
---
openbis/build/build.xml | 8 ++++-
screening/resource/server/bis-common.xml | 44 ------------------------
2 files changed, 7 insertions(+), 45 deletions(-)
delete mode 100644 screening/resource/server/bis-common.xml
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index 23605c6ac26..16f11aaee91 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -174,6 +174,9 @@
<fileset dir="../server-common/resource/server">
<include name="web-common.xml" />
</fileset>
+ <fileset dir="../openbis/resource/server">
+ <include name="bis-common.xml" />
+ </fileset>
</checksum>
<checksum todir="${dist}" pattern="{0} webapps/openbis/{1}">
<fileset dir="${sources}/ch/systemsx/cisd/openbis">
@@ -483,7 +486,10 @@
<include name="jackson-mapper-asl.jar" />
</fileset>
</copy>
- <antcall target="prepare-gwt.copy-common-source" />
+ <copy todir="${targets.www.web-inf}">
+ <fileset file="../openbis/${server-resource}/bis-common.xml" includes="*.xml"/>
+ </copy>
+ <antcall target="prepare-gwt.copy-common-source" />
</target>
<target name="prepare-gwt.copy-common-source">
diff --git a/screening/resource/server/bis-common.xml b/screening/resource/server/bis-common.xml
deleted file mode 100644
index 3ce600033d0..00000000000
--- a/screening/resource/server/bis-common.xml
+++ /dev/null
@@ -1,44 +0,0 @@
- <context-param>
- <param-name>infoClass</param-name>
- <param-value>ch.systemsx.cisd.openbis.BuildAndEnvironmentInfo</param-value>
- </context-param>
-
- <context-param>
- <!--
- The path of cookie with openBIS session id needs to be set explicitly here. Otherwise
- this cookie will be overwritten with a cookie created for the openBIS-DSS session.
- -->
- <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
- <param-value>/openbis</param-value>
- </context-param>
-
-
- <listener>
- <listener-class>
- ch.systemsx.cisd.openbis.generic.server.GenericHttpSessionListener
- </listener-class>
- </listener>
-
- <filter>
- <filter-name>CacheFilter</filter-name>
- <filter-class>ch.systemsx.cisd.openbis.generic.server.CacheFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CacheFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter>
- <filter-name>CrossOriginFilter</filter-name>
- <filter-class>ch.systemsx.cisd.common.servlet.CrossOriginFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CrossOriginFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!-- Trying kind of extension (i.e., '*.do') here as 'url-pattern' does not work. -->
- <servlet-mapping>
- <servlet-name>spring</servlet-name>
- <url-pattern>/openbis/*</url-pattern>
- </servlet-mapping>
--
GitLab