summaryrefslogtreecommitdiffstats
path: root/branches/sca-equinox/modules/host-jetty
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-23 23:44:47 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2008-09-23 23:44:47 +0000
commit635fe997f91dbec1cf8ab0b7aeb8c76c56330013 (patch)
tree439e0a407f1fa2c51456b8dd028dc3b03a7c2c73 /branches/sca-equinox/modules/host-jetty
parent1aba7b831e19fa8f9b718f42c1a0c4d09f6d52ad (diff)
Starting to fix jetty OSGi import/exports.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@698404 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--branches/sca-equinox/modules/host-jetty/pom.xml4
-rw-r--r--branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java (renamed from branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java)3
-rw-r--r--branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator2
3 files changed, 5 insertions, 4 deletions
diff --git a/branches/sca-equinox/modules/host-jetty/pom.xml b/branches/sca-equinox/modules/host-jetty/pom.xml
index 736a6f8dde..ee76b73ab4 100644
--- a/branches/sca-equinox/modules/host-jetty/pom.xml
+++ b/branches/sca-equinox/modules/host-jetty/pom.xml
@@ -66,7 +66,9 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.host.jetty</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.http.jetty*</Export-Package>
+ <Export-Package>
+ org.apache.tuscany.sca.http.jetty,
+ </Export-Package>
<Import-Package>
org.mortbay.jetty;version="6.1.7",
org.mortbay.jetty.handler;version="6.1.7",
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
index 884c8a4cce..31c8397f8b 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ b/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.http.jetty.module;
+package org.apache.tuscany.sca.http.jetty;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -28,7 +28,6 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.http.jetty.JettyServer;
import org.apache.tuscany.sca.work.WorkScheduler;
/**
diff --git a/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index f61708de90..e826f5a496 100644
--- a/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
# Implementation class for the ModuleActivator
-org.apache.tuscany.sca.http.jetty.module.JettyRuntimeModuleActivator
+org.apache.tuscany.sca.http.jetty.JettyRuntimeModuleActivator