diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-13 01:42:27 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-13 01:42:27 +0000 |
commit | 3c7c4a749baafcf375f4785a7668d3a25c9063e3 (patch) | |
tree | a66b8b031c5dc6c7744f44b44b6bcd371bd0b8df /sca-java-1.x/trunk/modules/host-jetty/src | |
parent | eb03ff672236cddf65533f39b83ddd5e2984a2bb (diff) |
Moving 1.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java (renamed from branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java (renamed from branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (renamed from branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java (renamed from branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (renamed from branches/sca-java-1.x/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java (renamed from branches/sca-java-1.x/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/test/resources/content/test.html (renamed from branches/sca-java-1.x/modules/host-jetty/src/test/resources/content/test.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/trunk/modules/host-jetty/src/test/resources/tuscany.keyStore (renamed from branches/sca-java-1.x/modules/host-jetty/src/test/resources/tuscany.keyStore) | bin | 1265 -> 1265 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java index 4f5bfb3c62..4f5bfb3c62 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java +++ b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java diff --git a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java index 1ecf1bca1b..1ecf1bca1b 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java +++ b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java diff --git a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java index 6e165cd219..6e165cd219 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java +++ b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java diff --git a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java index 884c8a4cce..884c8a4cce 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java +++ b/sca-java-1.x/trunk/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java diff --git a/branches/sca-java-1.x/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/trunk/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator index f61708de90..f61708de90 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ b/sca-java-1.x/trunk/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator diff --git a/branches/sca-java-1.x/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/trunk/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java index 020dd4af0e..020dd4af0e 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java +++ b/sca-java-1.x/trunk/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java diff --git a/branches/sca-java-1.x/modules/host-jetty/src/test/resources/content/test.html b/sca-java-1.x/trunk/modules/host-jetty/src/test/resources/content/test.html index f4b79d7f01..f4b79d7f01 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/test/resources/content/test.html +++ b/sca-java-1.x/trunk/modules/host-jetty/src/test/resources/content/test.html diff --git a/branches/sca-java-1.x/modules/host-jetty/src/test/resources/tuscany.keyStore b/sca-java-1.x/trunk/modules/host-jetty/src/test/resources/tuscany.keyStore Binary files differindex 7ea23f7ff4..7ea23f7ff4 100644 --- a/branches/sca-java-1.x/modules/host-jetty/src/test/resources/tuscany.keyStore +++ b/sca-java-1.x/trunk/modules/host-jetty/src/test/resources/tuscany.keyStore |