summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-12 07:12:26 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-12 07:12:26 +0000
commite3c71c60989895a78504f161d7393f39103221c5 (patch)
treec3c4fc08dbbb4eccf403bd1a8e4ad1ccf9c9b24a
parent13257f84448984b84c86701db560eafdd7aef88a (diff)
Move the OSGi based http host from contrib to trunk as I'm starting to use it
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1134874 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/LICENSE (renamed from sca-java-2.x/contrib/modules/host-http-osgi/LICENSE)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/META-INF/MANIFEST.MF (renamed from sca-java-2.x/contrib/modules/host-http-osgi/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/NOTICE (renamed from sca-java-2.x/contrib/modules/host-http-osgi/NOTICE)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/pom.xml (renamed from sca-java-2.x/contrib/modules/host-http-osgi/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java (renamed from sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java (renamed from sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java (renamed from sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java (renamed from sca-java-2.x/contrib/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/test/resources/content/test.html (renamed from sca-java-2.x/contrib/modules/host-http-osgi/src/test/resources/content/test.html)0
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/test/resources/tuscany.keyStore (renamed from sca-java-2.x/contrib/modules/host-http-osgi/src/test/resources/tuscany.keyStore)bin1265 -> 1265 bytes
10 files changed, 0 insertions, 0 deletions
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/LICENSE b/sca-java-2.x/trunk/modules/host-http-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/LICENSE
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/LICENSE
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/host-http-osgi/META-INF/MANIFEST.MF
index 807c1b0135..807c1b0135 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/NOTICE b/sca-java-2.x/trunk/modules/host-http-osgi/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/NOTICE
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/NOTICE
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/pom.xml b/sca-java-2.x/trunk/modules/host-http-osgi/pom.xml
index a384ff6c9a..a384ff6c9a 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/pom.xml
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/pom.xml
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java
index 3cfca3e6c8..3cfca3e6c8 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/HttpServiceWrapper.java
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
index 643599afb8..643599afb8 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java
index 789deeb94e..789deeb94e 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/ServletRequestDispatcher.java
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java b/sca-java-2.x/trunk/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java
index b38543a7e9..b38543a7e9 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/test/java/org/apache/tuscany/sca/http/osgi/OSGiServletHostTestCase.java
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/test/resources/content/test.html b/sca-java-2.x/trunk/modules/host-http-osgi/src/test/resources/content/test.html
index 9ee377e1ff..9ee377e1ff 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/test/resources/content/test.html
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/test/resources/content/test.html
diff --git a/sca-java-2.x/contrib/modules/host-http-osgi/src/test/resources/tuscany.keyStore b/sca-java-2.x/trunk/modules/host-http-osgi/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/sca-java-2.x/contrib/modules/host-http-osgi/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/test/resources/tuscany.keyStore
Binary files differ