You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/05/17 23:37:21 UTC
tomee git commit: no session serialization for cdi-tomee
Repository: tomee
Updated Branches:
refs/heads/master 34ac19d35 -> 052cd751e
no session serialization for cdi-tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/052cd751
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/052cd751
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/052cd751
Branch: refs/heads/master
Commit: 052cd751e23e964830b9e4eb150dc3384db68a24
Parents: 34ac19d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 23:37:16 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun May 17 23:37:16 2015 +0200
----------------------------------------------------------------------
tck/cdi-tomee/src/test/conf/context.xml | 23 ++++++++++++++++++++
tck/cdi-tomee/src/test/resources/arquillian.xml | 1 +
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/052cd751/tck/cdi-tomee/src/test/conf/context.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/conf/context.xml b/tck/cdi-tomee/src/test/conf/context.xml
new file mode 100644
index 0000000..c82f36e
--- /dev/null
+++ b/tck/cdi-tomee/src/test/conf/context.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+ <WatchedResource>WEB-INF/web.xml</WatchedResource>
+ <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+ <Manager pathname="" /> <!-- no session serialization -->
+</Context>
http://git-wip-us.apache.org/repos/asf/tomee/blob/052cd751/tck/cdi-tomee/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/src/test/resources/arquillian.xml b/tck/cdi-tomee/src/test/resources/arquillian.xml
index 5bc7c42..a5caa8e 100644
--- a/tck/cdi-tomee/src/test/resources/arquillian.xml
+++ b/tck/cdi-tomee/src/test/resources/arquillian.xml
@@ -27,6 +27,7 @@
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">plus</property>
+ <property name="conf">src/test/conf</property>
<property name="dir">target/tomee</property>
<property name="appWorkingDir">target/workdir</property>
<property name="cleanOnStartUp">true</property>