summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/java-M1/java/sca/tomcat
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:11:40 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:11:40 +0000
commit76e9f96ca7f494088fe3af5a46ad0d153e961008 (patch)
treee44436205dcb28d3d8c6352fa7b36a90f59db2a1 /sca-java-1.x/branches/java-M1/java/sca/tomcat
parentf9be2165328dc76f562938566057e89c0723fe08 (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835139 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/pom.xml (renamed from branches/java-M1/java/sca/tomcat/pom.xml)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java (renamed from branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java (renamed from branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java (renamed from branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java (renamed from branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java (renamed from branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java (renamed from branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt (renamed from branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/NOTICE (renamed from branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/README.txt (renamed from branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/README.txt)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties (renamed from branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties (renamed from branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/system.fragment (renamed from branches/java-M1/java/sca/tomcat/src/main/resources/system.fragment)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java (renamed from branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/index.html (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app1/index.html)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml)0
-rw-r--r--sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/index.html (renamed from branches/java-M1/java/sca/tomcat/src/test/resources/app2/index.html)0
29 files changed, 0 insertions, 0 deletions
diff --git a/branches/java-M1/java/sca/tomcat/pom.xml b/sca-java-1.x/branches/java-M1/java/sca/tomcat/pom.xml
index ff16f54136..ff16f54136 100644
--- a/branches/java-M1/java/sca/tomcat/pom.xml
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/pom.xml
diff --git a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java
index 60c9a7961f..60c9a7961f 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/ContainerLoader.java
diff --git a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
index 8351da8edd..8351da8edd 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
diff --git a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
index 7e3edf67f9..7e3edf67f9 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
diff --git a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
index 37984ef40d..37984ef40d 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
diff --git a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
index 352a04bde0..352a04bde0 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyValve.java
diff --git a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
index de53ad4d45..de53ad4d45 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
diff --git a/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
index 43fc99958e..43fc99958e 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/LocalStrings.properties
diff --git a/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties
index f926ca6488..f926ca6488 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/org/apache/tuscany/tomcat/Messages.properties
diff --git a/branches/java-M1/java/sca/tomcat/src/main/resources/system.fragment b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/system.fragment
index e379e1d90b..e379e1d90b 100644
--- a/branches/java-M1/java/sca/tomcat/src/main/resources/system.fragment
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/main/resources/system.fragment
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
index babe25adc7..babe25adc7 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java
index 4db61fa58c..4db61fa58c 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldImpl.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java
index a9b78cadf4..a9b78cadf4 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/HelloWorldService.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java
index 486fec5bd4..486fec5bd4 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestClassLoader.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
index 2cd8ce06a2..2cd8ce06a2 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TestServlet.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
index 75bd85cf65..75bd85cf65 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatIntegrationTestCase.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
index 1aeb966625..1aeb966625 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/TomcatStandaloneTestCase.java
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
index 07566475de..07566475de 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/axis2.xml
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
index 4d19c4d192..4d19c4d192 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/sca.module
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
index 3d299481e5..3d299481e5 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
index f109ddf404..f109ddf404 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/WEB-INF/web.xml
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/index.html b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/index.html
index 71653b974f..71653b974f 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app1/index.html
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app1/index.html
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
index 90ad0d44e0..90ad0d44e0 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/sca.module
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
index 3d299481e5..3d299481e5 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
index 9bd3882e81..9bd3882e81 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/WEB-INF/web.xml
diff --git a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/index.html b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/index.html
index 55ecbd81ba..55ecbd81ba 100644
--- a/branches/java-M1/java/sca/tomcat/src/test/resources/app2/index.html
+++ b/sca-java-1.x/branches/java-M1/java/sca/tomcat/src/test/resources/app2/index.html