FELIX-1962 Register the EventDispatcher for it to be available in the ProxyListener (see the HTTP proxy bundle)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1057093 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java b/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
index 888dbe3..c753a9c 100644
--- a/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
+++ b/http/bridge/src/main/java/org/apache/felix/http/bridge/internal/BridgeActivator.java
@@ -1,37 +1,52 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.felix.http.bridge.internal;
import javax.servlet.http.HttpServlet;
+
+import java.util.EventListener;
import java.util.Hashtable;
import org.apache.felix.http.base.internal.AbstractHttpActivator;
import org.apache.felix.http.base.internal.logger.SystemLogger;
+import org.osgi.framework.Constants;
-public final class BridgeActivator
- extends AbstractHttpActivator
+public final class BridgeActivator extends AbstractHttpActivator
{
@Override
- protected void doStart()
- throws Exception
+ protected void doStart() throws Exception
{
super.doStart();
+
+ // dispatcher servlet
Hashtable<String, Object> props = new Hashtable<String, Object>();
props.put("http.felix.dispatcher", getDispatcherServlet().getClass().getName());
+ props.put(Constants.SERVICE_DESCRIPTION, "Dispatcher for bridged request handling");
+ props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
getBundleContext().registerService(HttpServlet.class.getName(), getDispatcherServlet(), props);
+
+ // Http Session event dispatcher
+ props = new Hashtable<String, Object>();
+ props.put("http.felix.dispatcher", getEventDispatcher().getClass().getName());
+ props.put(Constants.SERVICE_DESCRIPTION, "Dispatcher for bridged HttpSession events");
+ props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+ getBundleContext().registerService(EventListener.class.getName(), getEventDispatcher(), props);
+
SystemLogger.info("Started bridged http service");
}
}