felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1734779 - in /felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty: ./ internal/
Date Sun, 13 Mar 2016 10:35:09 GMT
Author: cziegeler
Date: Sun Mar 13 10:35:09 2016
New Revision: 1734779

URL: http://svn.apache.org/viewvc?rev=1734779&view=rev
Log:
FELIX-5207 : Flexible Customizer for 'Enable Proxy/Load Balancer Connection'. Apply slightly
modified patch from Antonio Sanso

Added:
    felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
  (with props)
    felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
  (with props)
    felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
  (with props)
    felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
  (with props)

Added: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java?rev=1734779&view=auto
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
(added)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
Sun Mar 13 10:35:09 2016
@@ -0,0 +1,46 @@
+/*
+ * 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
+ *
+ * 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.jetty;
+
+import org.eclipse.jetty.server.HttpConfiguration.Customizer;
+import org.osgi.annotation.versioning.ConsumerType;
+
+
+/**
+ * The <code>LoadBalancerCustomizerFactory</code> is a service interface which
allows
+ * extensions to inject custom Jetty {@code Customizer} instances to add
+ * to the Jetty server in order to handle the Proxy Load Balancer connection.
+ *
+ * {@code LoadBalancerCustomizerFactory } services are responsible for creating the
+ * {@code Customizer} instances and providing base configuration.
+ *
+ * @since 2.1
+ */
+@ConsumerType
+public interface LoadBalancerCustomizerFactory
+{
+    /**
+     * Creates new Jetty {@code Customizer} instances.
+     *
+     * <p>
+     * @return A configured Jetty {@code Customizer} instance.
+     */
+    Customizer createCustomizer();
+
+}

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/LoadBalancerCustomizerFactory.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Added: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java?rev=1734779&view=auto
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
(added)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
Sun Mar 13 10:35:09 2016
@@ -0,0 +1,45 @@
+/*
+ * 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
+ *
+ * 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.jetty.internal;
+
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConfiguration.Customizer;
+import org.eclipse.jetty.server.Request;
+
+public class CustomizerWrapper implements Customizer
+{
+
+    private volatile Customizer customizer;
+
+    public void setCustomizer(final Customizer customizer)
+    {
+        this.customizer = customizer;
+    }
+
+    @Override
+    public void customize(final Connector connector,
+            final HttpConfiguration channelConfig,
+            final Request request)
+    {
+        final Customizer local = this.customizer;
+        if (local!= null )
+        {
+            local.customize(connector, channelConfig, request);
+        }
+    }
+}

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/CustomizerWrapper.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Added: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java?rev=1734779&view=auto
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
(added)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
Sun Mar 13 10:35:09 2016
@@ -0,0 +1,31 @@
+/*
+ * 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
+ *
+ * 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.jetty.internal;
+
+import org.apache.felix.http.jetty.LoadBalancerCustomizerFactory;
+import org.eclipse.jetty.server.ForwardedRequestCustomizer;
+import org.eclipse.jetty.server.HttpConfiguration.Customizer;
+
+public class ForwardedRequestCustomizerFactory implements LoadBalancerCustomizerFactory
+{
+    
+    @Override
+    public Customizer createCustomizer()
+    {
+        return new ForwardedRequestCustomizer();
+    }
+}

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ForwardedRequestCustomizerFactory.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Added: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java?rev=1734779&view=auto
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
(added)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
Sun Mar 13 10:35:09 2016
@@ -0,0 +1,106 @@
+/*
+ * 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
+ *
+ * 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.jetty.internal;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.felix.http.jetty.LoadBalancerCustomizerFactory;
+import org.eclipse.jetty.server.HttpConfiguration.Customizer;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+public class LoadBalancerCustomizerFactoryTracker extends ServiceTracker<LoadBalancerCustomizerFactory,
ServiceReference<LoadBalancerCustomizerFactory>>
+{
+
+    private final CustomizerWrapper customizerWrapper;
+    private final BundleContext bundleContext;
+    private final SortedSet<ServiceReference<LoadBalancerCustomizerFactory>>
set = new TreeSet<ServiceReference<LoadBalancerCustomizerFactory>>();
+
+    public LoadBalancerCustomizerFactoryTracker(final BundleContext context, final CustomizerWrapper
customizerWrapper)
+    {
+        super(context, LoadBalancerCustomizerFactory.class.getName(), null);
+        this.bundleContext =context;
+        this.customizerWrapper = customizerWrapper;
+    }
+
+    @Override
+    public ServiceReference<LoadBalancerCustomizerFactory> addingService(final ServiceReference<LoadBalancerCustomizerFactory>
reference)
+    {
+        super.addingService(reference);
+
+        final ServiceReference<LoadBalancerCustomizerFactory> highestReference;
+        synchronized (set)
+        {
+            set.add(reference);
+            highestReference = set.last();
+        }
+
+        boolean updated = false;
+        if (highestReference != null)
+        {
+            final LoadBalancerCustomizerFactory factory = bundleContext.getService(highestReference);
+            if (factory != null)
+            {
+                final Customizer customizer = factory.createCustomizer();
+                customizerWrapper.setCustomizer(customizer);
+                updated = true;
+            }
+        }
+        // something went wrong, null out wrapper
+        if ( !updated )
+        {
+            customizerWrapper.setCustomizer(null);
+        }
+
+        return reference;
+    }
+
+    @Override
+    public void removedService(final ServiceReference<LoadBalancerCustomizerFactory>
reference, final ServiceReference<LoadBalancerCustomizerFactory> service)
+    {
+        super.removedService(reference, service);
+
+        final ServiceReference<LoadBalancerCustomizerFactory> highestReference;
+        synchronized (set)
+        {
+            set.remove(reference);
+            highestReference = set.last();
+        }
+
+        boolean updated = false;
+        if (highestReference != null)
+        {
+            //update the customizer Wrapper
+            final LoadBalancerCustomizerFactory factory = bundleContext.getService(highestReference);
+            if (factory != null)
+            {
+                final Customizer customizer = factory.createCustomizer();
+                customizerWrapper.setCustomizer(customizer);
+                updated = true;
+            }
+        }
+        // something went wrong / or no service registered anymore, null out wrapper
+        if ( !updated )
+        {
+            customizerWrapper.setCustomizer(null);
+        }
+    }
+}

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LoadBalancerCustomizerFactoryTracker.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url



Mime
View raw message