cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsosno...@apache.org
Subject svn commit: r1144798 - in /cxf/trunk/rt/ws/rm/src: main/java/org/apache/cxf/ws/rm/ main/java/org/apache/cxf/ws/rm/persistence/jdbc/ test/java/org/apache/cxf/ws/rm/ test/java/org/apache/cxf/ws/rm/persistence/jdbc/ test/java/org/apache/cxf/ws/rm/soap/
Date Sun, 10 Jul 2011 09:30:17 GMT
Author: dsosnoski
Date: Sun Jul 10 09:30:16 2011
New Revision: 1144798

URL: http://svn.apache.org/viewvc?rev=1144798&view=rev
Log:
Eliminate unnecessary use of JAXB factory for WS-RM data objects.

Modified:
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
    cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Sun Jul
10 09:30:16 2011
@@ -146,8 +146,7 @@ public class DestinationSequence extends
             if (!done) {
                 
                 // need new acknowledgement range
-                AcknowledgementRange range = RMUtils.getWSRMFactory()
-                    .createSequenceAcknowledgementAcknowledgementRange();
+                AcknowledgementRange range = new AcknowledgementRange();
                 range.setLower(messageNumber);
                 range.setUpper(messageNumber);
                 acknowledgement.getAcknowledgementRange().add(i, range);

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java Sun Jul 10 09:30:16
2011
@@ -499,13 +499,13 @@ public class RMManager implements Server
                 exchange.put(BindingInfo.class, endpoint.getEndpointInfo().getBinding());
                 exchange.put(Bus.class, bus);
                 
-                SequenceType st = RMUtils.getWSRMFactory().createSequenceType();
+                SequenceType st = new SequenceType();
                 st.setIdentifier(ss.getIdentifier());
                 st.setMessageNumber(m.getMessageNumber());
                 RMProperties rmps = new RMProperties();
                 rmps.setSequence(st);
                 if (ss.isLastMessage() && ss.getCurrentMessageNr() == m.getMessageNumber())
{
-                    CloseSequenceType close = RMUtils.getWSRMFactory().createCloseSequenceType();
+                    CloseSequenceType close = new CloseSequenceType();
                     close.setIdentifier(ss.getIdentifier());
                     rmps.setCloseSequence(close);
                 }
@@ -603,7 +603,7 @@ public class RMManager implements Server
 
         public Identifier generateSequenceIdentifier() {
             String sequenceID = RMContextUtils.generateUUID();
-            Identifier sid = RMUtils.getWSRMFactory().createIdentifier();
+            Identifier sid = new Identifier();
             sid.setValue(sequenceID);
             return sid;
         }

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java Sun Jul 10 09:30:16
2011
@@ -103,8 +103,7 @@ public class Servant implements Invoker 
         CreateSequenceType create = codec.convertReceivedCreateSequence(getParameter(message));
         Destination destination = reliableEndpoint.getDestination();
         
-        CreateSequenceResponseType createResponse = 
-            RMUtils.getWSRMFactory().createCreateSequenceResponseType();        
+        CreateSequenceResponseType createResponse = new CreateSequenceResponseType();   
    
         createResponse.setIdentifier(destination.generateSequenceIdentifier());
         
         DestinationPolicyType dp = reliableEndpoint.getManager().getDestinationPolicy();
@@ -122,14 +121,14 @@ public class Servant implements Invoker 
                     &&  supportedDuration.isShorterThan(effectiveDuration)))  {
                 effectiveDuration = supportedDuration;
             }
