summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/host-jetty7/src
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-20 23:53:35 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-20 23:53:35 +0000
commita3c48da9bb8971497d414f86e352123d95b9c3da (patch)
treefdf0f3636b65946c061c8b2e89d657b488be274e /sca-java-2.x/trunk/modules/host-jetty7/src
parentcc7496466097c3cb8e793ebf3e332b025705aaa7 (diff)
Moving 2.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882795 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java (renamed from java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java (renamed from java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost (renamed from java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost)0
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java (renamed from java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty7/src/test/resources/content/test.html (renamed from java/sca/modules/host-jetty7/src/test/resources/content/test.html)0
-rw-r--r--sca-java-2.x/trunk/modules/host-jetty7/src/test/resources/tuscany.keyStore (renamed from java/sca/modules/host-jetty7/src/test/resources/tuscany.keyStore)bin1265 -> 1265 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java b/sca-java-2.x/trunk/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
index dc6f155f80..dc6f155f80 100644
--- a/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
+++ b/sca-java-2.x/trunk/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyDefaultServlet.java
diff --git a/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java b/sca-java-2.x/trunk/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
index ae8e196147..ae8e196147 100644
--- a/java/sca/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
+++ b/sca-java-2.x/trunk/modules/host-jetty7/src/main/java/org/apache/tuscany/sca/http/jetty7/JettyServer.java
diff --git a/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/trunk/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
index 99278c123b..99278c123b 100644
--- a/java/sca/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/trunk/modules/host-jetty7/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
diff --git a/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java b/sca-java-2.x/trunk/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
index ff6894e858..ff6894e858 100644
--- a/java/sca/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
+++ b/sca-java-2.x/trunk/modules/host-jetty7/src/test/java/org/apache/tuscany/sca/http/jetty7/JettyServerTestCase.java
diff --git a/java/sca/modules/host-jetty7/src/test/resources/content/test.html b/sca-java-2.x/trunk/modules/host-jetty7/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/java/sca/modules/host-jetty7/src/test/resources/content/test.html
+++ b/sca-java-2.x/trunk/modules/host-jetty7/src/test/resources/content/test.html
diff --git a/java/sca/modules/host-jetty7/src/test/resources/tuscany.keyStore b/sca-java-2.x/trunk/modules/host-jetty7/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/java/sca/modules/host-jetty7/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/trunk/modules/host-jetty7/src/test/resources/tuscany.keyStore
Binary files differ