You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/05/26 21:26:25 UTC
svn commit: r660275 - in
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: ./
builder/xml/ component/bean/ component/dataset/ component/direct/
component/jmx/ component/timer/ component/vm/ converter/ converter/jaxp/
impl/ impl/converter...
Author: davsclaus
Date: Mon May 26 12:26:13 2008
New Revision: 660275
URL: http://svn.apache.org/viewvc?rev=660275&view=rev
Log:
CAMEL-517: Polished javadoc
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowFaultProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java Mon May 26 12:26:13 2008
@@ -31,8 +31,6 @@
/**
* Returns the WSDL URI for this message exchange pattern
- *
- * @return the WSDL URI for this message exchange pattern
*/
public String getWsdlUri() {
switch (this) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/DomResultHandlerFactory.java Mon May 26 12:26:13 2008
@@ -22,6 +22,7 @@
* @version $Revision$
*/
public class DomResultHandlerFactory implements ResultHandlerFactory {
+
public ResultHandler createResult() {
return new DomResultHandler();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java Mon May 26 12:26:13 2008
@@ -41,7 +41,6 @@
* @version $Revision$
*/
public class MessageVariableResolver implements XPathVariableResolver {
-
private static final transient Log LOG = LogFactory.getLog(MessageVariableResolver.class);
private Exchange exchange;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java Mon May 26 12:26:13 2008
@@ -29,7 +29,6 @@
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.ObjectHelper;
-
/**
* A helper class for working with namespaces or creating namespace based expressions
*
@@ -45,7 +44,6 @@
private Map<String, String> namespaces = new HashMap<String, String>();
-
/**
* Creates a namespaces object from the given XML element
*
@@ -69,6 +67,7 @@
public static boolean isMatchingNamespaceOrEmptyNamespace(String namespaceURI, String expectedNamespace) {
return ObjectHelper.isNullOrBlank(namespaceURI) || namespaceURI.equals(expectedNamespace);
}
+
public Namespaces add(String prefix, String uri) {
namespaces.put(prefix, uri);
return this;
@@ -136,7 +135,6 @@
return namespaces;
}
-
/**
* Configures the namespace aware object
*/
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandler.java Mon May 26 12:26:13 2008
@@ -26,6 +26,7 @@
* @version $Revision$
*/
public interface ResultHandler {
+
Result getResult();
void setBody(Message in);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/ResultHandlerFactory.java Mon May 26 12:26:13 2008
@@ -22,5 +22,6 @@
* @version $Revision$
*/
public interface ResultHandlerFactory {
+
ResultHandler createResult();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/StreamResultHandlerFactory.java Mon May 26 12:26:13 2008
@@ -22,6 +22,7 @@
* @version $Revision$
*/
public class StreamResultHandlerFactory implements ResultHandlerFactory {
+
public ResultHandler createResult() {
return new StreamResultHandler();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java Mon May 26 12:26:13 2008
@@ -34,7 +34,7 @@
* @version $Revision$
*/
public class BeanComponent extends DefaultComponent {
- private static final Log LOG = LogFactory.getLog(BeanComponent.class);
+ private static final transient Log LOG = LogFactory.getLog(BeanComponent.class);
private ParameterMappingStrategy parameterMappingStrategy;
public BeanComponent() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java Mon May 26 12:26:13 2008
@@ -24,6 +24,7 @@
* @version $Revision$
*/
public interface BeanHolder {
+
Object getBean() throws Exception;
Processor getProcessor();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Mon May 26 12:26:13 2008
@@ -176,11 +176,8 @@
// now lets add the method to the repository
String opName = method.getName();
- /*
- *
- * TODO allow an annotation to expose the operation name to use
- *
- * if (method.getAnnotation(Operation.class) != null) { String name =
+ // TODO allow an annotation to expose the operation name to use
+ /* if (method.getAnnotation(Operation.class) != null) { String name =
* method.getAnnotation(Operation.class).name(); if (name != null &&
* name.length() > 0) { opName = name; } }
*/
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Mon May 26 12:26:13 2008
@@ -37,7 +37,7 @@
*/
public class BeanProcessor extends ServiceSupport implements Processor {
public static final String METHOD_NAME = "org.apache.camel.MethodName";
- private static final Log LOG = LogFactory.getLog(BeanProcessor.class);
+ private static final transient Log LOG = LogFactory.getLog(BeanProcessor.class);
private Method methodObject;
private String method;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java Mon May 26 12:26:13 2008
@@ -31,6 +31,7 @@
* @version $Revision$
*/
public class DefaultAnnotationExpressionFactory implements AnnotationExpressionFactory {
+
public Expression createExpression(CamelContext camelContext, Annotation annotation, LanguageAnnotation languageAnnotation, Class expressionReturnType) {
String languageName = languageAnnotation.language();
if (languageName == null) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java Mon May 26 12:26:13 2008
@@ -25,6 +25,7 @@
* @version $Revision$
*/
public interface MethodInvocation {
+
Method getMethod();
Object[] getArguments();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java Mon May 26 12:26:13 2008
@@ -31,6 +31,7 @@
* @version $Revision$
*/
public class XPathAnnotationExpressionFactory extends DefaultAnnotationExpressionFactory {
+
@Override
public Expression createExpression(CamelContext camelContext, Annotation annotation, LanguageAnnotation languageAnnotation, Class expressionReturnType) {
String xpath = getExpressionFromAnnotation(annotation);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java Mon May 26 12:26:13 2008
@@ -24,6 +24,7 @@
* @version $Revision$
*/
public interface DataSet {
+
String INDEX_HEADER = "camelDataSetIndex";
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java Mon May 26 12:26:13 2008
@@ -35,11 +35,10 @@
* @version $Revision$
*/
public class DirectEndpoint<E extends Exchange> extends DefaultEndpoint<E> {
- private static final Log LOG = LogFactory.getLog(DirectEndpoint.class);
- boolean allowMultipleConsumers = true;
+ private static final transient Log LOG = LogFactory.getLog(DirectEndpoint.class);
+ private boolean allowMultipleConsumers = true;
private final CopyOnWriteArrayList<DefaultConsumer<E>> consumers = new CopyOnWriteArrayList<DefaultConsumer<E>>();
-
public DirectEndpoint(String uri, DirectComponent<E> component) {
super(uri, component);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXConsumer.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXConsumer.java Mon May 26 12:26:13 2008
@@ -28,7 +28,7 @@
*/
public class JMXConsumer extends DefaultConsumer implements NotificationListener {
- JMXEndpoint jmxEndpoint;
+ private JMXEndpoint jmxEndpoint;
public JMXConsumer(JMXEndpoint endpoint, Processor processor) {
super(endpoint, processor);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java Mon May 26 12:26:13 2008
@@ -35,8 +35,7 @@
* @version $Revision$
*/
public class JMXEndpoint extends DefaultEndpoint<JMXExchange> {
-
- private static final Log LOG = LogFactory.getLog(JMXEndpoint.class);
+ private static final transient Log LOG = LogFactory.getLog(JMXEndpoint.class);
private String name;
private ObjectName ourName;
private String observedObjectName;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java Mon May 26 12:26:13 2008
@@ -32,7 +32,6 @@
* @version $Revision$
*/
public class TimerEndpoint extends DefaultEndpoint<Exchange> {
-
private String timerName;
private Date time;
private long period = 1000;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java Mon May 26 12:26:13 2008
@@ -38,7 +38,6 @@
protected static final Map<String, BlockingQueue> QUEUES = new HashMap<String, BlockingQueue>();
private static final AtomicInteger START_COUNTER = new AtomicInteger();
-
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
BlockingQueue<Exchange> blockingQueue = getBlockingQueue(uri, parameters);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java Mon May 26 12:26:13 2008
@@ -27,10 +27,11 @@
* Some useful converters for Camel APIs such as to convert a {@link Predicate} or {@link Expression}
* to a {@link Processor}
*
- * @version $Revision: 1.1 $
+ * @version $Revision:$
*/
@Converter
public class CamelConverter {
+
@Converter
public Processor toProcessor(final Predicate<Exchange> predicate) {
return new Processor() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java Mon May 26 12:26:13 2008
@@ -37,6 +37,7 @@
*/
@Converter
public final class CollectionConverter {
+
/**
* Utility classes should not have a public constructor.
*/
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java Mon May 26 12:26:13 2008
@@ -26,8 +26,6 @@
import org.apache.camel.Converter;
-
-
/**
* Some core java.lang based <a
* href="http://activemq.apache.org/camel/type-converter.html">Type Converters</a>
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java Mon May 26 12:26:13 2008
@@ -31,9 +31,11 @@
*/
@Converter
public final class DomConverter {
+
private DomConverter() {
// Utility Class
}
+
@Converter
public static String toString(NodeList nodeList) {
StringBuffer buffer = new StringBuffer();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StringSource.java Mon May 26 12:26:13 2008
@@ -32,7 +32,6 @@
* @version $Revision$
*/
public class StringSource extends StreamSource implements Serializable {
-
private final String text;
private String encoding = "UTF-8";
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Mon May 26 12:26:13 2008
@@ -69,19 +69,16 @@
public static String defaultCharset = ObjectHelper.getSystemProperty(DEFAULT_CHARSET_PROPERTY, "UTF-8");
/*
- * When converting a DOM tree to a SAXSource,
- * we try to use Xalan internal DOM parser if
- * available. Else, transform the DOM tree
- * to a String and build a SAXSource on top of
- * it.
+ * When converting a DOM tree to a SAXSource, we try to use Xalan internal DOM parser if
+ * available. Else, transform the DOM tree to a String and build a SAXSource on top of it.
*/
private static final Class DOM_TO_SAX_CLASS;
private DocumentBuilderFactory documentBuilderFactory;
private TransformerFactory transformerFactory;
-
static {
+ // TODO: Use ObjectHelper.loadClass instead
Class cl = null;
try {
cl = Class.forName("org.apache.xalan.xsltc.trax.DOM2SAX");
@@ -99,7 +96,6 @@
this.documentBuilderFactory = documentBuilderFactory;
}
-
/**
* Converts the given input Source into the required result
*/
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java Mon May 26 12:26:13 2008
@@ -101,9 +101,6 @@
this.camelContext = camelContext;
}
- /**
- * @return the executor
- */
public synchronized ScheduledExecutorService getExecutorService() {
if (executorService == null) {
Component c = getComponent();
@@ -118,9 +115,6 @@
return executorService;
}
- /**
- * @param executorService the executor to set
- */
public synchronized void setExecutorService(ScheduledExecutorService executorService) {
this.executorService = executorService;
}
@@ -195,7 +189,6 @@
/**
* A factory method to lazily create the endpointUri if none is specified
- * @return
*/
protected String createEndpointUri() {
return null;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Mon May 26 12:26:13 2008
@@ -58,7 +58,6 @@
this.unitOfWork = parent.getUnitOfWork();
}
-
@Override
public String toString() {
return "Exchange[" + in + "]";
@@ -243,13 +242,6 @@
this.exchangeId = id;
}
- /**
- * Returns true if this exchange failed due to either an exception or fault
- *
- * @see Exchange#getException()
- * @see Exchange#getFault()
- * @return true if this exchange failed due to either an exception or fault
- */
public boolean isFailed() {
Message faultMessage = getFault(false);
if (faultMessage != null) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java Mon May 26 12:26:13 2008
@@ -171,20 +171,10 @@
}
}
- /**
- * This method retrieves the InterceptStrategy instances this route context.
- *
- * @return InterceptStrategy
- */
public List<InterceptStrategy> getInterceptStrategies() {
return interceptStrategies;
}
- /**
- * This method sets the InterceptStrategy instances on this route context.
- *
- * @param interceptStrategies
- */
public void setInterceptStrategies(List<InterceptStrategy> interceptStrategies) {
this.interceptStrategies = interceptStrategies;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Mon May 26 12:26:13 2008
@@ -52,7 +52,6 @@
}
public void reset() {
-
}
public void done(Exchange exchange) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java Mon May 26 12:26:13 2008
@@ -114,9 +114,6 @@
return null;
}
- /**
- * @return the messageId
- */
public String getMessageId() {
if (messageId == null) {
messageId = createMessageId();
@@ -124,9 +121,6 @@
return this.messageId;
}
- /**
- * @param messageId the messageId to set
- */
public void setMessageId(String messageId) {
this.messageId = messageId;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java Mon May 26 12:26:13 2008
@@ -38,7 +38,7 @@
* @version $Revision$
*/
public class ProducerCache<E extends Exchange> extends ServiceSupport {
- private static final Log LOG = LogFactory.getLog(ProducerCache.class);
+ private static final transient Log LOG = LogFactory.getLog(ProducerCache.class);
private Map<String, Producer<E>> producers = new HashMap<String, Producer<E>>();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java Mon May 26 12:26:13 2008
@@ -33,6 +33,7 @@
* @version $Revision$
*/
public class SerializationDataFormat implements DataFormat {
+
public void marshal(Exchange exchange, Object graph, OutputStream stream) throws IOException {
ObjectOutput out = IOConverter.toObjectOutput(stream);
out.writeObject(graph);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java Mon May 26 12:26:13 2008
@@ -97,11 +97,7 @@
tokenize(packages, line);
}
} finally {
- try {
- reader.close();
- } catch (IOException e) {
- LOG.warn("Caught exception closing stream: " + e, e);
- }
+ ObjectHelper.close(reader, null, LOG);
}
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java Mon May 26 12:26:13 2008
@@ -32,6 +32,7 @@
* @version $Revision$
*/
public class ArrayTypeConverter implements TypeConverter {
+
public <T> T convertTo(Class<T> type, Object value) {
if (type.isArray()) {
if (value instanceof Collection) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java Mon May 26 12:26:13 2008
@@ -30,6 +30,7 @@
* @version $Revision$
*/
public class EnumTypeConverter implements TypeConverter {
+
public <T> T convertTo(Class<T> type, Object value) {
if (type.isEnum() && value != null) {
String text = value.toString();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java Mon May 26 12:26:13 2008
@@ -44,7 +44,6 @@
public static final String TYPE_ROUTE = "route";
public static final String TYPE_SERVICE = "service";
-
protected String domainName;
protected String hostName = "locahost";
@@ -106,11 +105,6 @@
* Implements the naming strategy for a {@link org.apache.camel.impl.ServiceSupport Service}.
* The convention used for a {@link org.apache.camel.Service Service} ObjectName is
* <tt><domain>:context=<context-name>,type=service,name=<service-name></tt>
- *
- * @param context the camel context
- * @param mbean
- * @return generated ObjectName
- * @throws MalformedObjectNameException
*/
public ObjectName getObjectName(CamelContext context, ManagedService mbean) throws MalformedObjectNameException {
StringBuffer buffer = new StringBuffer();
@@ -126,10 +120,6 @@
* Implements the naming strategy for a {@link ManagedRoute}.
* The convention used for a {@link ManagedRoute} ObjectName is:
* <tt><domain>:context=<context-name>,route=<route-name>,type=route,name=<route-name></tt>
- *
- * @param mbean
- * @return generated ObjectName
- * @throws MalformedObjectNameException
*/
public ObjectName getObjectName(ManagedRoute mbean) throws MalformedObjectNameException {
Route<? extends Exchange> route = mbean.getRoute();
@@ -153,11 +143,6 @@
* Implements the naming strategy for a {@link ProcessorType}.
* The convention used for a {@link ProcessorType} ObjectName is:
* <tt><domain>:context=<context-name>,route=<route-name>,type=processor,name=<processor-name></tt>
- *
- * @param routeContext
- * @param processor
- * @return
- * @throws MalformedObjectNameException
*/
public ObjectName getObjectName(RouteContext routeContext,
ProcessorType processor) throws MalformedObjectNameException {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java Mon May 26 12:26:13 2008
@@ -64,7 +64,6 @@
public static final String DEFAULT_CONNECTOR_PATH = "/jmxrmi";
private static final transient Log LOG = LogFactory.getLog(DefaultInstrumentationAgent.class);
-
private MBeanServer server;
private CamelContext context;
private Set<ObjectName> mbeans = new HashSet<ObjectName>();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java Mon May 26 12:26:13 2008
@@ -19,15 +19,19 @@
import org.apache.camel.Exchange;
import org.apache.camel.processor.DelegateProcessor;
+/**
+ * JMX enabled processor that uses the {@link Counter} for instrumenting
+ * processing of exchanges.
+ */
public class InstrumentationProcessor extends DelegateProcessor {
private PerformanceCounter counter;
- InstrumentationProcessor(PerformanceCounter counter) {
+ public InstrumentationProcessor(PerformanceCounter counter) {
this.counter = counter;
}
- InstrumentationProcessor() {
+ public InstrumentationProcessor() {
}
public void setCounter(PerformanceCounter counter) {
@@ -38,7 +42,7 @@
long startTime = System.nanoTime();
super.process(exchange);
if (counter != null) {
- if (exchange.getException() == null) {
+ if (!exchange.isFailed()) {
counter.completedExchange((System.nanoTime() - startTime) / 1000);
} else {
counter.completedExchange();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowFaultProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowFaultProcessor.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowFaultProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowFaultProcessor.java Mon May 26 12:26:13 2008
@@ -31,7 +31,8 @@
this.fault = fault;
}
- /** Set the fault message in the exchange
+ /**
+ * Set the fault message in the exchange
* @see org.apache.camel.Processor#process(org.apache.camel.Exchange)
*/
public void process(Exchange exchange) throws Exception {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java Mon May 26 12:26:13 2008
@@ -36,9 +36,7 @@
private static final transient Log LOG = LogFactory.getLog(TryProcessor.class);
private final Processor tryProcessor;
-
private final List<CatchProcessor> catchClauses;
-
private final Processor finallyProcessor;
public TryProcessor(Processor tryProcessor, List<CatchProcessor> catchClauses, Processor finallyProcessor) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java Mon May 26 12:26:13 2008
@@ -65,14 +65,11 @@
*/
public class ResequencerEngine<E> implements TimeoutHandler {
- private static final Log LOG = LogFactory.getLog(ResequencerEngine.class);
-
- private long timeout;
-
- private int capacity;
-
- private Queue<E> outQueue;
+ private static final transient Log LOG = LogFactory.getLog(ResequencerEngine.class);
+ private long timeout;
+ private int capacity;
+ private Queue<E> outQueue;
private Element<E> lastDelivered;
/**
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java Mon May 26 12:26:13 2008
@@ -36,7 +36,7 @@
*/
public class SequenceSender extends Thread {
- private static final Log LOG = LogFactory.getLog(SequenceSender.class);
+ private static final transient Log LOG = LogFactory.getLog(SequenceSender.class);
private static final Exchange STOP = createStopSignal();
private BlockingQueue<Exchange> queue;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java Mon May 26 12:26:13 2008
@@ -35,7 +35,7 @@
*/
public class DefaultTimeoutMap implements TimeoutMap, Runnable {
- private static final Log LOG = LogFactory.getLog(DefaultTimeoutMap.class);
+ private static final transient Log LOG = LogFactory.getLog(DefaultTimeoutMap.class);
private final Map map = new HashMap();
private SortedSet index = new TreeSet();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Mon May 26 12:26:13 2008
@@ -40,7 +40,7 @@
*/
public final class IntrospectionSupport {
- private static final Log LOG = LogFactory.getLog(IntrospectionSupport.class);
+ private static final transient Log LOG = LogFactory.getLog(IntrospectionSupport.class);
/**
* Utility classes should not have a public constructor.
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java?rev=660275&r1=660274&r2=660275&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UuidGenerator.java Mon May 26 12:26:13 2008
@@ -19,15 +19,16 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Generator for Globally unique Strings.
*/
-
public class UuidGenerator {
- private static final Logger LOG = Logger.getLogger(UuidGenerator.class.getName());
+ private static final transient Log LOG = LogFactory.getLog(UuidGenerator.class);
private static final String UNIQUE_STUB;
private static int instanceCount;
private static String hostName;
@@ -54,7 +55,7 @@
Thread.sleep(100);
ss.close();
} catch (Exception ioe) {
- LOG.log(Level.WARNING, "could not generate unique stub", ioe);
+ LOG.warn("Could not generate unique stub", ioe);
}
} else {
hostName = "localhost";
@@ -63,11 +64,6 @@
UNIQUE_STUB = stub;
}
- /**
- * Construct an IdGenerator
- *
- */
-
public UuidGenerator(String prefix) {
synchronized (UNIQUE_STUB) {
this.seed = prefix + UNIQUE_STUB + (instanceCount++) + "-";
@@ -84,17 +80,13 @@
*
* @return the local host name
*/
-
public static String getHostName() {
return hostName;
}
/**
* Generate a unqiue id
- *
- * @return a unique id
*/
-
public synchronized String generateId() {
return this.seed + (this.sequence++);
}