camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r887112 - in /camel/trunk/components/camel-web/src/main/java/org/apache/camel/web: model/ resources/ util/
Date Fri, 04 Dec 2009 08:49:59 GMT
Author: davsclaus
Date: Fri Dec  4 08:49:30 2009
New Revision: 887112

URL: http://svn.apache.org/viewvc?rev=887112&view=rev
Log:
Fixed compiler issue on HP-UX.

Modified:
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java Fri
Dec  4 08:49:30 2009
@@ -46,7 +46,6 @@
         setVersion(version);
     }
 
-
     @Override
     public String toString() {
         return "CamelContext: " + getName();

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java
Fri Dec  4 08:49:30 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.web.resources;
 
-
 /**
  * @version $Revision$
  */
@@ -28,7 +27,6 @@
         this.id = id;
     }
 
-
     public String getId() {
         return id;
     }

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java
Fri Dec  4 08:49:30 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.web.resources;
 
-
 /**
  * @version $Revision$
  */
@@ -28,7 +27,6 @@
         this.id = id;
     }
 
-
     public String getId() {
         return id;
     }

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java
Fri Dec  4 08:49:30 2009
@@ -30,6 +30,7 @@
  * @version $Revision$
  */
 public class LanguagesResource extends CamelChildResourceSupport {
+
     public LanguagesResource(CamelContextResource contextResource) {
         super(contextResource);
     }

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
Fri Dec  4 08:49:30 2009
@@ -56,7 +56,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.jruby.Main;
 
-
 /**
  * A single Camel Route which is used to implement one or more
  * <a href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise
Integration Paterns</a>

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java
Fri Dec  4 08:49:30 2009
@@ -25,7 +25,7 @@
         // Utility class, no public or protected default constructor
     }    
 
-    public static void render(StringBuilder buffer, ProcessorDefinition<?> processor)
{
+    public static void render(StringBuilder buffer, ProcessorDefinition processor) {
         
         AggregateDefinition aggregate = (AggregateDefinition)processor;
         buffer.append(".").append(aggregate.getShortName()).append("()");

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
Fri Dec  4 08:49:30 2009
@@ -27,7 +27,7 @@
         // Utility class, no public or protected default constructor
     }
     
-    public static void render(StringBuilder buffer, ProcessorDefinition<?> processor)
{
+    public static void render(StringBuilder buffer, ProcessorDefinition processor) {
         CatchDefinition catchDef = (CatchDefinition)processor;
         buffer.append(".").append(catchDef.getShortName()).append("(");
         List<Class> exceptions = catchDef.getExceptionClasses();

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
Fri Dec  4 08:49:30 2009
@@ -51,7 +51,7 @@
         // render the global dsl not started with from, like global
         // intercept, interceptFrom,interceptSendToEndpoint, onCompletion,
         // onException
-        for (ProcessorDefinition<?> processor : outputs) {
+        for (ProcessorDefinition processor : outputs) {
             if (processor.getParent() == null && !(processor instanceof SendDefinition))
{
                 ProcessorDefinitionRenderer.render(buffer, processor);
                 buffer.append(";");
@@ -81,7 +81,7 @@
         }
 
         // render the outputs of the router
-        for (ProcessorDefinition<?> processor : outputs) {
+        for (ProcessorDefinition processor : outputs) {
             if (processor.getParent() == route || processor instanceof SendDefinition) {
                 ProcessorDefinitionRenderer.render(buffer, processor);
             }

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
Fri Dec  4 08:49:30 2009
@@ -44,7 +44,7 @@
         this.context = new JSONJAXBContext(builder.build(), packages);
     }
 
-    public JAXBContext getContext(Class<?> objectType) {
+    public JAXBContext getContext(Class objectType) {
         Package aPackage = objectType.getPackage();
         if (aPackage != null) {
             String name = aPackage.getName();

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
Fri Dec  4 08:49:30 2009
@@ -33,7 +33,7 @@
         // Utility class, no public or protected default constructor
     }    
 
-    public static void render(StringBuilder buffer, ProcessorDefinition<?> processor)
{
+    public static void render(StringBuilder buffer, ProcessorDefinition processor) {
         LoadBalanceDefinition loadB = (LoadBalanceDefinition)processor;
         // buffer.append(".").append(output.getShortName()).append("()");
         buffer.append(".").append("loadBalance").append("()");

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java
Fri Dec  4 08:49:30 2009
@@ -28,7 +28,7 @@
         // Utility class, no public or protected default constructor
     }    
 
-    public static void render(StringBuilder buffer, ProcessorDefinition<?> processor)
{
+    public static void render(StringBuilder buffer, ProcessorDefinition processor) {
         // if not a global onCompletion, add a period
         boolean notGlobal = buffer.toString().endsWith(")");
         if (notGlobal) {

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java
Fri Dec  4 08:49:30 2009
@@ -28,7 +28,7 @@
         // Utility class, no public or protected default constructor
     }
 
-    public static void render(StringBuilder buffer, ProcessorDefinition<?> processor)
{
+    public static void render(StringBuilder buffer, ProcessorDefinition processor) {
         // if not a global onCompletion, add a period
         boolean notGlobal = buffer.toString().endsWith(")");
         if (notGlobal) {

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java?rev=887112&r1=887111&r2=887112&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java
Fri Dec  4 08:49:30 2009
@@ -54,8 +54,8 @@
         // Utility class, no public or protected default constructor
     }
 
-    public static void render(StringBuilder buffer, ProcessorDefinition<?> processor)
{
-        OutputDefinition<?> out = (OutputDefinition<?>)processor;
+    public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+        OutputDefinition out = (OutputDefinition)processor;
         boolean notGlobal = buffer.toString().endsWith(")");
         if (notGlobal) {
             buffer.append(".");
@@ -134,7 +134,7 @@
         }
     }
 
-    private static void renderAop(StringBuilder buffer, OutputDefinition<?> out) {
+    private static void renderAop(StringBuilder buffer, OutputDefinition out) {
         buffer.append("()");
         AOPDefinition aop = (AOPDefinition)out;
         if (aop.getBeforeUri() != null) {
@@ -154,7 +154,7 @@
         }
     }
 
-    private static void renderBean(StringBuilder buffer, ProcessorDefinition<?> processor)
{
+    private static void renderBean(StringBuilder buffer, ProcessorDefinition processor) {
         BeanDefinition beanDef = (BeanDefinition)processor;
         if (beanDef.getRef() != null) {
             buffer.append("Ref(\"").append(beanDef.getRef()).append("\"");
@@ -165,7 +165,7 @@
         }
     }
 
-    private static void renderFinally(StringBuilder buffer, OutputDefinition<?> out)
{
+    private static void renderFinally(StringBuilder buffer, OutputDefinition out) {
         buffer.append("()");
         FinallyDefinition finallyDef = (FinallyDefinition)out;
         List<ProcessorDefinition> branches = finallyDef.getOutputs();
@@ -175,7 +175,7 @@
         buffer.append(".end()");
     }
 
-    private static void renderPolicy(StringBuilder buffer, OutputDefinition<?> out)
{
+    private static void renderPolicy(StringBuilder buffer, OutputDefinition out) {
         PolicyDefinition policy = (PolicyDefinition)out;
         buffer.append("(");
         if (policy.getRef() != null) {
@@ -184,7 +184,7 @@
         buffer.append(")");
     }
 
-    private static void renderPollEnrich(StringBuilder buffer, OutputDefinition<?>
out) {
+    private static void renderPollEnrich(StringBuilder buffer, OutputDefinition out) {
         PollEnrichDefinition pollEnrich = (PollEnrichDefinition)out;
         buffer.append("(\"");
         buffer.append(pollEnrich.getResourceUri()).append("\", ").append(pollEnrich.getTimeout());
@@ -194,7 +194,7 @@
         buffer.append(")");
     }
 
-    private static void renderProcess(StringBuilder buffer, OutputDefinition<?> out)
{
+    private static void renderProcess(StringBuilder buffer, OutputDefinition out) {
         ProcessDefinition process = (ProcessDefinition)out;
         if (process.getRef() != null) {
             buffer.append("Ref(\"").append(process.getRef()).append("\")");
@@ -205,7 +205,7 @@
         }
     }
 
-    private static void renderThreads(StringBuilder buffer, OutputDefinition<?> out)
{
+    private static void renderThreads(StringBuilder buffer, OutputDefinition out) {
         ThreadsDefinition threads = (ThreadsDefinition)out;
         buffer.append("(");
         if (threads.getPoolSize() != null) {
@@ -219,7 +219,7 @@
         }
     }
 
-    private static void renderTransacted(StringBuilder buffer, OutputDefinition<?>
out) {
+    private static void renderTransacted(StringBuilder buffer, OutputDefinition out) {
         TransactedDefinition transacted = (TransactedDefinition)out;
         buffer.append("(");
         if (transacted.getRef() != null) {



Mime
View raw message