Author: gnodet
Date: Wed Jul 2 08:05:38 2008
New Revision: 673413
URL: http://svn.apache.org/viewvc?rev=673413&view=rev
Log:
Fix build, upgrade to latest 6.1.x jetty, fix osgi manifest
Added:
servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/
servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/spring/
servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/spring/servicemix-http.xml
Modified:
servicemix/components/bindings/servicemix-http/trunk/pom.xml
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpComponent.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/packaging/HttpServiceUnitAnalyzer.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
Modified: servicemix/components/bindings/servicemix-http/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/pom.xml?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-http/trunk/pom.xml Wed Jul 2
08:05:38 2008
@@ -47,7 +47,25 @@
-->
<servicemix-version>3.3-SNAPSHOT</servicemix-version>
<servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
- <jetty-version>6.1.6</jetty-version>
+ <jetty-version>6.1.11</jetty-version>
+ <activemq-version>5.1.0</activemq-version>
+
+ <servicemix.osgi.import>
+ com.thoughtworks.xstream*;resolution:=optional,
+ org.apache.servicemix.jbi.container*;resolution:=optional,
+ org.apache.servicemix.jbi.framework*;resolution:=optional,
+ org.apache.servicemix.common.osgi,
+ org.apache.woden*;resolution:=optional,
+ org.apache.xbean.spring.context.v2,
+ org.mortbay.jetty.client*;resolution:=optional,
+ org.springframework.beans.factory.xml,
+ org.springframework.web*;resolution:=optional,
+ *
+ </servicemix.osgi.import>
+ <servicemix.osgi.export>
+ org.apache.servicemix*;version=${project.version},
+
META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.http
+ </servicemix.osgi.export>
</properties>
<dependencies>
@@ -63,6 +81,12 @@
<version>${servicemix-version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -127,7 +151,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>3.2.1</version>
+ <version>${servicemix-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpComponent.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpComponent.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpComponent.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpComponent.java
Wed Jul 2 08:05:38 2008
@@ -31,6 +31,8 @@
import org.apache.servicemix.common.Deployer;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ServiceUnit;
+import org.apache.servicemix.common.util.IntrospectionSupport;
+import org.apache.servicemix.common.util.URISupport;
import org.apache.servicemix.common.security.AuthenticationService;
import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.common.xbean.BaseXBeanDeployer;
@@ -38,9 +40,6 @@
import org.apache.servicemix.http.endpoints.HttpProviderEndpoint;
import org.apache.servicemix.http.jetty.JCLLogger;
import org.apache.servicemix.http.jetty.JettyContextManager;
-import org.apache.servicemix.jbi.security.auth.impl.JAASAuthenticationService;
-import org.apache.servicemix.jbi.util.IntrospectionSupport;
-import org.apache.servicemix.jbi.util.URISupport;
/**
*
@@ -198,7 +197,7 @@
try {
String name = configuration.getKeystoreManagerName();
Object km = context.getNamingContext().lookup(name);
- configuration.setKeystoreManager((KeystoreManager) km);
+ configuration.setKeystoreManager(km);
} catch (Throwable e) {
// ignore
}
@@ -207,11 +206,14 @@
try {
String name = configuration.getAuthenticationServiceName();
Object as = context.getNamingContext().lookup(name);
- configuration.setAuthenticationService((AuthenticationService)
as);
+ configuration.setAuthenticationService(as);
} catch (Throwable e) {
- //TODO: gnodet - should I make SMX3 core depends on components
common?
- // this way, we should be able to make
JAASAuthenticationService implement the new interface
- //configuration.setAuthenticationService(new
JAASAuthenticationService());
+ try {
+ Class cl =
Class.forName("org.apache.servicemix.jbi.security.auth.impl.JAASAuthenticationService");
+ configuration.setAuthenticationService(cl.newInstance());
+ } catch (Throwable t) {
+ logger.warn("Unable to retrieve or create the
authentication service");
+ }
}
}
// Create client
@@ -295,7 +297,7 @@
/**
* @return the keystoreManager
*/
- public KeystoreManager getKeystoreManager() {
+ public Object getKeystoreManager() {
return configuration.getKeystoreManager();
}
@@ -303,14 +305,14 @@
* @param keystoreManager
* the keystoreManager to set
*/
- public void setKeystoreManager(KeystoreManager keystoreManager) {
+ public void setKeystoreManager(Object keystoreManager) {
this.configuration.setKeystoreManager(keystoreManager);
}
/**
* @return the authenticationService
*/
- public AuthenticationService getAuthenticationService() {
+ public Object getAuthenticationService() {
return configuration.getAuthenticationService();
}
@@ -318,15 +320,13 @@
* @param authenticationService
* the authenticationService to set
*/
- public void setAuthenticationService(AuthenticationService
authenticationService) {
+ public void setAuthenticationService(Object authenticationService) {
this.configuration.setAuthenticationService(authenticationService);
}
/**
* When servicemix-http is embedded inside a web application and
configured to reuse the existing servlet container,
* this method will create and return the HTTPProcessor which will handle
all servlet calls
- *
- * @param mappings
*/
public HttpProcessor getMainProcessor() {
return server.getMainProcessor();
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpConfiguration.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
Wed Jul 2 08:05:38 2008
@@ -23,8 +23,6 @@
import java.io.InputStream;
import java.util.Properties;
-import org.apache.servicemix.common.security.AuthenticationService;
-import org.apache.servicemix.common.security.KeystoreManager;
import org.mortbay.jetty.nio.SelectChannelConnector;
/**
@@ -43,8 +41,8 @@
private Properties properties = new Properties();
private boolean streamingEnabled;
private String jettyConnectorClassName =
DEFAULT_JETTY_CONNECTOR_CLASS_NAME;
- private transient KeystoreManager keystoreManager;
- private transient AuthenticationService authenticationService;
+ private transient Object keystoreManager;
+ private transient Object authenticationService;
/**
* The JNDI name of the AuthenticationService object
@@ -206,14 +204,14 @@
/**
* @return the authenticationService
*/
- public AuthenticationService getAuthenticationService() {
+ public Object getAuthenticationService() {
return authenticationService;
}
/**
* @param authenticationService the authenticationService to set
*/
- public void setAuthenticationService(AuthenticationService
authenticationService) {
+ public void setAuthenticationService(Object authenticationService) {
this.authenticationService = authenticationService;
}
@@ -235,14 +233,14 @@
/**
* @return the keystoreManager
*/
- public KeystoreManager getKeystoreManager() {
+ public Object getKeystoreManager() {
return keystoreManager;
}
/**
* @param keystoreManager the keystoreManager to set
*/
- public void setKeystoreManager(KeystoreManager keystoreManager) {
+ public void setKeystoreManager(Object keystoreManager) {
this.keystoreManager = keystoreManager;
}
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
Wed Jul 2 08:05:38 2008
@@ -346,12 +346,12 @@
public AuthenticationService getAuthenticationService() {
HttpComponent comp = (HttpComponent) getServiceUnit().getComponent();
- return comp.getAuthenticationService();
+ return
AuthenticationService.Proxy.create(comp.getAuthenticationService());
}
public KeystoreManager getKeystoreManager() {
HttpComponent comp = (HttpComponent) getServiceUnit().getComponent();
- return comp.getKeystoreManager();
+ return KeystoreManager.Proxy.create(comp.getKeystoreManager());
}
public void validate() throws DeploymentException {
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/DefaultHttpConsumerMarshaler.java
Wed Jul 2 08:05:38 2008
@@ -34,7 +34,7 @@
import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
import org.apache.servicemix.jbi.jaxp.XMLStreamHelper;
-import org.apache.servicemix.jbi.messaging.MessageExchangeSupport;
+import org.apache.servicemix.common.JbiConstants;
/**
* The default consumer marshaler used for non-soap consumer endpoints.
@@ -48,7 +48,7 @@
private URI defaultMep;
public DefaultHttpConsumerMarshaler() {
- this(MessageExchangeSupport.IN_OUT);
+ this(JbiConstants.IN_OUT);
}
public DefaultHttpConsumerMarshaler(URI defaultMep) {
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpConsumerEndpoint.java
Wed Jul 2 08:05:38 2008
@@ -41,6 +41,7 @@
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.ServiceUnit;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.endpoints.ConsumerEndpoint;
import org.apache.servicemix.http.ContextManager;
import org.apache.servicemix.http.HttpComponent;
@@ -49,7 +50,6 @@
import org.apache.servicemix.http.SslParameters;
import org.apache.servicemix.http.jetty.JaasJettyPrincipal;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.messaging.MessageExchangeSupport;
import org.mortbay.jetty.RetryRequest;
import org.mortbay.util.ajax.Continuation;
import org.mortbay.util.ajax.ContinuationSupport;
@@ -71,7 +71,7 @@
private String locationURI;
private HttpConsumerMarshaler marshaler;
private long timeout; // 0 => default to the timeout configured on
component
- private URI defaultMep = MessageExchangeSupport.IN_OUT;
+ private URI defaultMep = JbiConstants.IN_OUT;
private Map<String, Object> resources = new HashMap<String, Object>();
private Map<String, Continuation> locks = new ConcurrentHashMap<String,
Continuation>();
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/endpoints/HttpProviderEndpoint.java
Wed Jul 2 08:05:38 2008
@@ -25,7 +25,7 @@
import javax.jbi.management.DeploymentException;
import javax.xml.namespace.QName;
-import org.apache.servicemix.JbiConstants;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.ServiceUnit;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JaasUserRealm.java
Wed Jul 2 08:05:38 2008
@@ -26,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.security.AuthenticationService;
-import org.apache.servicemix.jbi.security.auth.impl.JAASAuthenticationService;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.security.UserRealm;
@@ -41,7 +40,7 @@
private String name = getClass().getName();
private String domain = "servicemix-domain";
- private AuthenticationService authenticationService /*= new
JAASAuthenticationService()*/;
+ private AuthenticationService authenticationService;
private final Map<String, JaasJettyPrincipal> userMap = new
ConcurrentHashMap<String, JaasJettyPrincipal>();
/**
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/JettyContextManager.java
Wed Jul 2 08:05:38 2008
@@ -38,6 +38,8 @@
import org.apache.servicemix.http.HttpConfiguration;
import org.apache.servicemix.http.HttpProcessor;
import org.apache.servicemix.http.SslParameters;
+import org.apache.servicemix.common.security.KeystoreManager;
+import org.apache.servicemix.common.security.AuthenticationService;
import org.mortbay.component.AbstractLifeCycle;
import org.mortbay.jetty.AbstractConnector;
import org.mortbay.jetty.Connector;
@@ -197,7 +199,7 @@
secHandler.setAuthMethod(processor.getAuthMethod());
JaasUserRealm realm = new JaasUserRealm();
if (configuration.getAuthenticationService() != null) {
-
realm.setAuthenticationService(configuration.getAuthenticationService());
+
realm.setAuthenticationService(AuthenticationService.Proxy.create(configuration.getAuthenticationService()));
}
secHandler.setUserRealm(realm);
context.setHandler(secHandler);
@@ -358,7 +360,7 @@
sslConnector.setKeyAlias(ssl.getKeyAlias());
sslConnector.setNeedClientAuth(ssl.isNeedClientAuth());
sslConnector.setWantClientAuth(ssl.isWantClientAuth());
-
sslConnector.setKeystoreManager(getConfiguration().getKeystoreManager());
+
sslConnector.setKeystoreManager(KeystoreManager.Proxy.create(getConfiguration().getKeystoreManager()));
// important to set this values for selfsigned keys
// otherwise the standard truststore of the jre is used
sslConnector.setTruststore(ssl.getTrustStore());
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/jetty/ServiceMixSslSocketConnector.java
Wed Jul 2 08:05:38 2008
@@ -18,8 +18,8 @@
import javax.net.ssl.SSLServerSocketFactory;
-import org.apache.servicemix.common.security.KeystoreManager;
import org.mortbay.jetty.security.SslSocketConnector;
+import org.apache.servicemix.common.security.KeystoreManager;
public class ServiceMixSslSocketConnector extends SslSocketConnector {
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/packaging/HttpServiceUnitAnalyzer.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/packaging/HttpServiceUnitAnalyzer.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/packaging/HttpServiceUnitAnalyzer.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/packaging/HttpServiceUnitAnalyzer.java
Wed Jul 2 08:05:38 2008
@@ -32,7 +32,7 @@
* and provides
*
* @author Philip Dodds
- * @see ServiceUnitAnalyzer, [EMAIL PROTECTED] ServiceUnitAnalyzer}
+ * @see org.apache.servicemix.common.packaging.ServiceUnitAnalyzer , [EMAIL
PROTECTED] org.apache.servicemix.common.packaging.ServiceUnitAnalyzer}
* @since 3.0
*/
public class HttpServiceUnitAnalyzer extends AbstractXBeanServiceUnitAnalyzer {
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
Wed Jul 2 08:05:38 2008
@@ -38,7 +38,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.JbiConstants;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.EndpointComponentContext;
import org.apache.servicemix.common.ExchangeProcessor;
import org.apache.servicemix.http.ContextManager;
@@ -60,10 +60,6 @@
public class ConsumerProcessor extends AbstractProcessor implements
ExchangeProcessor, HttpProcessor {
- public static final URI IN_ONLY =
URI.create("http://www.w3.org/2004/08/wsdl/in-only";);
- public static final URI IN_OUT =
URI.create("http://www.w3.org/2004/08/wsdl/in-out";);
- public static final URI ROBUST_IN_ONLY =
URI.create("http://www.w3.org/2004/08/wsdl/robust-in-only";);
-
private static Log log = LogFactory.getLog(ConsumerProcessor.class);
protected Object httpContext;
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java?rev=673413&r1=673412&r2=673413&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
Wed Jul 2 08:05:38 2008
@@ -50,8 +50,9 @@
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.JbiConstants;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.ExchangeProcessor;
+import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.http.HttpComponent;
import org.apache.servicemix.http.HttpEndpoint;
import org.apache.servicemix.soap.Context;
@@ -267,7 +268,7 @@
if (protocol == null) {
ProtocolSocketFactory sf = new CommonsHttpSSLSocketFactory(
endpoint.getSsl(),
- endpoint.getKeystoreManager());
+
KeystoreManager.Proxy.create(endpoint.getKeystoreManager()));
protocol = new Protocol("https", sf, 443);
}
}
Added:
servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/spring/servicemix-http.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/spring/servicemix-http.xml?rev=673413&view=auto
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/spring/servicemix-http.xml
(added)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/resources/META-INF/spring/servicemix-http.xml
Wed Jul 2 08:05:38 2008
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xmlns:util="http://www.springframework.org/schema/util";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
+
+ <bean id="servicemix-http"
class="org.apache.servicemix.http.HttpComponent">
+ </bean>
+
+ <bean id="endpoint-tracker"
class="org.apache.servicemix.common.osgi.EndpointTracker">
+ <property name="component" ref="servicemix-http" />
+ </bean>
+
+ <osgi:list id="endpoints"
+ interface="org.apache.servicemix.common.osgi.EndpointWrapper"
+ cardinality="0..N">
+ <osgi:listener ref="endpoint-tracker" bind-method="register"
unbind-method="unregister" />
+ </osgi:list>
+
+ <osgi:service ref="servicemix-http"
interface="javax.jbi.component.Component">
+ <osgi:service-properties>
+ <entry key="NAME" value="servicemix-http" />
+ <entry key="TYPE" value="binding-component" />
+ </osgi:service-properties>
+ </osgi:service>
+
+</beans>
