Author: gertv
Date: Wed Jul 2 02:59:59 2008
New Revision: 673337
URL: http://svn.apache.org/viewvc?rev=673337&view=rev
Log:
SMX4-43: Partial solution for build failure in servicemix-http
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/jetty/JaasUserRealm.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/processors/CommonsHttpSSLSocketFactory.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=673337&r1=673336&r2=673337&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-http/trunk/pom.xml Wed Jul 2
02:59:59 2008
@@ -190,6 +190,12 @@
<scope>provided</scope>
<version>1.1.2</version>
</dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <scope>test</scope>
+ <version>1.0</version>
+ </dependency>
</dependencies>
<build>
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=673337&r1=673336&r2=673337&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 02:59:59 2008
@@ -31,14 +31,14 @@
import org.apache.servicemix.common.Deployer;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ServiceUnit;
+import org.apache.servicemix.common.security.AuthenticationService;
+import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.common.xbean.BaseXBeanDeployer;
import org.apache.servicemix.http.endpoints.HttpConsumerEndpoint;
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.AuthenticationService;
import org.apache.servicemix.jbi.security.auth.impl.JAASAuthenticationService;
-import org.apache.servicemix.jbi.security.keystore.KeystoreManager;
import org.apache.servicemix.jbi.util.IntrospectionSupport;
import org.apache.servicemix.jbi.util.URISupport;
@@ -209,7 +209,9 @@
Object as = context.getNamingContext().lookup(name);
configuration.setAuthenticationService((AuthenticationService)
as);
} catch (Throwable e) {
- configuration.setAuthenticationService(new
JAASAuthenticationService());
+ //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());
}
}
// Create client
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=673337&r1=673336&r2=673337&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 02:59:59 2008
@@ -23,8 +23,8 @@
import java.io.InputStream;
import java.util.Properties;
-import org.apache.servicemix.jbi.security.auth.AuthenticationService;
-import org.apache.servicemix.jbi.security.keystore.KeystoreManager;
+import org.apache.servicemix.common.security.AuthenticationService;
+import org.apache.servicemix.common.security.KeystoreManager;
import org.mortbay.jetty.nio.SelectChannelConnector;
/**
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=673337&r1=673336&r2=673337&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 02:59:59 2008
@@ -30,17 +30,18 @@
import javax.wsdl.extensions.http.HTTPAddress;
import javax.xml.namespace.QName;
-import com.ibm.wsdl.extensions.http.HTTPAddressImpl;
import org.apache.servicemix.common.ExchangeProcessor;
import org.apache.servicemix.common.ExternalEndpoint;
import org.apache.servicemix.common.ManagementSupport;
+import org.apache.servicemix.common.security.AuthenticationService;
+import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.http.processors.ConsumerProcessor;
import org.apache.servicemix.http.processors.ProviderProcessor;
import org.apache.servicemix.http.tools.PortTypeDecorator;
-import org.apache.servicemix.jbi.security.auth.AuthenticationService;
-import org.apache.servicemix.jbi.security.keystore.KeystoreManager;
import org.apache.servicemix.soap.SoapEndpoint;
+import com.ibm.wsdl.extensions.http.HTTPAddressImpl;
+
/**
*
* @author gnodet
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=673337&r1=673336&r2=673337&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 02:59:59 2008
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jbi.security.auth.AuthenticationService;
+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 +41,7 @@
private String name = getClass().getName();
private String domain = "servicemix-domain";
- private AuthenticationService authenticationService = new
JAASAuthenticationService();
+ private AuthenticationService authenticationService /*= new
JAASAuthenticationService()*/;
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/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=673337&r1=673336&r2=673337&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 02:59:59 2008
@@ -18,7 +18,7 @@
import javax.net.ssl.SSLServerSocketFactory;
-import org.apache.servicemix.jbi.security.keystore.KeystoreManager;
+import org.apache.servicemix.common.security.KeystoreManager;
import org.mortbay.jetty.security.SslSocketConnector;
public class ServiceMixSslSocketConnector extends SslSocketConnector {
Modified:
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java?rev=673337&r1=673336&r2=673337&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
(original)
+++
servicemix/components/bindings/servicemix-http/trunk/src/main/java/org/apache/servicemix/http/processors/CommonsHttpSSLSocketFactory.java
Wed Jul 2 02:59:59 2008
@@ -34,8 +34,8 @@
import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.params.HttpConnectionParams;
import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
+import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.http.SslParameters;
-import org.apache.servicemix.jbi.security.keystore.KeystoreManager;
import org.mortbay.resource.Resource;
import org.springframework.core.io.ClassPathResource;