-            ex = RMUtils.getWSRMFactory().createExpires();
+            ex = new Expires();
             ex.setValue(effectiveDuration);
             createResponse.setExpires(ex);
         }
         
         OfferType offer = create.getOffer();
         if (null != offer) {
-            AcceptType accept = RMUtils.getWSRMFactory().createAcceptType();
+            AcceptType accept = new AcceptType();
             if (dp.isAcceptOffers()) {
                 Source source = reliableEndpoint.getSource();
                 LOG.fine("Accepting inbound sequence offer");

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java Sun Jul 10 09:30:16
2011
@@ -63,7 +63,7 @@ public class SourceSequence extends Abst
 
         currentMessageNumber = cmn;
         lastMessage = lm;
-        acknowledgement = RMUtils.getWSRMFactory().createSequenceAcknowledgement();
+        acknowledgement = new SequenceAcknowledgement();
         acknowledgement.setIdentifier(id);
     }
 

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/VersionTransformer.java Sun Jul
10 09:30:16 2011
@@ -204,7 +204,7 @@ public final class VersionTransformer {
         if (exposed == null) {
             return null;
         }
-        Identifier internal = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier internal = new Identifier();
         internal.setValue(exposed.getValue());
         putAll(exposed.getOtherAttributes(), internal.getOtherAttributes());
         return internal;
@@ -220,7 +220,7 @@ public final class VersionTransformer {
         if (exposed == null) {
             return null;
         }
-        Identifier internal = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier internal = new Identifier();
         internal.setValue(exposed.getValue());
         putAll(exposed.getOtherAttributes(), internal.getOtherAttributes());
         return internal;
@@ -435,7 +435,7 @@ public final class VersionTransformer {
      * @return converted
      */
     public static SequenceType convert(org.apache.cxf.ws.rm.v200502.SequenceType exposed)
{
-        SequenceType internal = RMUtils.getWSRMFactory().createSequenceType();
+        SequenceType internal = new SequenceType();
         internal.setIdentifier(convert(exposed.getIdentifier()));
         internal.setMessageNumber(exposed.getMessageNumber());
         addAll(exposed.getAny(), internal.getAny());
@@ -450,7 +450,7 @@ public final class VersionTransformer {
      * @return converted
      */
     public static SequenceType convert(org.apache.cxf.ws.rm.v200502wsa15.SequenceType exposed)
{
-        SequenceType internal = RMUtils.getWSRMFactory().createSequenceType();
+        SequenceType internal = new SequenceType();
         internal.setIdentifier(convert(exposed.getIdentifier()));
         internal.setMessageNumber(exposed.getMessageNumber());
         addAll(exposed.getAny(), internal.getAny());
@@ -658,7 +658,7 @@ public final class VersionTransformer {
      */
     public static SequenceAcknowledgement
     convert(org.apache.cxf.ws.rm.v200502wsa15.SequenceAcknowledgement exposed) {
-        SequenceAcknowledgement internal = RMUtils.getWSRMFactory().createSequenceAcknowledgement();
+        SequenceAcknowledgement internal = new SequenceAcknowledgement();
         internal.setIdentifier(convert(exposed.getIdentifier()));
         List<SequenceAcknowledgement.AcknowledgementRange> internalRanges
             = internal.getAcknowledgementRange();
@@ -684,7 +684,7 @@ public final class VersionTransformer {
      */
     public static SequenceAcknowledgement
     convert(org.apache.cxf.ws.rm.v200502.SequenceAcknowledgement exposed) {
-        SequenceAcknowledgement internal = RMUtils.getWSRMFactory().createSequenceAcknowledgement();
+        SequenceAcknowledgement internal = new SequenceAcknowledgement();
         internal.setIdentifier(convert(exposed.getIdentifier()));
         List<SequenceAcknowledgement.AcknowledgementRange> internalRanges
             = internal.getAcknowledgementRange();
@@ -742,7 +742,7 @@ public final class VersionTransformer {
      */
     public static AckRequestedType
     convert(org.apache.cxf.ws.rm.v200502wsa15.AckRequestedType exposed) {
-        AckRequestedType internal = RMUtils.getWSRMFactory().createAckRequestedType();
+        AckRequestedType internal = new AckRequestedType();
         internal.setIdentifier(convert(exposed.getIdentifier()));
         addAll(exposed.getAny(), internal.getAny());
         putAll(exposed.getOtherAttributes(), internal.getOtherAttributes());
@@ -757,7 +757,7 @@ public final class VersionTransformer {
      */
     public static AckRequestedType
     convert(org.apache.cxf.ws.rm.v200502.AckRequestedType exposed) {
-        AckRequestedType internal = RMUtils.getWSRMFactory().createAckRequestedType();
+        AckRequestedType internal = new AckRequestedType();
         internal.setIdentifier(convert(exposed.getIdentifier()));
         addAll(exposed.getAny(), internal.getAny());
         putAll(exposed.getOtherAttributes(), internal.getOtherAttributes());

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
(original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
Sun Jul 10 09:30:16 2011
@@ -301,7 +301,7 @@ public class RMTxStore implements RMStor
                 String oidValue = res.getString(4);
                 Identifier oi = null;
                 if (null != oidValue) {
-                    oi = RMUtils.getWSRMFactory().createIdentifier();
+                    oi = new Identifier();
                     oi.setValue(oidValue);
                 }                            
                 return new SourceSequence(sid, expiry, oi, cmn, lm);
@@ -365,7 +365,7 @@ public class RMTxStore implements RMStor
             
             ResultSet res = selectDestSequencesStmt.executeQuery(); 
             while (res.next()) {
-                Identifier sid = RMUtils.getWSRMFactory().createIdentifier();           
    
+                Identifier sid = new Identifier();                
                 sid.setValue(res.getString(1));
                 EndpointReferenceType acksTo = RMUtils.createReference(res.getString(2));
 
                 long lm = res.getLong(3);
@@ -398,7 +398,7 @@ public class RMTxStore implements RMStor
             ResultSet res = selectSrcSequencesStmt.executeQuery();
             
             while (res.next()) {
-                Identifier sid = RMUtils.getWSRMFactory().createIdentifier();
+                Identifier sid = new Identifier();
                 sid.setValue(res.getString(1));
                 long cmn = res.getLong(2);
                 boolean lm = res.getBoolean(3);
@@ -407,7 +407,7 @@ public class RMTxStore implements RMStor
                 String oidValue = res.getString(5);
                 Identifier oi = null;
                 if (null != oidValue) {
-                    oi = RMUtils.getWSRMFactory().createIdentifier();
+                    oi = new Identifier();
                     oi.setValue(oidValue);
                 }                            
                 SourceSequence seq = new SourceSequence(sid, expiry, oi, cmn, lm);

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java Sun
Jul 10 09:30:16 2011
@@ -95,7 +95,7 @@ public class DestinationSequenceTest ext
         assertNotNull(seq.getAcknowledgment());
         assertNotNull(seq.getMonitor());   
         
-        SequenceAcknowledgement ack = RMUtils.getWSRMFactory().createSequenceAcknowledgement();
       
+        SequenceAcknowledgement ack = new SequenceAcknowledgement();        
         seq = new DestinationSequence(id, ref, 10, ack);
         assertEquals(id, seq.getIdentifier());
         assertEquals(10, seq.getLastMessageNumber());

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java (original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ServantTest.java Sun Jul 10 09:30:16
2011
@@ -106,7 +106,7 @@ public class ServantTest extends Assert 
         
         manager.setDestinationPolicy(dp);
         
-        Expires expires = RMUtils.getWSRMFactory().createExpires();
+        Expires expires = new Expires();
         expires.setValue(DatatypeFactory.createDuration("P0Y0M0DT0H0M0.0S"));
         Message message = createTestCreateSequenceMessage(expires, null);
 
@@ -126,7 +126,7 @@ public class ServantTest extends Assert 
         dp.setSequenceExpiration(DURATION_SHORT);
         manager.setDestinationPolicy(dp);
         
-        Expires expires = RMUtils.getWSRMFactory().createExpires();
+        Expires expires = new Expires();
         expires.setValue(DURATION_DEFAULT);
         Message message = createTestCreateSequenceMessage(expires, null);
 
@@ -145,7 +145,7 @@ public class ServantTest extends Assert 
         dp.setAcksPolicy(ap);
         manager.setDestinationPolicy(dp);
         
-        Expires expires = RMUtils.getWSRMFactory().createExpires();
+        Expires expires = new Expires();
         expires.setValue(DURATION_SHORT);
     
         Message message = createTestCreateSequenceMessage(expires, null);        
@@ -166,7 +166,7 @@ public class ServantTest extends Assert 
         dp.setSequenceExpiration(DURATION_SHORT);
         manager.setDestinationPolicy(dp);
         
-        Expires expires = RMUtils.getWSRMFactory().createExpires();
+        Expires expires = new Expires();
         expires.setValue(DURATION_VERY_SHORT);
         
         Message message = createTestCreateSequenceMessage(expires, null);        
@@ -199,7 +199,7 @@ public class ServantTest extends Assert 
         
         message.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, maps);
         
-        CreateSequenceType cs = RMUtils.getWSRMFactory().createCreateSequenceType();
+        CreateSequenceType cs = new CreateSequenceType();
         cs.setAcksTo(RMUtils.createReference(DECOUPLED_URL));
 
         cs.setExpires(expires);

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
(original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTest.java
Sun Jul 10 09:30:16 2011
@@ -124,7 +124,7 @@ public class RMTxStoreTest extends Asser
     @Test
     public void testCreateDeleteSrcSequences() {
         SourceSequence seq = control.createMock(SourceSequence.class);
-        Identifier sid1 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid1 = new Identifier();
         sid1.setValue("sequence1");
         EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
         EasyMock.expect(seq.getExpires()).andReturn(null);
@@ -153,11 +153,11 @@ public class RMTxStoreTest extends Asser
         control.verify();
         
         control.reset();
-        Identifier sid2 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid2 = new Identifier();
         sid2.setValue("sequence2");
         EasyMock.expect(seq.getIdentifier()).andReturn(sid2);  
         EasyMock.expect(seq.getExpires()).andReturn(new Date());
-        Identifier sid3 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid3 = new Identifier();
         sid3.setValue("offeringSequence3");
         EasyMock.expect(seq.getOfferingSequenceIdentifier()).andReturn(sid3);
         EasyMock.expect(seq.getEndpointIdentifier()).andReturn(SERVER_ENDPOINT_ID);
@@ -177,7 +177,7 @@ public class RMTxStoreTest extends Asser
     @Test
     public void testCreateDeleteDestSequences() {
         DestinationSequence seq = control.createMock(DestinationSequence.class);
-        Identifier sid1 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid1 = new Identifier();
         sid1.setValue("sequence1");
         EndpointReferenceType epr = RMUtils.createAnonymousReference();
         EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
@@ -205,7 +205,7 @@ public class RMTxStoreTest extends Asser
         control.verify();
         
         control.reset();
-        Identifier sid2 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid2 = new Identifier();
         sid2.setValue("sequence2");
         EasyMock.expect(seq.getIdentifier()).andReturn(sid2); 
         epr = RMUtils.createReference(NON_ANON_ACKS_TO);
@@ -226,7 +226,7 @@ public class RMTxStoreTest extends Asser
     @Test
     public void testCreateDeleteMessages() throws IOException, SQLException  {
         RMMessage msg = control.createMock(RMMessage.class);
-        Identifier sid1 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid1 = new Identifier();
         sid1.setValue("sequence1");
         EasyMock.expect(msg.getMessageNumber()).andReturn(ONE).times(2); 
         byte[] bytes = new byte[89];
@@ -276,7 +276,7 @@ public class RMTxStoreTest extends Asser
         store.removeMessages(sid1, messageNrs, true);
         store.removeMessages(sid1, messageNrs, false);
         
-        Identifier sid2 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid2 = new Identifier();
         sid1.setValue("sequence2");
         store.removeMessages(sid2, messageNrs, true);
     }
@@ -284,7 +284,7 @@ public class RMTxStoreTest extends Asser
     @Test
     public void testUpdateDestinationSequence() throws SQLException, IOException {
         DestinationSequence seq = control.createMock(DestinationSequence.class);
-        Identifier sid1 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid1 = new Identifier();
         sid1.setValue("sequence1");
         EndpointReferenceType epr = RMUtils.createAnonymousReference();
         EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
@@ -321,7 +321,7 @@ public class RMTxStoreTest extends Asser
     @Test
     public void testUpdateSourceSequence() throws SQLException {
         SourceSequence seq = control.createMock(SourceSequence.class);
-        Identifier sid1 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid1 = new Identifier();
         sid1.setValue("sequence1");
         EasyMock.expect(seq.getIdentifier()).andReturn(sid1);
         EasyMock.expect(seq.getExpires()).andReturn(null);
@@ -422,7 +422,7 @@ public class RMTxStoreTest extends Asser
         Identifier sid1 = null;
         Identifier sid2 = null;
         
-        DestinationSequence seq = store.getDestinationSequence(RMUtils.getWSRMFactory().createIdentifier());
+        DestinationSequence seq = store.getDestinationSequence(new Identifier());
         assertNull(seq);
 
         try {
@@ -450,7 +450,7 @@ public class RMTxStoreTest extends Asser
         Identifier sid1 = null;
         Identifier sid2 = null;
         
-        SourceSequence seq = store.getSourceSequence(RMUtils.getWSRMFactory().createIdentifier());
+        SourceSequence seq = store.getSourceSequence(new Identifier());
         assertNull(seq);
         
         try {
@@ -475,9 +475,9 @@ public class RMTxStoreTest extends Asser
     @Test
     public void testGetMessages() throws SQLException, IOException {
         
-        Identifier sid1 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid1 = new Identifier();
         sid1.setValue("sequence1");
-        Identifier sid2 = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid2 = new Identifier();
         sid2.setValue("sequence2");
         
         Collection<RMMessage> out = store.getMessages(sid1, true);
@@ -520,7 +520,7 @@ public class RMTxStoreTest extends Asser
     private Identifier setupDestinationSequence(String s) throws IOException, SQLException
{
         DestinationSequence seq = control.createMock(DestinationSequence.class);
         
-        Identifier sid = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid = new Identifier();
         sid.setValue(s);
         EndpointReferenceType epr = RMUtils.createAnonymousReference();
         
@@ -551,7 +551,7 @@ public class RMTxStoreTest extends Asser
     
     private Identifier setupSourceSequence(String s) throws SQLException {
         SourceSequence seq = control.createMock(SourceSequence.class);        
-        Identifier sid = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid = new Identifier();
         sid.setValue(s);      
             
         Date expiry = null;
@@ -561,7 +561,7 @@ public class RMTxStoreTest extends Asser
         
         if ("sequence2".equals(s)) {
             expiry = new Date(System.currentTimeMillis() + 3600 * 1000);
-            osid = RMUtils.getWSRMFactory().createIdentifier();
+            osid = new Identifier();
             osid.setValue("offeringSequence");
             cmn = TEN;
             lm = true;            

Modified: cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java?rev=1144798&r1=1144797&r2=1144798&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
(original)
+++ cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
Sun Jul 10 09:30:16 2011
@@ -52,7 +52,6 @@ import org.apache.cxf.ws.rm.RM10Constant
 import org.apache.cxf.ws.rm.RMConstants;
 import org.apache.cxf.ws.rm.RMContextUtils;
 import org.apache.cxf.ws.rm.RMProperties;
-import org.apache.cxf.ws.rm.RMUtils;
 import org.apache.cxf.ws.rm.SequenceFault;
 import org.apache.cxf.ws.rm.v200702.AckRequestedType;
 import org.apache.cxf.ws.rm.v200702.Identifier;
@@ -62,6 +61,7 @@ import org.apache.cxf.ws.rm.v200702.Sequ
 import org.apache.cxf.ws.rm.v200702.SequenceType;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -236,7 +236,7 @@ public class RMSoapInterceptorTest exten
         message = setupOutboundFaultMessage();
         SequenceFault sf = new SequenceFault("REASON");
         sf.setFaultCode(RM10Constants.UNKNOWN_SEQUENCE_FAULT_QNAME);
-        Identifier sid = RMUtils.getWSRMFactory().createIdentifier();
+        Identifier sid = new Identifier();
         sid.setValue("SID");
         sf.setSender(true);
         f.initCause(sf);



Mime
View raw message