Author: davsclaus
Date: Mon Nov 23 09:11:58 2009
New Revision: 883288
URL: http://svn.apache.org/viewvc?rev=883288&view=rev
Log:
Fixed compiling on HP-UX
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
Mon Nov 23 09:11:58 2009
@@ -84,8 +84,8 @@
public class DefaultManagementLifecycleStrategy implements LifecycleStrategy,
Service {
private static final Log LOG =
LogFactory.getLog(DefaultManagementLifecycleStrategy.class);
- private final Map<Processor, KeyValueHolder<ProcessorDefinition<?>,
InstrumentationProcessor>> wrappedProcessors =
- new HashMap<Processor, KeyValueHolder<ProcessorDefinition<?>,
InstrumentationProcessor>>();
+ private final Map<Processor, KeyValueHolder<ProcessorDefinition,
InstrumentationProcessor>> wrappedProcessors =
+ new HashMap<Processor, KeyValueHolder<ProcessorDefinition,
InstrumentationProcessor>>();
private final CamelContext context;
private boolean initialized;
@@ -309,7 +309,7 @@
// a bit of magic here as the processors we want to manage have
already been registered
// in the wrapped processors map when Camel have instrumented the
route on route initialization
// so the idea is now to only manage the processors from the map
- KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>
holder = wrappedProcessors.get(processor);
+ KeyValueHolder<ProcessorDefinition, InstrumentationProcessor> holder =
wrappedProcessors.get(processor);
if (holder == null) {
// skip as its not an well known processor we want to manage
anyway, such as Channel/UnitOfWork/Pipeline etc.
return null;
@@ -332,8 +332,8 @@
return managedObject;
}
- private Object createManagedObjectForProcessor(CamelContext context,
- Processor processor, ProcessorDefinition<?> definition, Route
route) {
+ private Object createManagedObjectForProcessor(CamelContext context,
Processor processor,
+ ProcessorDefinition
definition, Route route) {
// skip error handlers
if (processor instanceof ErrorHandler) {
return false;
@@ -434,8 +434,8 @@
// Create a map (ProcessorType -> PerformanceCounter)
// to be passed to InstrumentationInterceptStrategy.
- Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters =
- new HashMap<ProcessorDefinition<?>, PerformanceCounter>();
+ Map<ProcessorDefinition, PerformanceCounter> registeredCounters =
+ new HashMap<ProcessorDefinition, PerformanceCounter>();
// Each processor in a route will have its own performance counter.
// These performance counter will be embedded to
InstrumentationProcessor
@@ -443,7 +443,7 @@
RouteDefinition route = routeContext.getRoute();
// register performance counters for all processors and its children
- for (ProcessorDefinition<?> processor : route.getOutputs()) {
+ for (ProcessorDefinition processor : route.getOutputs()) {
registerPerformanceCounters(routeContext, processor,
registeredCounters);
}
@@ -453,8 +453,8 @@
}
@SuppressWarnings("unchecked")
- private void registerPerformanceCounters(RouteContext routeContext,
- ProcessorDefinition processor, Map<ProcessorDefinition<?>,
PerformanceCounter> registeredCounters) {
+ private void registerPerformanceCounters(RouteContext routeContext,
ProcessorDefinition processor,
+ Map<ProcessorDefinition,
PerformanceCounter> registeredCounters) {
// traverse children if any exists
List<ProcessorDefinition> children = processor.getOutputs();
@@ -484,7 +484,7 @@
/**
* Should the given processor be registered.
*/
- protected boolean registerProcessor(ProcessorDefinition<?> processor) {
+ protected boolean registerProcessor(ProcessorDefinition processor) {
// skip on exception
if (processor instanceof OnExceptionDefinition) {
return false;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
Mon Nov 23 09:11:58 2009
@@ -37,17 +37,17 @@
*/
public class InstrumentationInterceptStrategy implements InterceptStrategy {
- private Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters;
- private final Map<Processor, KeyValueHolder<ProcessorDefinition<?>,
InstrumentationProcessor>> wrappedProcessors;
+ private Map<ProcessorDefinition, PerformanceCounter> registeredCounters;
+ private final Map<Processor, KeyValueHolder<ProcessorDefinition,
InstrumentationProcessor>> wrappedProcessors;
- public InstrumentationInterceptStrategy(Map<ProcessorDefinition<?>,
PerformanceCounter> registeredCounters,
- Map<Processor, KeyValueHolder<ProcessorDefinition<?>,
InstrumentationProcessor>> wrappedProcessors) {
+ public InstrumentationInterceptStrategy(Map<ProcessorDefinition,
PerformanceCounter> registeredCounters,
+ Map<Processor, KeyValueHolder<ProcessorDefinition,
InstrumentationProcessor>> wrappedProcessors) {
this.registeredCounters = registeredCounters;
this.wrappedProcessors = wrappedProcessors;
}
- public Processor wrapProcessorInInterceptors(CamelContext context,
- ProcessorDefinition<?> definition, Processor target, Processor
nextTarget) throws Exception {
+ public Processor wrapProcessorInInterceptors(CamelContext context,
ProcessorDefinition definition,
+ Processor target, Processor
nextTarget) throws Exception {
// do not double wrap it
if (target instanceof InstrumentationProcessor) {
return target;
@@ -62,8 +62,8 @@
// add it to the mapping of wrappers so we can later change it to
a decorated counter
// that when we register the processor
- KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>
holder =
- new KeyValueHolder<ProcessorDefinition<?>,
InstrumentationProcessor>(definition, wrapper);
+ KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>
holder =
+ new KeyValueHolder<ProcessorDefinition,
InstrumentationProcessor>(definition, wrapper);
wrappedProcessors.put(target, holder);
return wrapper;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
Mon Nov 23 09:11:58 2009
@@ -87,14 +87,14 @@
return;
}
- for (ProcessorDefinition<?> out : outputs) {
+ for (ProcessorDefinition out : outputs) {
if (type.isInstance(out)) {
found.add((T)out);
}
// send is much common
if (out instanceof SendDefinition) {
- SendDefinition<?> send = (SendDefinition<?>) out;
+ SendDefinition send = (SendDefinition) out;
List<ProcessorDefinition> children = send.getOutputs();
doFindType(children, type, found);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
Mon Nov 23 09:11:58 2009
@@ -250,7 +250,7 @@
catchClauses = new ArrayList<CatchDefinition>();
finallyClause = null;
- for (ProcessorDefinition<?> output : outputs) {
+ for (ProcessorDefinition output : outputs) {
if (output instanceof CatchDefinition) {
catchClauses.add((CatchDefinition)output);
} else if (output instanceof FinallyDefinition) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
Mon Nov 23 09:11:58 2009
@@ -61,13 +61,13 @@
private static final String JPA_TRACE_EVENT_MESSAGE =
"org.apache.camel.processor.interceptor.jpa.JpaTraceEventMessage";
private Logger logger;
private Producer traceEventProducer;
- private final ProcessorDefinition<?> node;
+ private final ProcessorDefinition node;
private final Tracer tracer;
private TraceFormatter formatter;
private Class<?> jpaTraceEventMessageClass;
private RouteContext routeContext;
- public TraceInterceptor(ProcessorDefinition<?> node, Processor target,
TraceFormatter formatter, Tracer tracer) {
+ public TraceInterceptor(ProcessorDefinition node, Processor target,
TraceFormatter formatter, Tracer tracer) {
super(target);
this.tracer = tracer;
this.node = node;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
Mon Nov 23 09:11:58 2009
@@ -112,7 +112,7 @@
protected abstract void generateFile(PrintWriter writer, Map<String,
List<RouteDefinition>> map);
- protected boolean isMulticastNode(ProcessorDefinition<?> node) {
+ protected boolean isMulticastNode(ProcessorDefinition node) {
return node instanceof MulticastDefinition || node instanceof
ChoiceDefinition;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
Mon Nov 23 09:11:58 2009
@@ -51,7 +51,7 @@
public String nodeType;
public boolean nodeWritten;
public String url;
- public List<ProcessorDefinition<?>> outputs;
+ public List<ProcessorDefinition> outputs;
public String association = "property";
@SuppressWarnings("unchecked")
@@ -94,7 +94,7 @@
this.edgeLabel = "";
ChoiceDefinition choice = (ChoiceDefinition)node;
- List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>(choice.getWhenClauses());
+ List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>(choice.getWhenClauses());
if (choice.getOtherwise() != null) {
outputs.add(choice.getOtherwise());
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
Mon Nov 23 09:11:58 2009
@@ -119,8 +119,7 @@
}
// now lets write any children
- //List<ProcessorType> outputs = node.getOutputs();
- List<ProcessorDefinition<?>> outputs = toData.outputs;
+ List<ProcessorDefinition> outputs = toData.outputs;
if (outputs != null) {
for (ProcessorDefinition output : outputs) {
NodeData newData = printNode(writer, toData, output);
@@ -177,7 +176,7 @@
/**
* Is the given node a pipeline
*/
- private static boolean isPipeline(ProcessorDefinition<?> node) {
+ private static boolean isPipeline(ProcessorDefinition node) {
if (node instanceof MulticastDefinition) {
return false;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java?rev=883288&r1=883287&r2=883288&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
Mon Nov 23 09:11:58 2009
@@ -127,7 +127,7 @@
}
// now lets write any children
- List<ProcessorDefinition<?>> outputs = toData.outputs;
+ List<ProcessorDefinition> outputs = toData.outputs;
if (outputs != null) {
for (ProcessorDefinition output : outputs) {
NodeData newData = printNode(writer, toData, output);
