diff options
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java')
-rw-r--r-- | jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java index e61ef566f1..d99b1893ee 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java @@ -36,19 +36,15 @@ import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; - - /** * ServiceWebAppProvider - * + * <p> * Jetty Provider that knows how to deploy a WebApp that has been registered as an OSGi service. - * */ public class ServiceWebAppProvider extends AbstractWebAppProvider implements ServiceProvider { private static final Logger LOG = Log.getLogger(AbstractWebAppProvider.class); - /** * Map of ServiceRef to App. Used when it is an osgi service that is a WebAppContext. */ @@ -56,7 +52,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser private ServiceRegistration _serviceRegForServices; - /** * ServiceApp * @@ -91,9 +86,6 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser /* ------------------------------------------------------------ */ - /** - * @param wrapper - */ public ServiceWebAppProvider (ServerInstanceWrapper wrapper) { super(wrapper); @@ -128,6 +120,8 @@ public class ServiceWebAppProvider extends AbstractWebAppProvider implements Ser String base = (String)serviceRef.getProperty(OSGiWebappConstants.JETTY_WAR_FOLDER_PATH); if (base == null) + base = (String)serviceRef.getProperty(OSGiWebappConstants.JETTY_WAR_RESOURCE_PATH); + if (base == null) base = (String)serviceRef.getProperty(OSGiWebappConstants.SERVICE_PROP_WAR); if (base == null) |