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 2017/06/07 17:54:07 UTC
[1/9] cxf git commit: Improve RMTXStore by using a real derby
DataSource
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 355ad864f -> d70f76bea
Improve RMTXStore by using a real derby DataSource
# Conflicts:
# rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f83208e9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f83208e9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f83208e9
Branch: refs/heads/3.1.x-fixes
Commit: f83208e9424e48e29c61141ee9e9290e15498e44
Parents: 355ad86
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu May 25 22:13:56 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:36:07 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 +
rt/ws/rm/pom.xml | 5 ++
.../jdbc/RMTxStoreConfigurationTest.java | 49 +-------------------
.../ws/rm/persistence/jdbc/txstore-ds-bean.xml | 7 ++-
.../ws/rm/persistence/jdbc/txstore-ds-bean2.xml | 5 +-
5 files changed, 17 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f83208e9/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4b6fccd..fdc3d89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ velocity.log
bin/
*~
node_modules/
+derby.log
http://git-wip-us.apache.org/repos/asf/cxf/blob/f83208e9/rt/ws/rm/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index d4a4ee3..851419b 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -131,6 +131,11 @@
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f83208e9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 5d85c4b..967b00d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -19,12 +19,7 @@
package org.apache.cxf.ws.rm.persistence.jdbc;
-import java.io.PrintWriter;
-import java.sql.Connection;
import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import javax.sql.DataSource;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -89,8 +84,7 @@ public class RMTxStoreConfigurationTest extends Assert {
RMTxStore store = (RMTxStore)manager.getStore();
assertNotNull(store.getDataSource());
-
- assertNull(store.getConnection());
+ assertNotNull(store.getConnection());
}
@Test
@@ -102,45 +96,6 @@ public class RMTxStoreConfigurationTest extends Assert {
RMTxStore store = (RMTxStore)manager.getStore();
assertNotNull(store.getDataSource());
-
- assertNull(store.getConnection());
- }
-
- static class TestDataSource implements DataSource {
- public PrintWriter getLogWriter() throws SQLException {
- return null;
- }
-
- public void setLogWriter(PrintWriter out) throws SQLException {
- }
-
- public void setLoginTimeout(int seconds) throws SQLException {
- }
-
- public int getLoginTimeout() throws SQLException {
- return 0;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null;
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false;
- }
-
- public Connection getConnection() throws SQLException {
- // avoid creating a connection and tables at RMTxStore.init()
- throw new SQLException("test");
- }
-
- public Connection getConnection(String username, String password) throws SQLException {
- // avoid creating a connection and tables at RMTxStore.init()
- throw new SQLException("test");
- }
-
- public Logger getParentLogger() {
- return null;
- }
+ assertNotNull(store.getConnection());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f83208e9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
index 2793d38..409ff9a 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean.xml
@@ -24,8 +24,11 @@
<ref bean="testStore"/>
</wsrm-mgr:store>
</wsrm-mgr:rmManager>
- <bean id="testStore" class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore">
+ <bean id="testStore" class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore" init-method="init" destroy-method="destroy">
<property name="dataSource" ref="testStoreDS"/>
</bean>
- <bean id="testStoreDS" class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStoreConfigurationTest$TestDataSource"/>
+ <bean id="testStoreDS" class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <property name="databaseName" value="target/wsrmdb1"/>
+ <property name="createDatabase" value="create"/>
+ </bean>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f83208e9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean2.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean2.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean2.xml
index 65b05f5..041d005 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean2.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-ds-bean2.xml
@@ -25,5 +25,8 @@
</wsrm-mgr:store>
</wsrm-mgr:rmManager>
<wsrm-mgr:jdbcStore id="testStore" dataSource="testStoreDS"/>
- <bean id="testStoreDS" class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStoreConfigurationTest$TestDataSource"/>
+ <bean id="testStoreDS" class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <property name="databaseName" value="target/wsrmdb2"/>
+ <property name="createDatabase" value="create"/>
+ </bean>
</beans>
[7/9] cxf git commit: [CXF-7394] For CloseSequence messages that fail,
log a single line warning with the rest of the stack trace at FINER
Posted by dk...@apache.org.
[CXF-7394] For CloseSequence messages that fail, log a single line warning with the rest of the stack trace at FINER
# Conflicts:
# rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
# rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/66cc4bec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/66cc4bec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/66cc4bec
Branch: refs/heads/3.1.x-fixes
Commit: 66cc4bec2ee6919be056054ab4803fc0f9c42a9c
Parents: 6735dd0
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 7 11:20:38 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:44:25 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/cxf/ws/rm/Proxy.java | 58 +++++++++++++++-----
.../java/org/apache/cxf/ws/rm/ProxyTest.java | 8 ++-
.../systest/ws/rm/WSRM12ServerCycleTest.java | 5 +-
3 files changed, 52 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/66cc4bec/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
index eb8d55b..117561c 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.rm;
+import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -35,6 +36,8 @@ import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.endpoint.ConduitSelector;
import org.apache.cxf.endpoint.DeferredConduitSelector;
import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.logging.FaultListener;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -235,13 +238,28 @@ public class Proxy {
Collections.singletonMap(SourceSequence.class.getName(),
(Object)s));
- if (constants instanceof RM11Constants) {
- CloseSequenceType csr = new CloseSequenceType();
- csr.setIdentifier(s.getIdentifier());
- csr.setLastMsgNumber(s.getCurrentMessageNr());
- invoke(oi, protocol, new Object[] {csr}, context);
- } else {
- invoke(oi, protocol, new Object[] {}, context);
+ context.put(FaultListener.class.getName(), new FaultListener() {
+ public boolean faultOccurred(Exception exception, String description, Message message) {
+ if (exception.getCause() instanceof IOException) {
+ //for close messages, the server may be gone and nothing we can do so don't pollute the logs
+ LOG.log(Level.WARNING, "Could not send CloseSequence message: "
+ + exception.getCause().getMessage());
+ return false;
+ }
+ return true;
+ }
+ });
+ try {
+ if (constants instanceof RM11Constants) {
+ CloseSequenceType csr = new CloseSequenceType();
+ csr.setIdentifier(s.getIdentifier());
+ csr.setLastMsgNumber(s.getCurrentMessageNr());
+ invoke(oi, protocol, new Object[] {csr}, context, Level.FINER);
+ } else {
+ invoke(oi, protocol, new Object[] {}, context, Level.FINER);
+ }
+ } catch (Fault f) {
+ throw new RMException(f);
}
}
@@ -282,10 +300,17 @@ public class Proxy {
offeredIdentifier = offer.getIdentifier();
}
}
-
- Object invoke(OperationInfo oi, ProtocolVariation protocol,
- Object[] params, Map<String, Object> context, Exchange exchange) throws RMException {
-
+
+ Object invoke(OperationInfo oi, ProtocolVariation protocol,
+ Object[] params, Map<String, Object> context,
+ Exchange exchange) throws RMException {
+ return invoke(oi, protocol, params, context, exchange, Level.SEVERE);
+ }
+ Object invoke(OperationInfo oi, ProtocolVariation protocol,
+ Object[] params, Map<String, Object> context,
+ Exchange exchange,
+ Level exceptionLevel) throws RMException {
+
if (LOG.isLoggable(Level.INFO)) {
LOG.log(Level.INFO, "Sending out-of-band RM protocol message {0}.",
oi == null ? null : oi.getName());
@@ -325,7 +350,7 @@ public class Proxy {
org.apache.cxf.common.i18n.Message msg =
new org.apache.cxf.common.i18n.Message("SEND_PROTOCOL_MSG_FAILED_EXC", LOG,
oi == null ? null : oi.getName());
- LOG.log(Level.SEVERE, msg.toString(), ex);
+ LOG.log(exceptionLevel, msg.toString(), ex);
throw new RMException(msg, ex);
}
return null;
@@ -333,9 +358,14 @@ public class Proxy {
Object invoke(OperationInfo oi, ProtocolVariation protocol, Object[] params, Map<String, Object> context)
throws RMException {
- return invoke(oi, protocol, params, context, new ExchangeImpl());
+ return invoke(oi, protocol, params, context, Level.SEVERE);
+ }
+
+ Object invoke(OperationInfo oi, ProtocolVariation protocol, Object[] params,
+ Map<String, Object> context, Level level)
+ throws RMException {
+ return invoke(oi, protocol, params, context, new ExchangeImpl(), level);
}
-
Object invoke(OperationInfo oi, ProtocolVariation protocol, Object[] params) throws RMException {
return invoke(oi, protocol, params, null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/66cc4bec/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index c310d9c..74fd6e2 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.rm;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Level;
import javax.xml.datatype.Duration;
@@ -144,8 +145,9 @@ public class ProxyTest extends Assert {
@Test
public void testLastMessage() throws NoSuchMethodException, RMException {
- Method m = Proxy.class.getDeclaredMethod("invoke",
- new Class[] {OperationInfo.class, ProtocolVariation.class, Object[].class, Map.class});
+ Method m = Proxy.class.getDeclaredMethod("invoke",
+ new Class[] {OperationInfo.class, ProtocolVariation.class, Object[].class,
+ Map.class, Level.class});
Proxy proxy = EasyMock.createMockBuilder(Proxy.class)
.addMockedMethod(m).createMock(control);
proxy.setReliableEndpoint(rme);
@@ -399,6 +401,6 @@ public class ProxyTest extends Assert {
throws RMException {
EasyMock.expect(proxy.invoke(EasyMock.same(oi), EasyMock.isA(ProtocolVariation.class),
EasyMock.isA(Object[].class),
- EasyMock.isA(Map.class))).andReturn(expectedReturn).anyTimes();
+ EasyMock.isA(Map.class), EasyMock.same(Level.FINER))).andReturn(expectedReturn).anyTimes();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/66cc4bec/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
index 64e0b64..8a4a5d8 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
@@ -35,6 +35,7 @@ import org.apache.cxf.greeter_control.GreeterService;
import org.apache.cxf.systest.ws.util.ConnectionHelper;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.rm.RM11Constants;
import org.apache.cxf.ws.rm.RMManager;
import org.apache.cxf.ws.rm.feature.RMFeature;
import org.apache.cxf.ws.rm.manager.AcksPolicyType;
@@ -128,7 +129,7 @@ public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase {
RMFeature feature = new RMFeature();
feature.setRMAssertion(rmAssertion);
feature.setDestinationPolicy(destinationPolicy);
- //feature.setRMNamespace(RM11Constants.NAMESPACE_URI);
+ feature.setRMNamespace(RM11Constants.NAMESPACE_URI);
return feature;
}
@@ -165,7 +166,7 @@ public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase {
control.stopGreeter(CFG);
- control.startGreeter(CFG);
+ //control.startGreeter(CFG);
// this will cause an exception as the sequence is no longer valid
//greeter.greetMe("four");
[3/9] cxf git commit: Update maven-dependency-plugin
Posted by dk...@apache.org.
Update maven-dependency-plugin
# Conflicts:
# rt/rs/client/pom.xml
# rt/rs/extensions/search/pom.xml
# rt/rs/security/oauth-parent/oauth2/pom.xml
# rt/rs/security/sso/oidc/pom.xml
# rt/transports/jms/pom.xml
# systests/cdi/cdi-owb/pom.xml
# systests/jaxrs/pom.xml
# systests/jaxws/pom.xml
# systests/rs-security/pom.xml
# systests/tracing/pom.xml
# systests/transport-jms/pom.xml
# systests/uncategorized/pom.xml
# systests/ws-specs/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a8a85703
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8a85703
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8a85703
Branch: refs/heads/3.1.x-fixes
Commit: a8a85703fb2b4241b505b6d811e1fe9607b0bdb3
Parents: f89f2d7
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Fri May 26 10:18:49 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:40:51 2017 -0400
----------------------------------------------------------------------
distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 1 -
pom.xml | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a8a85703/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 598a730..f00c585 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -127,7 +127,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<id>copy-dependencies</id>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a8a85703/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bd33110..dd9471b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -541,7 +541,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[2/9] cxf git commit: Also use derby for driver tests
Posted by dk...@apache.org.
Also use derby for driver tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f89f2d7e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f89f2d7e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f89f2d7e
Branch: refs/heads/3.1.x-fixes
Commit: f89f2d7ee64188bbde9a7c019b2831922fa66540
Parents: f83208e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu May 25 22:39:41 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:36:10 2017 -0400
----------------------------------------------------------------------
rt/ws/rm/pom.xml | 5 +++++
.../java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java | 4 ++++
.../ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java | 7 ++++---
.../org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml | 4 +++-
.../cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml | 4 ++--
.../cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml | 5 ++++-
6 files changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f89f2d7e/rt/ws/rm/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml
index 851419b..cc44ec3 100644
--- a/rt/ws/rm/pom.xml
+++ b/rt/ws/rm/pom.xml
@@ -132,6 +132,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f89f2d7e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index e3cfa0b..c101112 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -834,6 +834,10 @@ public class RMTxStore implements RMStore {
protected void createTables() throws SQLException {
Connection con = verifyConnection();
+ if (con == null) {
+ LOG.warning("Skip creating tables as we have no connection.");
+ return;
+ }
Statement stmt = null;
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/f89f2d7e/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
index 967b00d..6fa941d 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreConfigurationTest.java
@@ -41,11 +41,11 @@ public class RMTxStoreConfigurationTest extends Assert {
assertNotNull(manager);
RMTxStore store = (RMTxStore)manager.getStore();
assertNotNull(store);
- assertNull("Connection should be null", store.getConnection());
- assertEquals("org.apache.derby.jdbc.NoDriver", store.getDriverClassName());
+ assertNotNull("Connection should be null", store.getConnection());
+ assertEquals("org.apache.derby.jdbc.EmbeddedDriver", store.getDriverClassName());
assertEquals("scott", store.getUserName());
assertEquals("tiger", store.getPassword());
- assertEquals("jdbc:derby://localhost:1527/rmdb;create=true", store.getUrl());
+ assertEquals("jdbc:derby:target/wsrmdb3;create=true", store.getUrl());
assertNull("schema should be unset", store.getSchemaName());
}
@@ -64,6 +64,7 @@ public class RMTxStoreConfigurationTest extends Assert {
@Test
public void testSetCustomTableExistsState2() {
+ RMTxStore.deleteDatabaseFiles("target/wsrmdb5", true);
SpringBusFactory factory = new SpringBusFactory();
Bus bus = factory.createBus("org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml");
RMManager manager = bus.getExtension(RMManager.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/f89f2d7e/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml
index 5e2fe1b..149bdb9 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-bean.xml
@@ -24,5 +24,7 @@
<ref bean="testStore"/>
</wsrm-mgr:store>
</wsrm-mgr:rmManager>
- <wsrm-mgr:jdbcStore id="testStore" userName="scott" password="tiger" url="jdbc:derby://localhost:1527/rmdb;create=true" driverClassName="org.apache.derby.jdbc.NoDriver"/>
+ <wsrm-mgr:jdbcStore id="testStore" userName="scott" password="tiger"
+ url="jdbc:derby:target/wsrmdb3;create=true"
+ driverClassName="org.apache.derby.jdbc.EmbeddedDriver"/>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f89f2d7e/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml
index 59e4bd5..d4596a6 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean.xml
@@ -27,8 +27,8 @@
<bean id="testStore" class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore">
<property name="userName" value="scott"/>
<property name="password" value="abc123"/>
- <property name="driverClassName" value="org.apache.derby.jdbc.NoDriver"/>
- <property name="url" value="jdbc:custom://localhost:1527/rmdb;create=true"/>
+ <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="url" value="jdbc:derby:target/wsrmdb4;create=true"/>
<property name="tableExistsState" value="I6000"/>
</bean>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f89f2d7e/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml
index 2e3b200..ddd8165 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/txstore-custom-error-bean2.xml
@@ -24,5 +24,8 @@
<ref bean="testStore"/>
</wsrm-mgr:store>
</wsrm-mgr:rmManager>
- <wsrm-mgr:jdbcStore id="testStore" userName="scott" password="abc123" driverClassName="org.apache.derby.jdbc.NoDriver" url="jdbc:custom://localhost:1527/rmdb;create=true" tableExistsState="I6000"/>
+ <wsrm-mgr:jdbcStore id="testStore" userName="scott" password="abc123"
+ driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:target/wsrmdb5;create=true"
+ tableExistsState="I6000"/>
</beans>
[8/9] 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/82f5ca8e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82f5ca8e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82f5ca8e
Branch: refs/heads/3.1.x-fixes
Commit: 82f5ca8e33d9c8c53637d7b45864c9b1ff95ac1f
Parents: 66cc4be
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 7 12:44:25 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:44:25 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/82f5ca8e/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 88433c0..b6592e6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -61,6 +61,7 @@ B 20b73a780e54f3815ab6b8c5f41d052f75745ee1
B 2103bc5951b0905b134a7bafddd6cc07822132ff
B 219628c58badaf308817a410d61ec704b2246899
B 22755d26ec2f6255004f57deec711ee68ce11d6c
+B 234331c85ce6753a6d77d324e572169218eb75a0
B 248c8f0458ce938a65c35006d484c6a4610cde1b
B 269e96752b11aeb3e911da76bd3074d768860968
B 26f43025348e101e981e3f64ecc3ddf483ad7fb3
@@ -77,6 +78,7 @@ B 333632ee013b26b6ed15d05818971d83927bd43d
B 337742ff1215b34643c8c35d8a1a9c4d5238d743
B 343d06d94838cd26f682f7afbcea0e422aa1597d
B 3450d3854e97dbd67eeaa862d09d39cce9846de9
+B 35ab874f8a1b2ad4fe045e48465c9bdeb46f685f
B 38919f57bfb2b880691950fc5f992b5649ea579e
B 39851b83af116611ce0efe70c4b9a32ee8491523
B 39a5690d7d50d8481739c290f49128be4d55f8ad
@@ -84,8 +86,11 @@ B 3a46e586b405c79a98e37d33a30b2fa22905f853
B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
B 3be1cef6d16eeee405b7e046c822c27dc7223f24
B 3bebf6b49283d9a9c36365c030533a3508f836c7
+B 3c1e2e7245aa89b9ac097e210ff70cdfa6c301a4
B 3ce7f00461d9c868301003b5c16138c491a9ac0b
+B 3e50ff46becd978ab228b8d8a0ebff5e51b2274f
B 3f259221fa1dd9227397400ed9653374cb4fdc39
+B 3fa435a2908d95b656933d0d34f9ccf8c0153ffe
B 3fbedf1397714824b9700cd4d49569087936fe1a
B 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec
B 3fe8e92229ba50dbc6758e6420b44ac16751281e
@@ -143,11 +148,13 @@ B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
B 59b972618b40c5dbaca2772673ded17c5273e7d2
B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1
B 5b4275ce202777828633dbb65133d3fe44f1d404
+B 5ce0b6eb1488d8ac575ee055d5f8cf83863546bf
B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2
B 5ea90a91d9148aa59aeb9b7e6611b58fb8da1fe4
B 604167d9f0cfc67e01219a19a95353176ce38f79
B 61a361610d57aaf18f2c574916621ac09af45151
+B 61eadf5265cbcf47c8b2d5a6d6235eb2f621b456
B 62060f8bc1f4d85b77ff136cb0576049312b8541
B 629af817f4762a12623e76fb7f7baefe98482719
B 62fd990682c0c6ff915356fb9b5f0a32efc20424
@@ -192,6 +199,7 @@ B 7d344ae7ed882a4347d0f8775744646e0013aca5
B 7dbce543a96c6ec1c6f02ab0530146c3507fa205
B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb
B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf
+B 7f07dac41850cd4e858892d655babe343232cd32
B 7f4a24d037c06f76770e969ad7e2a47f4687a33a
B 7fab6245608119634271e580166120b9c55dce48
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
@@ -252,6 +260,7 @@ B abfd5936fee6562b1b5c49d7522f0975390bcfed
B adcfa17d94da4b27deb8ba952d0bd4dcfcf6972b
B ae83629e6291538e72d300fb35d7f6df7cf064a1
B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7
+B aeeb4df2e5c4133164014e15ebf221a2dcd02eec
B aeecef53263cd1d595d991654f0a783a10adfdcb
B afdf9361f1c3ce49c8440a5f2615bde2bb42c684
B b2c10cc6c18a6e6589d258436303c46b3f682f7e
@@ -284,6 +293,7 @@ B c1ba5d90e34993d737f0944dbb69ccda7c4bcfd1
B c1e2c973fc42ba7027fdd0ff1964bcbf8e61dbd6
B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d
B c2517eb552704a406cfbc45eba4822a84e5ca7da
+B c282dcee8373b9564c747fc8fac4e4e9a3b3afc6
B c2ccecb23ba23497c95be89f9b37f38c69faba7a
B c2daeb5b45b758e9f54ce73dc4567a69c47d9170
B c3a1392d1656c41a9bbdb24698eb27fbc757628b
@@ -336,6 +346,7 @@ B e1c60863ac10b56d423613c7d3d2f45c7ce18e14
B e1d950605941ef77bd4a3e9e4ad47eb63ac8f221
B e262bd20dbc8e8567ffe0c8ed3d394191696e981
B e2efd0386e210d162c7646f4a4f2aa15e9752924
+B e3b77cc7100f304dcf8d5e29bce78c800c4d4cd1
B e3eed6e693d17f52089a903cf9e293bc6ccdc73d
B e5b9f0e1695e73c33a40248d45fa4eba034d39b3
B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
@@ -348,6 +359,7 @@ B e7e75c58c283d0178c6929cf298a68f41f6a8459
B e824784db1bda81c68aaa407f471588acea38865
B e856de5370025ec6f897ef214e7f898fd8cb6756
B e90f3dd6422fa059ebea4c92763c73c8685e185e
+B e91272173b054ae8e5f1535b40765d6bbb545601
B e9b997e808857cda15f428aed8a78ea8d1856db7
B e9e1fbe33658421590ec149b0f82c12d2fed2c53
B ea458d27bdbd30b0b3ef785d18e45ddf2a75b74a
@@ -358,6 +370,7 @@ B ebd1c24df1b405bf0478f191ba055d96e8ccea41
B ec293bde4f937ba6b28907b228649e61d612a528
B ec3103f88b20fc05e92994b6a06b65b4a91dd75a
B ec95dfbaf9fae88d21c98305d6415c65c00fd2fa
+B ecb3ccd32cfa82d1175e2e15642e22e8172ec25a
B ecb6eba580c81d35991df66681db8dff99b1b087
B ed512e646cfac342bdc2b6df117e9a81eacf4061
B ee6ceea0d493b1b2dc6d83ca6923c3baed81885e
@@ -422,6 +435,7 @@ M 16163d8044be801683d1fb2d2d44507f43be2d6a
M 1622823593e1a9a836e0e354ad37ea1cc56c3fb8
M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
M 17b0b5f444e5eea9b1c553ba512dbde99ef2c92a
+M 18418ec3429869323bbfc839dc3fd99ec620725b
M 19121e3da243bb1516d605fd1498087efedd387c
M 19a4d72a32f1e18bec621af403ecdf21d97453af
M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
@@ -435,6 +449,7 @@ M 21031e3ab2ae227540e2a078d0336d894361acba
M 2519863ca4d11ca1b6f3ac74361f3eaba3918690
M 2538ae42fb0c774023deed5264291b2fe6658cb8
M 26edcd457ea507075a4c82e2787f11f11a432876
+M 26feb75455abbf3ef999804395d4c5d5348042a2
M 2735d624afed00841621ce4fe0e9c864d76f5bcc
M 29af9d48cee34521fcc9bc27a79d15f5781916a9
M 2a76fe1ef1989fbfaf86d70984f049259715d3c4
@@ -474,6 +489,7 @@ M 4a418df6e3bb784b9e27150d2019bbbc63ea3cfd
M 4a7ee47a9b57ec3c97dc40217229a80478f931f2
M 4aaa6cc53f694e61eede9c3ef90484fe8f4f3770
M 4b0868a8ee6f53d8543860a458821c35ec2a79a2
+M 4b23cab79851b073d9902e504081c13db31145cb
M 4d493d461f70864aa1b5cab7bcbfbc31a31cdc01
M 4e5119b3d1d807fb6885ec67ce28180beb55c360
M 4f4ce80ba2de80219e13943cbd6edbf411117234
@@ -500,6 +516,7 @@ M 6613e46662317ea151f72e26e5deb4f50148a148
M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
+M 70a6f989e7062121a73ccdbc686dea4025d41f55
M 7228709bff3fe66626830b0018547d001588da00
M 726c0aa641e408a18fa5f4ff82df682d489874f4
M 7304dfbd8f3044d8d46981abf2058c6cb732d219
@@ -531,6 +548,7 @@ M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
M 8b78d8c82accc1f0beca55eef8d5bce87c7af792
M 8c6401b76ca76010e7e169656fd2f5fae6f3245a
M 8dadf3defb43d13169943b191204be93da63c88b
+M 8dbc8cbfa532706ec138c3580543d38ee5c34daf
M 8e131133c8566a124605cb06e0b6db98fddb5972
M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
M 8f8e587cde7ec97410da6b0586810ccf8f0f3233
@@ -540,6 +558,7 @@ M 8fc9d782901adddf874fe7c2f9500836a0585707
M 910f37767518832cce843c2a093ee833b7c48916
M 91bb2a18f4653f997e455c5089e7a009310591c6
M 939a75d9d3dbfbe37ead5ca41e5e53727dc40b40
+M 93b07cfd3c39f6eb62ec1f428174811a87307ba2
M 94060fc026b3b7214337c9fcfce71c06f0fb4444
M 955fd4b7fee79642934a828b7758ce14f783364a
M 97b20f61bbf7054076c8cdf609beb8a7047105b8
@@ -564,6 +583,7 @@ M a644c5d06c0bae321e2c669efa0cecf3abdd944d
M a71508214a7682c6a569075b1395f387c31be63b
M a719adccae8500f2d7e7140a9f4cd26e20775818
M a7d5d525c05cf10a6ae12c25645c248d92dfac1c
+M a876d164c96acc9d08855e9fc6c5fd4ed281845f
M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a
M a93f0d9ad891865cc635a961cb890c2031177e5b
M a9fe8470ce9522f08c298e58f76636c48d57b7a4
@@ -575,6 +595,7 @@ M ae3ae2a25109375cc82114d15078f04e8c5353c5
M b0a79aa7b48da6acdc6da1169abd690ecf914ca8
M b12d8a04f280d39e62a18fa4a8f7946c27f06d75
M b1c6125f50b294b0e2ebc927671e2ff53b5001bf
+M b1dae426bbc0209f762a2714e809b50e2d043cf2
M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
M b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6
M b30d620d90593f52b79ae578373597defc89e80d
@@ -585,6 +606,7 @@ M b4b2da7507aa2d6461156089bd826c00f0bc5360
M b624c034c5682b54b9faf3d3e90eb0c23cde1a5b
M b77e43f19d631d94032740eff6e58f49e0532d29
M ba0573f202208b5e3feb881173d3df0dfc2a02ba
+M bba922fb4dca56ea4f9ba641d9456e43dbfeca47
M be2bf8d644887fc1853210b9b82db897c4d73dd0
M be99c53015cb37a692d2e4dbe3682c7407f29b99
M c01c68ddda10ec6db492b86d818498bec0bf4228
@@ -619,6 +641,7 @@ M dd421381bcf61ead2a66311f1caf9ebdfcbf06c4
M ded06c40ba057981e003903faa93beb94cbe11fa
M df3854cefae5d2da71f8d222a86218e81df7bd05
M e00b84269aa8112bf4073b69b58f933fda3ab497
+M e0ace3dc71a45a9bee6223e550f2ad869581c12d
M e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53
M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
M e578ea946aa13177adef98727e3e4606652ffc76
[6/9] cxf git commit: [CXF-7395] Allow parameters on the generic WS-A
names
Posted by dk...@apache.org.
[CXF-7395] Allow parameters on the generic WS-A names
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6735dd06
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6735dd06
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6735dd06
Branch: refs/heads/3.1.x-fixes
Commit: 6735dd0635ea56eae6b4c14d41088a7ea63957c7
Parents: 059cb2b
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 7 11:26:02 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:43:55 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/ws/addressing/ContextUtils.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6735dd06/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
index 8c171b7..280c297 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
@@ -35,6 +35,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.common.jaxb.JAXBContextCache;
import org.apache.cxf.common.jaxb.JAXBContextCache.CachedContextAndSchemas;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -283,6 +284,13 @@ public final class ContextUtils {
relatesTo.setValue(uri);
return relatesTo;
}
+
+ private static boolean startsWith(String value, String ref) {
+ if (StringUtils.isEmpty(value)) {
+ return false;
+ }
+ return value.startsWith(ref);
+ }
/**
* Helper method to determine if an EPR address is generic (either null,
@@ -294,8 +302,8 @@ public final class ContextUtils {
public static boolean isGenericAddress(EndpointReferenceType ref) {
return ref == null
|| ref.getAddress() == null
- || Names.WSA_ANONYMOUS_ADDRESS.equals(ref.getAddress().getValue())
- || Names.WSA_NONE_ADDRESS.equals(ref.getAddress().getValue());
+ || startsWith(ref.getAddress().getValue(), Names.WSA_ANONYMOUS_ADDRESS)
+ || startsWith(ref.getAddress().getValue(), Names.WSA_NONE_ADDRESS);
}
/**
@@ -308,7 +316,7 @@ public final class ContextUtils {
public static boolean isAnonymousAddress(EndpointReferenceType ref) {
return ref == null
|| ref.getAddress() == null
- || Names.WSA_ANONYMOUS_ADDRESS.equals(ref.getAddress().getValue());
+ || startsWith(ref.getAddress().getValue(), Names.WSA_ANONYMOUS_ADDRESS);
}
/**
[5/9] cxf git commit: [CXF-7392] Start working on some RM fixes
Update RM to make sure addressing namespace matches configured ns Update RM
to allow enabling client via Feature
Posted by dk...@apache.org.
[CXF-7392] Start working on some RM fixes
Update RM to make sure addressing namespace matches configured ns
Update RM to allow enabling client via Feature
# Conflicts:
# core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
# rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
# rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
# rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
# rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
# systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/059cb2b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/059cb2b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/059cb2b9
Branch: refs/heads/3.1.x-fixes
Commit: 059cb2b9f668768fad70d408932b523572f42054
Parents: 82ac940
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 6 21:25:59 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:43:42 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/ws/addressing/MAPAggregator.java | 3 +-
.../impl/AddressingFeatureApplier.java | 2 +-
.../ws/addressing/impl/MAPAggregatorImpl.java | 4 +
.../AddressingPolicyInterceptorProvider.java | 24 +--
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 20 ++-
.../ws/addressing/impl/MAPAggregatorTest.java | 28 +--
.../main/java/org/apache/cxf/ws/rm/Proxy.java | 7 +
.../cxf/ws/rm/RMCaptureOutInterceptor.java | 4 +-
.../org/apache/cxf/ws/rm/RMOutInterceptor.java | 4 +-
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 3 +-
.../java/org/apache/cxf/ws/rm/ProxyTest.java | 9 +
.../org/apache/cxf/ws/rm/RMManagerTest.java | 9 +-
.../clustering/FailoverAddressOverrideTest.java | 2 +-
.../cxf/systest/clustering/FailoverTest.java | 2 +-
.../apache/cxf/systest/ws/rm/ControlImpl.java | 9 +-
.../systest/ws/rm/WSRM12ServerCycleTest.java | 180 +++++++++++++++++++
.../ws/policy/NestedAddressingPolicyTest.java | 2 +-
17 files changed, 270 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java b/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
index 7687785..c2c844c 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
@@ -36,7 +36,8 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
public static final String DECOUPLED_DESTINATION = MAPAggregator.class.getName()
+ ".decoupledDestination";
public static final String ACTION_VERIFIED = MAPAggregator.class.getName() + ".actionVerified";
-
+ public static final String ADDRESSING_NAMESPACE = MAPAggregator.class.getName() + ".addressingNamespace";
+
public interface MAPAggregatorLoader {
MAPAggregator createImplementation(MAPAggregator mag);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
index 889e7b9..7c6af47 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/AddressingFeatureApplier.java
@@ -33,7 +33,7 @@ import org.apache.cxf.ws.addressing.soap.MAPCodec;
public class AddressingFeatureApplier implements WSAddressingFeature.WSAddressingFeatureApplier {
public void initializeProvider(WSAddressingFeature feature, InterceptorProvider provider, Bus bus) {
- MAPCodec mapCodec = new MAPCodec();
+ MAPCodec mapCodec = MAPCodec.getInstance(bus);
MAPAggregatorImpl mapAggregator = new MAPAggregatorImpl();
mapAggregator.setAllowDuplicates(feature.isAllowDuplicates());
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index 7e166b2..e234cfd 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -1076,6 +1076,10 @@ public class MAPAggregatorImpl extends MAPAggregator {
private void setupNamespace(AddressingProperties maps, Message message) {
AssertionInfoMap aim = message.get(AssertionInfoMap.class);
if (null == aim) {
+ String ns = (String)message.getContextualProperty(MAPAggregator.ADDRESSING_NAMESPACE);
+ if (ns != null) {
+ maps.exposeAs(ns);
+ }
return;
}
Collection<AssertionInfo> aic = aim.getAssertionInfo(MetadataConstants.USING_ADDRESSING_2004_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
index 4ee68a2..4d7d307 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingPolicyInterceptorProvider.java
@@ -24,6 +24,7 @@ import java.util.Collection;
import javax.xml.namespace.QName;
+import org.apache.cxf.Bus;
import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.addressing.impl.MAPAggregatorImpl;
import org.apache.cxf.ws.addressing.soap.MAPCodec;
@@ -39,8 +40,6 @@ public class AddressingPolicyInterceptorProvider extends AbstractPolicyIntercept
private static final long serialVersionUID = -1018053541795476992L;
private static final Collection<QName> ASSERTION_TYPES;
private static final MAPAggregator MAP_AGGREGATOR = new MAPAggregatorImpl();
- private static final MAPCodec MAP_CODEC = new MAPCodec();
-
static {
Collection<QName> types = new ArrayList<QName>();
types.add(MetadataConstants.ADDRESSING_ASSERTION_QNAME);
@@ -51,20 +50,23 @@ public class AddressingPolicyInterceptorProvider extends AbstractPolicyIntercept
types.add(MetadataConstants.USING_ADDRESSING_2006_QNAME);
ASSERTION_TYPES = types;
}
-
- public AddressingPolicyInterceptorProvider() {
+
+ public AddressingPolicyInterceptorProvider(Bus b) {
super(ASSERTION_TYPES);
- getInInterceptors().add(MAP_AGGREGATOR);
- getInInterceptors().add(MAP_CODEC);
+ MAPCodec mapCodec = MAPCodec.getInstance(b);
+
+ getInInterceptors().add(MAP_AGGREGATOR);
+ getInInterceptors().add(mapCodec);
+
getOutInterceptors().add(MAP_AGGREGATOR);
- getOutInterceptors().add(MAP_CODEC);
-
+ getOutInterceptors().add(mapCodec);
+
getInFaultInterceptors().add(MAP_AGGREGATOR);
- getInFaultInterceptors().add(MAP_CODEC);
-
+ getInFaultInterceptors().add(mapCodec);
+
getOutFaultInterceptors().add(MAP_AGGREGATOR);
- getOutFaultInterceptors().add(MAP_CODEC);
+ getOutFaultInterceptors().add(mapCodec);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
index 9cef853..194b6ba 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
@@ -40,6 +40,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.binding.soap.SoapMessage;
@@ -76,7 +77,8 @@ import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
* Properties for {outgo|incom}ing messages.
*/
public class MAPCodec extends AbstractSoapInterceptor {
-
+ public static final MAPCodec INSTANCE = new MAPCodec();
+
private static final Logger LOG = LogUtils.getL7dLogger(MAPCodec.class);
private static final String IS_REFERENCE_PARAM_ATTR_NAME = "IsReferenceParameter";
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
@@ -101,6 +103,22 @@ public class MAPCodec extends AbstractSoapInterceptor {
transformer = new VersionTransformer(this);
}
+ public static synchronized MAPCodec getInstance(Bus bus) {
+ MAPCodec mc = bus.getExtension(MAPCodec.class);
+ if (mc == null) {
+ return createMAPCodec(bus);
+ }
+ return mc;
+ }
+ private static synchronized MAPCodec createMAPCodec(Bus bus) {
+ MAPCodec mc = bus.getExtension(MAPCodec.class);
+ if (mc == null) {
+ bus.setExtension(new MAPCodec(), MAPCodec.class);
+ mc = bus.getExtension(MAPCodec.class);
+ }
+ return mc;
+ }
+
public Map<String, Exchange> getUncorrelatedExchanges() {
return uncorrelatedExchanges;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index 4be1fc7..bdc4b69 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -624,12 +624,16 @@ public class MAPAggregatorTest extends Assert {
srArgs.zeroLengthAction = args.zeroLengthAction;
srArgs.fault = args.fault;
srArgs.noMessageId = args.noMessageId;
-
+
+ Endpoint endpoint = control.createMock(Endpoint.class);
+ exchange.getEndpoint();
+ EasyMock.expectLastCall().andReturn(endpoint).anyTimes();
+
setUpResponder(message,
exchange,
- srArgs);
-
- Endpoint endpoint = control.createMock(Endpoint.class);
+ srArgs,
+ endpoint);
+
endpoint.getOutInterceptors();
EasyMock.expectLastCall().andReturn(new ArrayList<Interceptor<? extends Message>>()).anyTimes();
Service serv = control.createMock(Service.class);
@@ -637,8 +641,6 @@ public class MAPAggregatorTest extends Assert {
EasyMock.expectLastCall().andReturn(serv).anyTimes();
serv.getOutInterceptors();
EasyMock.expectLastCall().andReturn(new ArrayList<Interceptor<? extends Message>>()).anyTimes();
- exchange.getEndpoint();
- EasyMock.expectLastCall().andReturn(endpoint).anyTimes();
}
control.replay();
return message;
@@ -729,7 +731,8 @@ public class MAPAggregatorTest extends Assert {
private void setUpResponder(Message message,
Exchange exchange,
- SetupResponderArgs args) throws Exception {
+ SetupResponderArgs args,
+ Endpoint endpoint) throws Exception {
setUpMessageProperty(message,
REQUESTOR_ROLE,
@@ -763,7 +766,7 @@ public class MAPAggregatorTest extends Assert {
if (!args.outbound) {
setUpOneway(message, exchange, args.oneway);
if (args.oneway || args.decoupled) {
- setUpRebase(message, exchange);
+ setUpRebase(message, exchange, endpoint);
}
}
@@ -792,7 +795,7 @@ public class MAPAggregatorTest extends Assert {
maps);
if (args.fault) {
// REVISIT test double rebase does not occur
- setUpRebase(message, exchange);
+ setUpRebase(message, exchange, endpoint);
}
expectedTo = args.decoupled
? args.fault
@@ -813,15 +816,12 @@ public class MAPAggregatorTest extends Assert {
//EasyMock.expectLastCall().andReturn(null);
}
}
-
- private void setUpRebase(Message message, Exchange exchange)
+
+ private void setUpRebase(Message message, Exchange exchange, Endpoint endpoint)
throws Exception {
setUpMessageProperty(message,
"org.apache.cxf.ws.addressing.partial.response.sent",
Boolean.FALSE);
- Endpoint endpoint = control.createMock(Endpoint.class);
- exchange.getEndpoint();
- EasyMock.expectLastCall().andReturn(endpoint);
Binding binding = control.createMock(Binding.class);
endpoint.getBinding();
EasyMock.expectLastCall().andReturn(binding).anyTimes();
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
index 77fb035..eb8d55b 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java
@@ -47,7 +47,9 @@ import org.apache.cxf.transport.Conduit;
import org.apache.cxf.workqueue.SynchronousExecutor;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.addressing.RelatesToType;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
import org.apache.cxf.ws.rm.manager.SourcePolicyType;
import org.apache.cxf.ws.rm.v200702.CloseSequenceType;
import org.apache.cxf.ws.rm.v200702.CreateSequenceResponseType;
@@ -359,7 +361,12 @@ public class Proxy {
}
};
RMClient client = new RMClient(bus, endpoint, cs);
+ // WS-RM requires ws-addressing
+ WSAddressingFeature wsa = new WSAddressingFeature();
+ wsa.setAddressingRequired(true);
+ wsa.initialize(client, bus);
Map<String, Object> context = client.getRequestContext();
+ context.put(MAPAggregator.ADDRESSING_NAMESPACE, protocol.getWSANamespace());
context.put(RMManager.WSRM_VERSION_PROPERTY, protocol.getWSRMNamespace());
context.put(RMManager.WSRM_WSA_VERSION_PROPERTY, protocol.getWSANamespace());
return client;
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index 8813beb..a85971c 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -112,7 +112,9 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> {
if (null != maps.getAction()) {
action = maps.getAction().getValue();
}
-
+ //make sure we use the appropriate namespace
+ maps.exposeAs(wsaNamespace);
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Action: " + action);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
index 8d3aa17..58b8194 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
@@ -76,7 +76,9 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> {
if (null != maps.getAction()) {
action = maps.getAction().getValue();
}
-
+ //make sure we use the appropriate namespace
+ maps.exposeAs(wsaNamespace);
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Action: " + action);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 3181efe..8b801ac 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -439,6 +439,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
AttributedURIType to = null;
if (null != maps) {
to = maps.getTo();
+ maps.exposeAs(cfg.getAddressingNamespace());
}
if (to != null && RMUtils.getAddressingConstants().getAnonymousURI().equals(to.getValue())) {
LOG.log(Level.INFO, "Cannot resend to anonymous target. Not scheduling a resend.");
@@ -796,7 +797,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
}
// set message addressing properties
- AddressingProperties maps = new MAPCodec().unmarshalMAPs(message);
+ AddressingProperties maps = MAPCodec.getInstance(message.getExchange().getBus()).unmarshalMAPs(message);
RMContextUtils.storeMAPs(maps, message, true, MessageUtils.isRequestor(message));
AttributedURIType to = null;
if (null != maps) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
index b567dc3..c310d9c 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ProxyTest.java
@@ -29,6 +29,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ConduitSelector;
import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.jaxb.DatatypeFactory;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -45,6 +46,8 @@ import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.RelatesToType;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
+import org.apache.cxf.ws.addressing.WSAddressingFeature.WSAddressingFeatureApplier;
import org.apache.cxf.ws.rm.manager.SourcePolicyType;
import org.apache.cxf.ws.rm.v200702.Identifier;
import org.apache.cxf.ws.rm.v200702.OfferType;
@@ -290,6 +293,12 @@ public class ProxyTest extends Assert {
public void testRMClientConstruction() {
Proxy proxy = new Proxy(rme);
Bus bus = control.createMock(Bus.class);
+ EasyMock.expect(bus.getExtension(WSAddressingFeatureApplier.class))
+ .andReturn(new WSAddressingFeatureApplier() {
+ @Override
+ public void initializeProvider(WSAddressingFeature feature, InterceptorProvider provider,
+ Bus bus) {
+ } }).anyTimes();
Endpoint endpoint = control.createMock(Endpoint.class);
Conduit conduit = control.createMock(Conduit.class);
org.apache.cxf.ws.addressing.EndpointReferenceType address =
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index 5231bd4..b144bee 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -309,15 +309,18 @@ public class RMManagerTest extends Assert {
public void testGetReliableEndpointExisting() throws NoSuchMethodException, RMException {
Method m1 = RMManager.class.getDeclaredMethod("createReliableEndpoint",
new Class[] {Endpoint.class});
- manager = control.createMock(RMManager.class, new Method[] {m1});
+ Method m2 = RMManager.class.getDeclaredMethod("getEffectiveConfiguration",
+ new Class[] {Message.class});
+ manager = control.createMock(RMManager.class, new Method[] {m1, m2});
manager.setReliableEndpointsMap(new HashMap<Endpoint, RMEndpoint>());
Message message = control.createMock(Message.class);
+ Exchange exchange = control.createMock(Exchange.class);
+ EasyMock.expect(message.getExchange()).andReturn(exchange).anyTimes();
+
RMConfiguration config = new RMConfiguration();
config.setRMNamespace(RM10Constants.NAMESPACE_URI);
config.setRM10AddressingNamespace(RM10Constants.NAMESPACE_URI);
EasyMock.expect(manager.getEffectiveConfiguration(message)).andReturn(config).anyTimes();
- Exchange exchange = control.createMock(Exchange.class);
- EasyMock.expect(message.getExchange()).andReturn(exchange);
Endpoint endpoint = control.createMock(Endpoint.class);
EasyMock.expect(exchange.getEndpoint()).andReturn(endpoint);
EndpointInfo ei = control.createMock(EndpointInfo.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
index a8828ec..91abfb3 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
@@ -240,7 +240,7 @@ public class FailoverAddressOverrideTest extends AbstractBusClientServerTestBase
protected void enableWSAForCurrentEndpoint() {
Endpoint provider = ClientProxy.getClient(greeter).getEndpoint();
mapAggregator = new MAPAggregator();
- mapCodec = new MAPCodec();
+ mapCodec = MAPCodec.getInstance(ClientProxy.getClient(greeter).getBus());
provider.getInInterceptors().add(mapAggregator);
provider.getInInterceptors().add(mapCodec);
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
index 7412858..d0216a4 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
@@ -436,7 +436,7 @@ public class FailoverTest extends AbstractBusClientServerTestBase {
protected void enableWSAForCurrentEndpoint() {
Endpoint provider = ClientProxy.getClient(greeter).getEndpoint();
mapAggregator = new MAPAggregator();
- mapCodec = new MAPCodec();
+ mapCodec = MAPCodec.getInstance(ClientProxy.getClient(greeter).getBus());
provider.getInInterceptors().add(mapAggregator);
provider.getInInterceptors().add(mapCodec);
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
index 551d67d..119450d 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
@@ -40,6 +40,7 @@ import org.w3c.dom.Node;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
@@ -69,11 +70,9 @@ public class ControlImpl extends org.apache.cxf.greeter_control.ControlImpl {
LOG.info("Initialised bus " + greeterBus + " with cfg file resource: " + cfgResource);
LOG.fine("greeterBus inInterceptors: " + greeterBus.getInInterceptors());
- LoggingInInterceptor logIn = new LoggingInInterceptor();
- LoggingOutInterceptor logOut = new LoggingOutInterceptor();
- greeterBus.getInInterceptors().add(logIn);
- greeterBus.getOutInterceptors().add(logOut);
- greeterBus.getOutFaultInterceptors().add(logOut);
+ LoggingFeature lf = new LoggingFeature();
+ lf.setPrettyLogging(true);
+ lf.initialize(greeterBus);
if (cfgResource.indexOf("provider") == -1) {
endpoint = Endpoint.publish(address, implementor);
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
new file mode 100644
index 0000000..64e0b64
--- /dev/null
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
@@ -0,0 +1,180 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.systest.ws.rm;
+
+import java.io.Closeable;
+
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.soap.AddressingFeature;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ext.logging.LoggingFeature;
+import org.apache.cxf.greeter_control.Control;
+import org.apache.cxf.greeter_control.ControlService;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.GreeterService;
+import org.apache.cxf.systest.ws.util.ConnectionHelper;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.rm.RMManager;
+import org.apache.cxf.ws.rm.feature.RMFeature;
+import org.apache.cxf.ws.rm.manager.AcksPolicyType;
+import org.apache.cxf.ws.rm.manager.DestinationPolicyType;
+import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore;
+import org.apache.cxf.ws.rmp.v200502.RMAssertion;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+/**
+ *
+ */
+public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase {
+ public static final String PORT = allocatePort(WSRM12ServerCycleTest.class);
+ private static final String CFG = "/org/apache/cxf/systest/ws/rm/persistent.xml";
+
+ private static final long DEFAULT_BASE_RETRANSMISSION_INTERVAL = 4000L;
+ private static final long DEFAULT_ACKNOWLEDGEMENT_INTERVAL = 2000L;
+
+ public static class Server extends AbstractBusTestServerBase {
+ String port;
+ String pfx;
+ Endpoint ep;
+ public Server(String args[]) {
+ port = args[0];
+ pfx = args[1];
+ }
+
+ protected void run() {
+ SpringBusFactory factory = new SpringBusFactory();
+ Bus bus = factory.createBus();
+ BusFactory.setDefaultBus(bus);
+ setBus(bus);
+
+ //System.out.println("Created control bus " + bus);
+ ControlImpl implementor = new ControlImpl();
+ implementor.setDbName(pfx + "-server");
+ implementor.setAddress("http://localhost:" + port + "/SoapContext/GreeterPort");
+ GreeterImpl greeterImplementor = new GreeterImpl();
+ implementor.setImplementor(greeterImplementor);
+ ep = Endpoint.publish("http://localhost:" + port + "/SoapContext/ControlPort", implementor);
+ BusFactory.setDefaultBus(null);
+ BusFactory.setThreadDefaultBus(null);
+ }
+ public void tearDown() {
+ ep.stop();
+ ep = null;
+ }
+ public static void main(String args[]) {
+ new Server(args).start();
+ }
+ }
+
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ RMTxStore.deleteDatabaseFiles("cxf7392-recovery", true);
+ RMTxStore.deleteDatabaseFiles("cxf7392-greeter", true);
+ assertTrue("server did not launch correctly",
+ launchServer(Server.class, null, new String[] {PORT, "cxf7392"}, true));
+
+ }
+
+ private String getPrefix() {
+ return "cxf7392";
+ }
+
+ public static RMFeature wsrm() {
+ return wsrm(DEFAULT_BASE_RETRANSMISSION_INTERVAL, DEFAULT_ACKNOWLEDGEMENT_INTERVAL);
+ }
+
+ public static RMFeature wsrm(long brtxInterval, long ackInterval) {
+ RMAssertion.BaseRetransmissionInterval baseRetransmissionInterval
+ = new RMAssertion.BaseRetransmissionInterval();
+ baseRetransmissionInterval.setMilliseconds(Long.valueOf(brtxInterval));
+ RMAssertion.AcknowledgementInterval acknowledgementInterval = new RMAssertion.AcknowledgementInterval();
+ acknowledgementInterval.setMilliseconds(Long.valueOf(ackInterval));
+
+ RMAssertion rmAssertion = new RMAssertion();
+ rmAssertion.setAcknowledgementInterval(acknowledgementInterval);
+ rmAssertion.setBaseRetransmissionInterval(baseRetransmissionInterval);
+
+ AcksPolicyType acksPolicy = new AcksPolicyType();
+ acksPolicy.setIntraMessageThreshold(0);
+ DestinationPolicyType destinationPolicy = new DestinationPolicyType();
+ destinationPolicy.setAcksPolicy(acksPolicy);
+
+ RMFeature feature = new RMFeature();
+ feature.setRMAssertion(rmAssertion);
+ feature.setDestinationPolicy(destinationPolicy);
+ //feature.setRMNamespace(RM11Constants.NAMESPACE_URI);
+
+ return feature;
+ }
+
+
+
+ @Test
+ public void testCXF7392() throws Exception {
+ SpringBusFactory bf = new SpringBusFactory();
+ bus = bf.createBus();
+ BusFactory.setDefaultBus(bus);
+ ControlService cs = new ControlService();
+ Control control = cs.getControlPort();
+ ConnectionHelper.setKeepAliveConnection(control, false, true);
+ updateAddressPort(control, PORT);
+
+ Assert.assertTrue("Failed to start greeter", control.startGreeter(CFG));
+
+ System.setProperty("db.name", getPrefix() + "-recovery");
+ Bus greeterBus = new SpringBusFactory().createBus();
+ System.clearProperty("db.name");
+ BusFactory.setDefaultBus(greeterBus);
+
+ // avoid early client resends
+ greeterBus.getExtension(RMManager.class).getConfiguration()
+ .setBaseRetransmissionInterval(new Long(60000));
+ GreeterService gs = new GreeterService();
+ Greeter greeter = gs.getGreeterPort(new LoggingFeature(), new AddressingFeature(), wsrm());
+ updateAddressPort(greeter, PORT);
+
+ greeter.greetMe("one");
+ greeter.greetMe("two");
+ greeter.greetMe("three");
+
+
+ control.stopGreeter(CFG);
+ control.startGreeter(CFG);
+
+ // this will cause an exception as the sequence is no longer valid
+ //greeter.greetMe("four");
+
+
+ ((Closeable)greeter).close();
+ greeterBus.shutdown(true);
+ control.stopGreeter(CFG);
+ bus.shutdown(true);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/059cb2b9/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
index 8890e07..b47d6b5 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java
@@ -127,7 +127,7 @@ public class NestedAddressingPolicyTest extends AbstractBusClientServerTestBase
updateAddressPort(greeter, PORT);
LoggingInInterceptor in = new LoggingInInterceptor();
LoggingOutInterceptor out = new LoggingOutInterceptor();
- MAPCodec mapCodec = new MAPCodec();
+ MAPCodec mapCodec = MAPCodec.getInstance(bus);
MAPAggregatorImpl mapAggregator = new MAPAggregatorImpl();
bus.getInInterceptors().add(in);
[9/9] cxf git commit: Fix merge issues
Posted by dk...@apache.org.
Fix merge issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d70f76be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d70f76be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d70f76be
Branch: refs/heads/3.1.x-fixes
Commit: d70f76bea07b86490e9d0d1b084e03f5683d3f6d
Parents: 82f5ca8
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jun 7 13:53:56 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 13:53:56 2017 -0400
----------------------------------------------------------------------
parent/pom.xml | 5 +++++
pom.xml | 4 ----
systests/ws-rm/pom.xml | 6 ++++++
.../test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java | 2 --
4 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d70f76be/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ab1c7db..38126be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -786,6 +786,11 @@
<version>${cxf.netty.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${cxf.derby.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${cxf.httpcomponents.client.version}</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d70f76be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 81f5693..e6f600a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -483,11 +483,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
-<<<<<<< HEAD
- <version>3.3</version>
-=======
<version>3.6.1</version>
->>>>>>> 18418ec342... Update maven-compiler-plugin
<configuration>
<source>1.7</source>
<target>1.7</target>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d70f76be/systests/ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/systests/ws-rm/pom.xml b/systests/ws-rm/pom.xml
index 1a5cfda..9cfd0eb 100644
--- a/systests/ws-rm/pom.xml
+++ b/systests/ws-rm/pom.xml
@@ -94,6 +94,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-logging</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d70f76be/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
index 119450d..59394b5 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
@@ -42,8 +42,6 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.helpers.XPathUtils;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
[4/9] cxf git commit: Update maven-compiler-plugin
Posted by dk...@apache.org.
Update maven-compiler-plugin
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/82ac9402
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/82ac9402
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/82ac9402
Branch: refs/heads/3.1.x-fixes
Commit: 82ac9402b836ff58a131ed1c86226072ea267b42
Parents: a8a8570
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Fri May 26 10:25:29 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jun 7 12:41:45 2017 -0400
----------------------------------------------------------------------
distribution/src/main/release/samples/pom.xml | 4 ++--
pom.xml | 6 +++++-
systests/wsdl_maven/codegen/src/it/it-parent/pom.xml | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/82ac9402/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 4b3785c..98d6426 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -127,7 +127,7 @@
<dependencyManagement>
<dependencies>
<!--
- Pull in the cxf-parents as import scope to re-use the dependenecyManagement
+ Pull in the cxf-parents as import scope to re-use the dependencyManagement
sections of those poms. Those sections define the versions of various third
party deps that CXF used to build with and test with and we would like
to make sure the same versions are used for the samples
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
http://git-wip-us.apache.org/repos/asf/cxf/blob/82ac9402/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd9471b..81f5693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.6.1</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -483,7 +483,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+<<<<<<< HEAD
<version>3.3</version>
+=======
+ <version>3.6.1</version>
+>>>>>>> 18418ec342... Update maven-compiler-plugin
<configuration>
<source>1.7</source>
<target>1.7</target>
http://git-wip-us.apache.org/repos/asf/cxf/blob/82ac9402/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 5429578..7a49413 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.6.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>