Author: ay Date: Thu Apr 5 21:54:04 2012 New Revision: 1310092 URL: http://svn.apache.org/viewvc?rev=1310092&view=rev Log: Merged revisions 1308629 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk
........ r1308629 | dkulp | 2012-04-03 02:09:11 +0200 (Tue, 03 Apr 2012) | 30 lines [CXF-4083] Blueprint support for http-jetty Pull from Johan Edstrom with major thanks! Squashed commit of the following: commit 85ad9e1874f1963a3297b21aca4058316b0633ff Author: Johan Edstrom <[email protected]> Date: Mon Apr 2 14:56:21 2012 -0600 Fix bad compile commit f916d3753ae18ac5e3e26f23d952468cfc614912 Author: Johan Edstrom <[email protected]> Date: Mon Apr 2 14:30:20 2012 -0600 Revert "Remove un-used spring beans" This reverts commit 1265fd4e1472bf25ef5a1d2b22188b8151fb3194. commit 1265fd4e1472bf25ef5a1d2b22188b8151fb3194 Author: Johan Edstrom <[email protected]> Date: Mon Apr 2 14:23:20 2012 -0600 Remove un-used spring beans commit 5b380aab3fd4b2f4a8a001937bcd26d860179072 Author: Johan Edstrom <[email protected]> Date: Mon Apr 2 14:12:27 2012 -0600 httpj:engine-factory ........ Added: cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/ - copied from r1308629, cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/ cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/resources/OSGI-INF/ - copied from r1308629, cxf/trunk/rt/transports/http-jetty/src/main/resources/OSGI-INF/ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/transports/http-jetty/pom.xml cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/transports/http-jetty/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http-jetty/pom.xml?rev=1310092&r1=1310091&r2=1310092&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http-jetty/pom.xml (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http-jetty/pom.xml Thu Apr 5 21:54:04 2012 @@ -35,6 +35,21 @@ <dependencies> <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-api</artifactId> <version>${project.version}</version> Modified: cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java?rev=1310092&r1=1308629&r2=1310092&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java Thu Apr 5 21:54:04 2012 @@ -33,12 +33,12 @@ import javax.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Element; -import org.apache.cxf.common.jaxb.JAXBContextCache; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.common.util.PackageUtils; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.configuration.jsse.TLSServerParameters; import org.apache.cxf.configuration.jsse.spring.TLSServerParametersConfig; +import org.apache.cxf.jaxb.JAXBContextCache; import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine; import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory; import org.apache.cxf.transport.http_jetty.ThreadingParameters;
