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 2011/06/29 16:09:40 UTC
svn commit: r1141109 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/ main/java/org/apache/camel/builder/
main/java/org/apache/camel/converter/ main/java/org/apache/camel/impl/
main/java/org/apache/camel/util/ main/java/org/apache/camel/vi...
Author: davsclaus
Date: Wed Jun 29 14:09:40 2011
New Revision: 1141109
URL: http://svn.apache.org/viewvc?rev=1141109&view=rev
Log:
Removed TODO from camel-core not needed anymore. Moved an exception class from impl to top level package.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java (contents, props changed)
- copied, changed from r1141098, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.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/XmlGraphGenerator.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProxyInstantiationExceptionTest.java
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java (from r1141098, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java&r1=1141098&r2=1141109&rev=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProxyInstantiationException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java Wed Jun 29 14:09:40 2011
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.RuntimeCamelException;
+package org.apache.camel;
/**
* A proxy creation failed trying to create a proxy of a given type and on an given endpoint
@@ -25,9 +22,7 @@ import org.apache.camel.RuntimeCamelExce
* @version
*/
public class ProxyInstantiationException extends RuntimeCamelException {
- private static final long serialVersionUID = -2050115486047385507L;
-
- // TODO: Move to org.apache.camel package
+ private static final long serialVersionUID = -2050115486047385506L;
private final Class<?> type;
private final Endpoint endpoint;
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/ProxyInstantiationException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java?rev=1141109&r1=1141108&r2=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java Wed Jun 29 14:09:40 2011
@@ -656,8 +656,6 @@ public class ExpressionClauseSupport<T>
return result;
}
- // TODO: Add support for TokenizerExpression
-
// Properties
// -------------------------------------------------------------------------
public String getLanguage() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=1141109&r1=1141108&r2=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Wed Jun 29 14:09:40 2011
@@ -134,9 +134,7 @@ public final class IOConverter {
}
@Converter
- @Deprecated
public static Writer toWriter(OutputStream out, Exchange exchange) throws IOException {
- // TODO: Why is this method deprecated?
return new OutputStreamWriter(out, getCharsetName(exchange));
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=1141109&r1=1141108&r2=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java Wed Jun 29 14:09:40 2011
@@ -30,6 +30,7 @@ import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.ProxyInstantiationException;
import org.apache.camel.Service;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.bean.ProxyHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java?rev=1141109&r1=1141108&r2=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java Wed Jun 29 14:09:40 2011
@@ -46,8 +46,6 @@ public final class OgnlHelper {
return false;
}
- // TODO: if possible used regexp to parse if its valid/invalid
-
// the brackets should come in pair
int bracketBegin = StringHelper.countChar(expression, '[');
int bracketEnd = StringHelper.countChar(expression, ']');
@@ -67,8 +65,6 @@ public final class OgnlHelper {
return false;
}
- // TODO: if possible used regexp to parse if its valid/invalid
-
// the brackets should come in pair
int bracketBegin = StringHelper.countChar(expression, '[');
int bracketEnd = StringHelper.countChar(expression, ']');
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=1141109&r1=1141108&r2=1141109&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 Wed Jun 29 14:09:40 2011
@@ -117,9 +117,6 @@ public class NodeData {
this.nodeType = "Resequencer";
} else if (node instanceof BeanDefinition) {
BeanDefinition beanRef = (BeanDefinition) node;
-
- // TODO
- //this.image = imagePrefix + "Bean.png";
this.nodeType = "Bean Ref";
this.label = beanRef.getLabel() + " Bean";
this.shape = "box";
@@ -127,7 +124,6 @@ public class NodeData {
// lets auto-default as many values as we can
if (isEmpty(this.nodeType) && node != null) {
- // TODO we could add this to the model?
String name = node.getClass().getName();
int idx = name.lastIndexOf('.');
if (idx > 0) {
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=1141109&r1=1141108&r2=1141109&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 Wed Jun 29 14:09:40 2011
@@ -91,8 +91,6 @@ public class XmlGraphGenerator extends G
protected void printRoute(PrintWriter writer, final RouteDefinition route, NodeData nodeData) {
printNode(writer, nodeData);
- // TODO we should add a transactional client / event driven consumer / polling client
-
NodeData from = nodeData;
for (ProcessorDefinition<?> output : route.getOutputs()) {
NodeData newData = printNode(writer, from, output);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java?rev=1141109&r1=1141108&r2=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConfigureTest.java Wed Jun 29 14:09:40 2011
@@ -92,7 +92,6 @@ public class FileConfigureTest extends C
FileEndpoint endpoint = resolveMandatoryEndpoint(endpointUri, FileEndpoint.class);
assertNotNull("Could not find endpoint: " + endpointUri, endpoint);
- // TODO: absolute also
if (!absolute) {
File file = endpoint.getFile();
String path = file.getPath();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProxyInstantiationExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProxyInstantiationExceptionTest.java?rev=1141109&r1=1141108&r2=1141109&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProxyInstantiationExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProxyInstantiationExceptionTest.java Wed Jun 29 14:09:40 2011
@@ -19,6 +19,7 @@ package org.apache.camel.impl;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
+import org.apache.camel.ProxyInstantiationException;
/**
* @version