Author: sebb
Date: Sat Mar 3 16:08:43 2007
New Revision: 514283
URL: http://svn.apache.org/viewvc?view=rev&rev=514283
Log:
Replace deprecated Xstream ClassMapper with Mapper
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/SaveService.java
Sat Mar 3 16:08:43 2007
@@ -50,8 +50,8 @@
import org.apache.log.Logger;
import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.alias.CannotResolveClassException;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.CannotResolveClassException;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.ConversionException;
import com.thoughtworks.xstream.converters.Converter;
@@ -176,12 +176,12 @@
try {
if
(val.trim().equals("collection")) { // $NON-NLS-1$
saver.registerConverter((Converter) Class.forName(key).getConstructor(
-
new Class[] { ClassMapper.class }).newInstance(
-
new Object[] { saver.getClassMapper() }));
+
new Class[] { Mapper.class }).newInstance(
+
new Object[] { saver.getMapper() }));
} else if
(val.trim().equals("mapping")) { // $NON-NLS-1$
saver.registerConverter((Converter) Class.forName(key).getConstructor(
-
new Class[] { ClassMapper.class }).newInstance(
-
new Object[] { saver.getClassMapper() }));
+
new Class[] { Mapper.class }).newInstance(
+
new Object[] { saver.getMapper() }));
} else {
saver.registerConverter((Converter) Class.forName(key).newInstance());
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
Sat Mar 3 16:08:43 2007
@@ -21,7 +21,7 @@
import org.apache.jmeter.save.converters.ConversionHelp;
import org.apache.jorphan.collections.HashTree;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -45,9 +45,9 @@
return "$Revision$"; // $NON-NLS-1$
}
- ClassMapper classMapper;
+ Mapper classMapper;
- public ScriptWrapperConverter(ClassMapper classMapper) {
+ public ScriptWrapperConverter(Mapper classMapper) {
this.classMapper = classMapper;
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
Sat Mar 3 16:08:43 2007
@@ -22,7 +22,7 @@
import org.apache.jorphan.collections.HashTree;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import
com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -101,7 +101,7 @@
/**
* @param arg0
*/
- public HashTreeConverter(ClassMapper arg0) {
+ public HashTreeConverter(Mapper arg0) {
super(arg0);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
Sat Mar 3 16:08:43 2007
@@ -24,7 +24,7 @@
import org.apache.jmeter.testelement.property.MultiProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import
com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -96,7 +96,7 @@
/**
* @param arg0
*/
- public MultiPropertyConverter(ClassMapper arg0) {
+ public MultiPropertyConverter(Mapper arg0) {
super(arg0);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Sat Mar 3 16:08:43 2007
@@ -30,7 +30,7 @@
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jorphan.util.Converter;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import
com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -389,7 +389,7 @@
/**
* @param arg0
*/
- public SampleResultConverter(ClassMapper arg0) {
+ public SampleResultConverter(Mapper arg0) {
super(arg0);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Sat Mar 3 16:08:43 2007
@@ -20,7 +20,7 @@
import org.apache.jmeter.samplers.SampleSaveConfiguration;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
@@ -49,7 +49,7 @@
static class MyWrapper extends MapperWrapper{
- public MyWrapper(ClassMapper wrapped) {
+ public MyWrapper(Mapper wrapped) {
super(wrapped);
}
@@ -62,7 +62,7 @@
return true;
}
}
- public SampleSaveConfigurationConverter(ClassMapper arg0) {
+ public SampleSaveConfigurationConverter(Mapper arg0) {
super(new MyWrapper(arg0),rp);
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
Sat Mar 3 16:08:43 2007
@@ -25,7 +25,7 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import
com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -115,7 +115,7 @@
/**
* @param arg0
*/
- public TestElementConverter(ClassMapper arg0) {
+ public TestElementConverter(Mapper arg0) {
super(arg0);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Sat Mar 3 16:08:43 2007
@@ -27,7 +27,7 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import
com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -148,7 +148,7 @@
/**
* @param arg0
*/
- public TestElementPropertyConverter(ClassMapper arg0) {
+ public TestElementPropertyConverter(Mapper arg0) {
super(arg0);
}
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
Sat Mar 3 16:08:43 2007
@@ -27,7 +27,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.save.TestResultWrapper;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import
com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -51,7 +51,7 @@
/**
* @param arg0
*/
- public TestResultWrapperConverter(ClassMapper arg0) {
+ public TestResultWrapperConverter(Mapper arg0) {
super(arg0);
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java?view=diff&rev=514283&r1=514282&r2=514283
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
Sat Mar 3 16:08:43 2007
@@ -28,7 +28,7 @@
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.save.converters.SampleResultConverter;
-import com.thoughtworks.xstream.alias.ClassMapper;
+import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -51,7 +51,7 @@
/**
* @param arg0
*/
- public HTTPResultConverter(ClassMapper arg0) {
+ public HTTPResultConverter(Mapper arg0) {
super(arg0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
