You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/04/13 21:29:30 UTC
[1/8] cxf git commit: Update compiler plugin version
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes c26f841ae -> 46617e66b
Update compiler plugin version
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d74ef5c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d74ef5c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d74ef5c
Branch: refs/heads/3.0.x-fixes
Commit: 7d74ef5cc9ab500d7bb35495af2928ccb5a6e9bb
Parents: 864161a
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 1 16:09:27 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:28:11 2015 -0400
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7d74ef5c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9a41df..5bf1669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -507,7 +507,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
[8/8] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46617e66
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46617e66
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46617e66
Branch: refs/heads/3.0.x-fixes
Commit: 46617e66bf125dc660302350a0d04cbc6e09487c
Parents: b906f99
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Apr 13 15:29:13 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:29:13 2015 -0400
----------------------------------------------------------------------
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/46617e66/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4782f2f..9457d03 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -26,6 +26,7 @@ B 18204e5bb0173ccea83c0afd10e4450f370287a0
B 1824d9cae26c3b141d873d0d01036602ac339c37
B 1a8fd7c02bc6a620e276086b665d430217116767
B 1b3f01b4f640beea1f1247416ad9891e615f816c
+B 1c7a34e313062edff246c2c1943d43b71b0f8aa7
B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0
B 1d9e79ef36bf14e25d7cd2cccb0d804a048aef64
B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
@@ -65,6 +66,7 @@ B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
B 42eba2f948a967d62dc0257a920715ae47ae4310
B 431db5275e3a056d6cedf4608533197580cb6073
B 43aa455461fb8a33b0e5844512b263a262c2420c
+B 43babb8fc1bfd034657eb44fe82fab960034c85d
B 43c65b07658b8041f6689d16a34ff98132b8a424
B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
B 449a10ca63d5b3507861eb4da9f56c215eddccfb
@@ -174,6 +176,7 @@ B a7b79ea692add4f9da0f1232e3bfb338099f4147
B a7c6e78b491c4feb6797a6dddd32a6249189a552
B ab4eaac0be87291b7f053d144dc8fbf9d98634c3
B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6
+B ad700a5f6471f55680821f6d04b182f5d3a6054e
B afeb2ab056a4a4377db11d597c675108eb780d16
B b18a2bad64c343520795175cf377cdf1b981da2a
B b1b3fc2e1b4a0637d85bb67eb0a59abde91b0f9a
@@ -192,6 +195,7 @@ B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
B bea22d764138e365513856c23be760a7719530a0
+B bef3d8408feb07365e17ca6960db7b4b2f1436ec
B bf6bba1082d030298df9b9f1c354da5f92833eae
B bfbc0a25c377e43395fb1f7beee045e4412c4d8d
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
[5/8] cxf git commit: Properties passed into the ExtensionManagerBus
at creation time aren't actually used.
Posted by dk...@apache.org.
Properties passed into the ExtensionManagerBus at creation time aren't actually used.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/99b9510a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99b9510a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99b9510a
Branch: refs/heads/3.0.x-fixes
Commit: 99b9510aac932561873690a16a306490c636def8
Parents: 4cb275f
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 7 15:02:34 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:28:12 2015 -0400
----------------------------------------------------------------------
.../org/apache/cxf/bus/extension/ExtensionManagerBus.java | 7 +++----
.../main/java/org/apache/cxf/resource/PropertiesResolver.java | 3 +++
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/99b9510a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index 909ed8a..fe80e42 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -20,7 +20,6 @@ package org.apache.cxf.bus.extension;
import java.io.InputStream;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -96,7 +95,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
private final ExtensionManagerImpl extensionManager;
- public ExtensionManagerBus(Map<Class<?>, Object> extensions, Map<String, Object> properties,
+ public ExtensionManagerBus(Map<Class<?>, Object> extensions, Map<String, Object> props,
ClassLoader extensionClassLoader) {
if (extensions == null) {
extensions = new ConcurrentHashMap<Class<?>, Object>(16, 0.75f, 4);
@@ -115,8 +114,8 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
feature.setPrettyLogging(FORCE_PRETTY);
features.add(feature);
}
- if (null == properties) {
- properties = new HashMap<String, Object>();
+ if (null != props) {
+ properties.putAll(props);
}
Configurer configurer = (Configurer)extensions.get(Configurer.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/99b9510a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java b/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
index 4809b81..b2d2419 100644
--- a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
@@ -35,6 +35,9 @@ public class PropertiesResolver implements ResourceResolver {
}
public <T> T resolve(String resourceName, Class<T> resourceType) {
+ if (resourceName == null) {
+ return null;
+ }
Object obj = properties.get(resourceName);
if (null != obj) {
return resourceType.cast(properties.get(resourceName));
[3/8] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0ec15341
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0ec15341
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0ec15341
Branch: refs/heads/3.0.x-fixes
Commit: 0ec15341e8dde3ebf8956da8587a95bc0028a564
Parents: 99b9510
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 7 17:09:18 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:28:12 2015 -0400
----------------------------------------------------------------------
.gitmergeinfo | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0ec15341/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 013eb5f..4782f2f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/master
B 004321a2e955665005b9c5bfe304feaf9cb622b0
B 005ee936d42897f7083fd9fe26addec4779d4764
+B 015419bf394e219cbb07ca7706b4bd8e2942e856
B 035154fb466fb9c833804d1bc747804df9e9992b
B 03bd1b4f0beaddf4df112f7c08d5749862805dfa
B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5
@@ -31,6 +32,8 @@ B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
+B 237ace40ea2c204f68848309b9483c322499b524
+B 23849faa6058427381cd3a737d2f37b551db9938
B 2426a0879b06cf6dea32004af16f96f793d568eb
B 24e330c8b6be65c98cd3914f6fe7498e980f4568
B 2616fd04151e5bb7b8a31428f8a9fd0c957dfb48
@@ -46,6 +49,7 @@ B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
B 2fd8103535c1246a3a243e0fd7bcea86947e6b14
B 30853113b4c4d47200bcf5305e5e88735f32cc8f
B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4
+B 3309231e467225b18b24d90d77153a0c572a17e0
B 33c7781f4f847431a7bbdc9335657d3281cd525e
B 3506302369c0a28647056c1da469bd9844e45826
B 350b51632f4c5dbd4891636261909c73136981c6
@@ -54,6 +58,7 @@ B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6
B 384ad75433037358ea1607c4ddcb0cd978fae10c
B 388d6eaf045c0215c7cffc891526a402c70625ec
B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1
+B 3a080015474d27075b0b03aa9ec74ab443504ebd
B 3aec3e286e4732918589c239ea1b8f7e1d3a9836
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
@@ -75,12 +80,14 @@ B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
B 4b44512d8c3fe76620dbac37d220038435c75ba5
B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
B 4d49814ba85310599ee76e41742208383f3f6450
+B 4eec754b1bbd46e0142412cd37dbaf189c47f905
B 4f61ca801deed173c648b2d424ac231663acd704
B 4f70bdf4199a666829cf9c6c62c508d12afbe251
B 4fe7844935f9b4ad797760613d143949f9448905
B 504b427081cfc2213ce0a5c050b16af67ca7ff46
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 55bda33699ea1c2e84a125253edd594cc2a32ea3
+B 5891c0d23b776d41be02e74a3b98a3881970d08f
B 593525139909e081ae809278d301688c0ba03697
B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23
B 5bac26a132e7999bf0bd108d4cffb674873a56ca
@@ -107,6 +114,7 @@ B 702f27bc4a334b2d117262252632bf580f20f711
B 71488c6fa7635c88285214a0479379aafef9ed3c
B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c
B 71ced4709dedf62264a4bb630aaf4780cb94ce48
+B 72ba5f34d674012e2f8ca8ef5add0b022235ee06
B 7456089088a21620ec75dc83fbb4b89ebdfd290e
B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79
@@ -144,6 +152,7 @@ B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
B 970feeed0db20bfe9df5095b6b335146344c222c
B 9896b920035a1d1be1aef28a1d1a5eb876445c82
B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
+B 9ac66adffb73f3474fde064fab1013ecdd24be7c
B 9ae69b3b323f48de033f62be9fc2780f11b0c761
B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2
B 9dd4194ce6af00377b0e1bdc6b15744fe03e29c9
@@ -168,6 +177,7 @@ B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6
B afeb2ab056a4a4377db11d597c675108eb780d16
B b18a2bad64c343520795175cf377cdf1b981da2a
B b1b3fc2e1b4a0637d85bb67eb0a59abde91b0f9a
+B b248d091551456c2fa8cfe0530dfdfc3632fe5e4
B b4536602d376a36bcbd02d21d5ab42f19d4e5b22
B b4872363fda49f205001d4385ecbc35133c2c755
B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
@@ -186,12 +196,16 @@ B bf6bba1082d030298df9b9f1c354da5f92833eae
B bfbc0a25c377e43395fb1f7beee045e4412c4d8d
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
B c1c9562bb13eeacdd9dae5a46c513e9e03625698
+B c4c969042edcbcd439faa0fc95c1f5130cf06c71
B c5609a479c87ea75e016b61daeafe0021f693332
+B c5da4140da8fe63c4a10845b95258bbda9ab2058
B cb19d05174a3bd078b391c4f6c151ee6e34e2956
+B cc9222b453b92f1115d5fc5df2cc11ccb3600940
B cd7095c49ab2be4a5667450bf67e5e4be8ec84c1
B cd809b8526fc5620c481d4ee5a8534ccf6babae4
B d021b9041e00518099947274455b2027326a3c7c
B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
+B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
B d4f9674baa811936429271cbf64c4a558282c764
@@ -207,7 +221,10 @@ B dfecaa60ea6082fda8f2959c083ba2f2f7a03112
B e242307ad8bbe53788f3e03e9e2f0ca977d01340
B e2bc8d8f31f6e3c6c6103dcf22e26726756bb39c
B e441a15af9413bfb24ee1b4ce78e01bf543fc148
+B e4b2e746d6a70d02f64daab7aca79142e62709ca
B e548a02fa04313fd1b6ec5d9ac78c774e8ad935a
+B e5637ffcc3a56923982c4254cffe54cc62130ee9
+B e6fc7e50266d45c8b5afb002abdc44b69585cc69
B e8514ea3f5fdf33b19d9ddc0639cc1aaf57e1f62
B e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64
B ea778c4f38f882dc97d23bd200683fd9d48b4718
@@ -215,6 +232,7 @@ B eacd93f72c78bd28e9a3222ddfd4f0c33af6b8ec
B eba07e615684e475772a7a2d23d7e93a0b099485
B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0
B ecbf4e78586870a507fe4cf91239d51c3f202aad
+B ed18c008f05af7063d5929d072b86048d12dab4c
B eee2a947d867c403c212677cf942b3d07fa06fd7
B effcaf3f6cfb4b3287d683285592f2693af42b29
B f18acbcdfc48aca354610614c0ba3a46dcb8332a
@@ -232,13 +250,16 @@ B fa37d8722d154bbdec9d2acf4da16a04db0a34f1
B fb94440f6f1d5c7c572b6c0163f275c95073b8ee
B fb9d26581c364c62c7343847ebe4136b8c97700f
B fc78cd31869a4e580c4d2a9e7864ae6dae8c311b
+B fcc8bcb38f33febf5c73c5f5f56d877272f27e20
B fd3471e58e63ee672babc015ed0929f6cd6862dd
+B fd5abbd3793e232638e4d0793ebb9765e49c638a
B fe416234bab8af30f1789c3164ac256af86e3b62
B ff742436a3e177dc61106edf08f2509e727362dd
B ffd429be404953874e141c52a9c8ba46812d73ca
M 0d63846798b590255c45463359e2cb1a28e4d3cb
M 10a8386fcef4b7f2220ceceaa6aedca60846f6d1
M 10b043faa0652a6a06f5f020173162edef7fb0ca
+M 12d070f4392316cdfff03eb41abe22531ed64ee9
M 1701e6c8d4e794f25d69781e3f69357723ad7fcf
M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04
M 1946e323a0df6e5f9748af82106cff39d7b5d01f
[6/8] cxf git commit: Allow features that implement CXF's feature
interface
Posted by dk...@apache.org.
Allow features that implement CXF's feature interface
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40c24494
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40c24494
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40c24494
Branch: refs/heads/3.0.x-fixes
Commit: 40c2449428409e01188948206fdf7a1a78ce63a1
Parents: 0ec1534
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Apr 8 09:56:14 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:28:52 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/40c24494/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
index 01cdfb9..bc890fa 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
@@ -51,6 +51,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.feature.Feature;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.EndpointUtils;
@@ -104,7 +105,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider {
@SuppressWarnings("rawtypes") Class serviceClass,
WebServiceFeature ... features) {
for (WebServiceFeature f : features) {
- if (!f.getClass().getName().startsWith("javax.xml.ws")) {
+ if (!f.getClass().getName().startsWith("javax.xml.ws")
+ && !(f instanceof Feature)) {
throw new WebServiceException("Unknown feature error: " + f.getClass().getName());
}
}
[4/8] cxf git commit: Allow Boolean objects as properties for the
instrumentation manager properties
Posted by dk...@apache.org.
Allow Boolean objects as properties for the instrumentation manager properties
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4cb275f0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4cb275f0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4cb275f0
Branch: refs/heads/3.0.x-fixes
Commit: 4cb275f046426282e2c1ef2a19775fc9aaec5ad8
Parents: 7d74ef5
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 7 15:02:01 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:28:12 2015 -0400
----------------------------------------------------------------------
.../apache/cxf/management/jmx/InstrumentationManagerImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4cb275f0/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
index 42d7d15..1777a01 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
@@ -409,8 +409,11 @@ public class InstrumentationManagerImpl extends JMXConnectorPolicyType
}
private static boolean getBusProperty(Bus b, String key, boolean dflt) {
- String v = (String)b.getProperty(key);
- return v != null ? Boolean.valueOf(v) : dflt;
+ Object v = b.getProperty(key);
+ if (v instanceof Boolean) {
+ return (Boolean)v;
+ }
+ return v != null ? Boolean.valueOf(v.toString()) : dflt;
}
}
[7/8] cxf git commit: [CXF-6315] When chosing the alternative for the
response,
use the longest one that matched so any optionals that were asserted on the
incoming message will apply to the outgoing message as well.
Posted by dk...@apache.org.
[CXF-6315] When chosing the alternative for the response, use the longest one that matched so any optionals that were asserted on the incoming message will apply to the outgoing message as well.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b906f99c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b906f99c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b906f99c
Branch: refs/heads/3.0.x-fixes
Commit: b906f99c54d58756f31f1a58663e139331c0dbbb
Parents: 40c2449
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Apr 13 15:08:13 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:29:13 2015 -0400
----------------------------------------------------------------------
.../selector/MinimalAlternativeSelector.java | 21 ++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b906f99c/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/MinimalAlternativeSelector.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/MinimalAlternativeSelector.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/MinimalAlternativeSelector.java
index 2926859..06cab19 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/MinimalAlternativeSelector.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/selector/MinimalAlternativeSelector.java
@@ -33,7 +33,7 @@ import org.apache.neethi.Policy;
*
*/
public class MinimalAlternativeSelector extends BaseAlternativeSelector {
-
+
public Collection<Assertion> selectAlternative(
Policy policy, PolicyEngine engine,
Assertor assertor,
@@ -46,9 +46,22 @@ public class MinimalAlternativeSelector extends BaseAlternativeSelector {
List<Assertion> alternative = alternatives.next();
if (engine.supportsAlternative(alternative, assertor, msg)
- && isCompatibleWithRequest(alternative, request)
- && (null == choice || alternative.size() < choice.size())) {
- choice = alternative;
+ && isCompatibleWithRequest(alternative, request)) {
+
+ if (null == choice) {
+ choice = alternative;
+ } else if (request != null) {
+ //we have a request policy, we likely want the one longest alternative that
+ //matches as any of "optional" incoming policies so that asssertions that were
+ //asserted on the incoming will also be assertable on the outgoing.
+ //Example: ws:addressing policy asserted on incoming should also be
+ // used to add headers for the response
+ if (alternative.size() > choice.size()) {
+ choice = alternative;
+ }
+ } else if (alternative.size() < choice.size()) {
+ choice = alternative;
+ }
}
}
if (choice == null) {
[2/8] cxf git commit: Don't need to grab the workqueue manager if
we're not setting anything in there.
Posted by dk...@apache.org.
Don't need to grab the workqueue manager if we're not setting anything in there.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/864161a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/864161a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/864161a1
Branch: refs/heads/3.0.x-fixes
Commit: 864161a16c634a22fbec77dfe9d68b47fcf2535f
Parents: c26f841
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 23 11:05:31 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Apr 13 15:28:11 2015 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/864161a1/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
index 42ae100..ed4d284 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
@@ -92,9 +92,9 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
public void initComplete() {
- WorkQueueManager manager = bus.getExtension(WorkQueueManager.class);
ManagedWorkQueueList wqList = bus.getExtension(ManagedWorkQueueList.class);
if (wqList != null) {
+ WorkQueueManager manager = bus.getExtension(WorkQueueManager.class);
wqList.addAllToWorkQueueManager(manager);
}
registerBusAsService();