You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/10 15:53:32 UTC
svn commit: r1396602 - in /openejb/trunk/openejb: pom.xml
server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
server/openejb-hsql/src/main/resources/META-INF/org.apache.openejb.server.ServerService/hsql
Author: rmannibucau
Date: Wed Oct 10 13:53:32 2012
New Revision: 1396602
URL: http://svn.apache.org/viewvc?rev=1396602&view=rev
Log:
TOMEE-457 CXF 2.7.0 + disabling hsql service by default (since it is in our default distribution we don't want to activate it by default)
Modified:
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
openejb/trunk/openejb/server/openejb-hsql/src/main/resources/META-INF/org.apache.openejb.server.ServerService/hsql
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1396602&r1=1396601&r2=1396602&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Wed Oct 10 13:53:32 2012
@@ -123,7 +123,7 @@
<tomcat.version>7.0.32</tomcat.version>
<!-- used mainly by jetty modules -->
- <cxf.version>2.6.2</cxf.version>
+ <cxf.version>2.7.0</cxf.version>
<ehcache.version>2.6.0</ehcache.version> <!-- used by cxf for security (replay attack) -->
<jetty.version>7.5.3.v20111011</jetty.version>
<pax-url.version>1.3.5</pax-url.version>
Modified: openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java?rev=1396602&r1=1396601&r2=1396602&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java Wed Oct 10 13:53:32 2012
@@ -23,6 +23,7 @@ import org.apache.cxf.bus.extension.Exte
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
@@ -146,14 +147,14 @@ public final class CxfUtil {
}
}
- private static List<AbstractFeature> createFeatures(final Collection<ServiceInfo> availableServices, final String featuresIds) {
+ private static List<Feature> createFeatures(final Collection<ServiceInfo> availableServices, final String featuresIds) {
final List<?> features = ServiceInfos.resolve(availableServices, featuresIds.split(","));
for (Object instance : features) {
- if (!AbstractFeature.class.isInstance(instance)) {
+ if (!Feature.class.isInstance(instance)) {
throw new OpenEJBRuntimeException("feature should inherit from " + AbstractFeature.class.getName());
}
}
- return (List<AbstractFeature>) features;
+ return (List<Feature>) features;
}
private static List<Interceptor<? extends Message>> createInterceptors(final Collection<ServiceInfo> availableServices, final String ids) {
@@ -185,7 +186,7 @@ public final class CxfUtil {
final String featuresIds = properties.getProperty(BUS_PREFIX + FEATURES);
if (featuresIds != null) {
- final List<AbstractFeature> features = createFeatures(serviceInfos, featuresIds);
+ final List<Feature> features = createFeatures(serviceInfos, featuresIds);
if (features != null) {
features.addAll(busImpl.getFeatures());
busImpl.setFeatures(features);
Modified: openejb/trunk/openejb/server/openejb-hsql/src/main/resources/META-INF/org.apache.openejb.server.ServerService/hsql
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-hsql/src/main/resources/META-INF/org.apache.openejb.server.ServerService/hsql?rev=1396602&r1=1396601&r2=1396602&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-hsql/src/main/resources/META-INF/org.apache.openejb.server.ServerService/hsql (original)
+++ openejb/trunk/openejb/server/openejb-hsql/src/main/resources/META-INF/org.apache.openejb.server.ServerService/hsql Wed Oct 10 13:53:32 2012
@@ -1,4 +1,4 @@
server = org.apache.openejb.server.hsql.HsqlService
bind = 127.0.0.1
port = 9001
-disabled = false
+disabled = true