You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/01/04 19:55:38 UTC
svn commit: r1227265 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/a...
Author: dkulp
Date: Wed Jan 4 18:55:36 2012
New Revision: 1227265
URL: http://svn.apache.org/viewvc?rev=1227265&view=rev
Log:
Merged revisions 1224915 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
........
r1224915 | davsclaus | 2011-12-27 09:34:32 -0500 (Tue, 27 Dec 2011) | 1 line
CAMEL-4826: Polished code comment and java doc. Thanks to Glen Mazza for the patch.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/view/NodeData.java
camel/branches/camel-2.8.x/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
camel/branches/camel-2.8.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
camel/branches/camel-2.8.x/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/branches/camel-2.8.x/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
camel/branches/camel-2.8.x/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Wed Jan 4 18:55:36 2012
@@ -218,7 +218,7 @@ public final class ExpressionBuilder {
Message out = exchange.getOut();
Object header = out.getHeader(headerName);
if (header == null) {
- // lets try the exchange header
+ // let's try the exchange header
header = exchange.getProperty(headerName);
}
return header;
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java Wed Jan 4 18:55:36 2012
@@ -75,7 +75,7 @@ public class Namespaces {
}
public Namespaces add(Element element) {
- // lets set the parent first in case we overload a prefix here
+ // let's set the parent first in case we overload a prefix here
Node parentNode = element.getParentNode();
if (parentNode instanceof org.w3c.dom.Element) {
add((Element) parentNode);
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Wed Jan 4 18:55:36 2012
@@ -93,7 +93,7 @@ public class XPathBuilder implements Exp
// For some reason the default expression of "a/b" on a document such as
// <a><b>1</b><b>2</b></a>
// will evaluate as just "1" by default which is bizarre. So by default
- // lets assume XPath expressions result in nodesets.
+ // let's assume XPath expressions result in nodesets.
private Class<?> resultType;
private QName resultQName = XPathConstants.NODESET;
private String objectModelUri;
@@ -697,7 +697,7 @@ public class XPathBuilder implements Exp
}
/**
- * Lets populate a number of standard prefixes if they are not already there
+ * Populate a number of standard prefixes if they are not already there
*/
protected void populateDefaultNamespaces(DefaultNamespaceContext context) {
setNamespaceIfNotPresent(context, "in", IN_NAMESPACE);
@@ -802,7 +802,7 @@ public class XPathBuilder implements Exp
answer = body;
}
- // lets try coerce some common types into something JAXP can deal with
+ // let's try coercing some common types into something JAXP can work with
if (answer instanceof GenericFile) {
// special for files so we can work with them out of the box
InputStream is = exchange.getContext().getTypeConverter().convertTo(InputStream.class, answer);
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/xml/XsltBuilder.java Wed Jan 4 18:55:36 2012
@@ -103,7 +103,7 @@ public class XsltBuilder implements Proc
ResultHandler resultHandler = resultHandlerFactory.createResult(exchange);
Result result = resultHandler.getResult();
- // lets copy the headers before we invoke the transform in case they modify them
+ // let's copy the headers before we invoke the transform in case they modify them
Message out = exchange.getOut();
out.copyFrom(exchange.getIn());
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java Wed Jan 4 18:55:36 2012
@@ -178,7 +178,7 @@ public class BeanInfo {
} else if (methods != null) {
// there are more methods with that name so we cannot decide which to use
- // but first lets try to choose a method and see if that comply with the name
+ // but first let's try to choose a method and see if that complies with the name
// must use the method name which may have qualifiers
methodInfo = chooseMethod(pojo, exchange, methodName);
@@ -353,7 +353,7 @@ public class BeanInfo {
// use exchange
expression = ExpressionBuilder.exchangeExpression();
} else {
- // lets assume its the body and it must be mandatory convertable to the parameter type
+ // assume it's the body and it must be mandatory convertible to the parameter type
// but we allow null bodies in case the message really contains a null body
expression = ExpressionBuilder.mandatoryBodyExpression(parameterType, true);
}
@@ -367,7 +367,7 @@ public class BeanInfo {
LOG.trace("Parameter #{} has parameter info: ", i, parameterInfo);
}
- // now lets add the method to the repository
+ // now let's add the method to the repository
return new MethodInfo(camelContext, clazz, method, parameters, bodyParameters, hasCustomAnnotation, hasHandlerAnnotation);
}
@@ -400,14 +400,14 @@ public class BeanInfo {
}
/**
- * Lets try choose one of the available methods to invoke if we can match
+ * Choose one of the available methods to invoke if we can match
* the message body to the body parameter
*
* @param pojo the bean to invoke a method on
* @param exchange the message exchange
* @param name an optional name of the method that must match, use <tt>null</tt> to indicate all methods
* @return the method to invoke or null if no definitive method could be matched
- * @throws AmbiguousMethodCallException is thrown if cannot chose method due to ambiguous
+ * @throws AmbiguousMethodCallException is thrown if cannot choose method due to ambiguity
*/
protected MethodInfo chooseMethod(Object pojo, Exchange exchange, String name) throws AmbiguousMethodCallException {
// @Handler should be select first
@@ -470,7 +470,7 @@ public class BeanInfo {
private MethodInfo chooseMethodWithMatchingBody(Exchange exchange, Collection<MethodInfo> operationList,
List<MethodInfo> operationsWithCustomAnnotation)
throws AmbiguousMethodCallException {
- // lets see if we can find a method who's body param type matches the message body
+ // see if we can find a method whose body param type matches the message body
Message in = exchange.getIn();
Object body = in.getBody();
if (body != null) {
@@ -525,7 +525,7 @@ public class BeanInfo {
} else if (possibles.isEmpty()) {
LOG.trace("No possible methods so now trying to convert body to parameter types");
- // lets try converting
+ // let's try converting
Object newBody = null;
MethodInfo matched = null;
int matchCounter = 0;
@@ -555,7 +555,7 @@ public class BeanInfo {
return matched;
}
} else {
- // if we only have a single method with custom annotations, lets use that one
+ // if we only have a single method with custom annotations, let's use that one
if (possibleWithCustomAnnotation.size() == 1) {
MethodInfo answer = possibleWithCustomAnnotation.get(0);
LOG.trace("There are only one method with annotations so we choose it: {}", answer);
@@ -621,7 +621,7 @@ public class BeanInfo {
private MethodInfo chooseMethodWithCustomAnnotations(Exchange exchange, Collection<MethodInfo> possibles)
throws AmbiguousMethodCallException {
- // if we have only one method with custom annotations lets choose that
+ // if we have only one method with custom annotations let's choose that
MethodInfo chosen = null;
for (MethodInfo possible : possibles) {
if (possible.hasCustomAnnotation()) {
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Wed Jan 4 18:55:36 2012
@@ -176,7 +176,7 @@ public class BeanProcessor extends Servi
LOG.trace("Processing exchangeId: {} is continued being processed synchronously", exchange.getExchangeId());
} catch (InvocationTargetException e) {
- // lets unwrap the exception when its an invocation target exception
+ // let's unwrap the exception when it's an invocation target exception
exchange.setException(e.getCause());
callback.done(true);
return true;
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java Wed Jan 4 18:55:36 2012
@@ -46,7 +46,7 @@ public class DefaultAnnotationExpression
}
protected String getExpressionFromAnnotation(Annotation annotation) {
- // lets try the 'value()' method
+ // let's try the 'value()' method
try {
Method method = annotation.getClass().getMethod("value");
Object value = ObjectHelper.invokeMethod(method, annotation);
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Wed Jan 4 18:55:36 2012
@@ -410,7 +410,7 @@ public class MethodInfo {
if (answer == null) {
Class<?> type = method.getDeclaringClass();
- // lets create the search order of types to scan
+ // create the search order of types to scan
List<Class<?>> typesToSearch = new ArrayList<Class<?>>();
addTypeAndSuperTypes(type, typesToSearch);
Class<?>[] interfaces = type.getInterfaces();
@@ -418,7 +418,7 @@ public class MethodInfo {
addTypeAndSuperTypes(anInterface, typesToSearch);
}
- // now lets scan for a type which the current declared class overloads
+ // now let's scan for a type which the current declared class overloads
answer = findOneWayAnnotationOnMethod(typesToSearch, method);
if (answer == null) {
answer = findOneWayAnnotation(typesToSearch);
@@ -451,7 +451,7 @@ public class MethodInfo {
int nextDepth = depth - 1;
if (nextDepth > 0) {
- // lets look at all the annotations to see if any of those are annotated
+ // look at all the annotations to see if any of those are annotated
Annotation[] annotations = annotatedElement.getAnnotations();
for (Annotation annotation : annotations) {
Class<? extends Annotation> annotationType = annotation.annotationType();
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java Wed Jan 4 18:55:36 2012
@@ -94,7 +94,7 @@ public class BrowseEndpoint extends Defa
protected void onExchange(Exchange exchange) throws Exception {
getExchanges().add(exchange);
- // lets fire any consumers
+ // now fire any consumers
loadBalancer.process(exchange);
}
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java Wed Jan 4 18:55:36 2012
@@ -188,7 +188,7 @@ public class DataSetEndpoint extends Moc
long index = receivedCount - 1;
Exchange expected = createExchange(index);
- // now lets assert that they are the same
+ // now let's assert that they are the same
if (log.isDebugEnabled()) {
log.debug("Received message: {} (DataSet index={}) = {}",
new Object[]{index, copy.getIn().getHeader(Exchange.DATASET_INDEX, Integer.class), copy});
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java Wed Jan 4 18:55:36 2012
@@ -57,7 +57,7 @@ public abstract class DataSetSupport imp
Object expectedBody = expected.getIn().getBody();
Object actualBody = actual.getIn().getBody();
if (expectedBody != null) {
- // lets coerce to the correct type
+ // let's coerce to the correct type
actualBody = ExchangeHelper.getMandatoryInBody(actual, expectedBody.getClass());
}
DataSetEndpoint.assertEquals("message body", expectedBody, actualBody, actual);
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Wed Jan 4 18:55:36 2012
@@ -197,7 +197,7 @@ public class GenericFileProducer<T> exte
writeFile(empty, doneFileName);
}
- // lets store the name we really used in the header, so end-users
+ // let's store the name we really used in the header, so end-users
// can retrieve it
exchange.getIn().setHeader(Exchange.FILE_NAME_PRODUCED, target);
} catch (Exception e) {
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Wed Jan 4 18:55:36 2012
@@ -1143,7 +1143,7 @@ public class MockEndpoint extends Defaul
// Wait for a default 10 seconds if resultWaitTime is not set
long waitTime = timeout == 0 ? 10000L : timeout;
- // now lets wait for the results
+ // now let's wait for the results
LOG.debug("Waiting on the latch for: " + timeout + " millis");
latch.await(waitTime, TimeUnit.MILLISECONDS);
}
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java Wed Jan 4 18:55:36 2012
@@ -30,7 +30,7 @@ import org.apache.camel.util.CamelContex
public class RefComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- // lets remove the scheme from the URI
+ // first remove the scheme from the URI
int index = uri.indexOf(':');
String name = uri;
if (index >= 0) {
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Wed Jan 4 18:55:36 2012
@@ -1970,7 +1970,7 @@ public class DefaultCamelContext extends
}
/**
- * Lets force some lazy initialization to occur upfront before we start any
+ * Force some lazy initialization to occur upfront before we start any
* components and create routes
*/
protected void forceLazyInitialization() {
@@ -1981,7 +1981,7 @@ public class DefaultCamelContext extends
}
/**
- * Lets force clear lazy initialization so they can be re-created on restart
+ * Force clear lazy initialization so they can be re-created on restart
*/
protected void forceStopLazyInitialization() {
injector = null;
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java Wed Jan 4 18:55:36 2012
@@ -185,7 +185,7 @@ public abstract class MessageSupport imp
}
/**
- * Lets allow implementations to auto-create a messageId
+ * Allow implementations to auto-create a messageId
*/
protected String createMessageId() {
String uuid = null;
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java Wed Jan 4 18:55:36 2012
@@ -106,7 +106,7 @@ public interface RouteContext extends Ru
<T> Map<String, T> lookupByType(Class<T> type);
/**
- * Lets complete the route creation, creating a single event driven route
+ * For completing the route creation, creating a single event driven route
* for the current from endpoint with any processors required
*/
void commit();
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/view/NodeData.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/view/NodeData.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/view/NodeData.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/view/NodeData.java Wed Jan 4 18:55:36 2012
@@ -171,7 +171,7 @@ public class NodeData {
}
/**
- * Lets insert a space before each upper case letter after a lowercase
+ * Inserts a space before each upper case letter after a lowercase
*/
public static String insertSpacesBetweenCamelCase(String name) {
boolean lastCharacterLowerCase = false;
Modified: camel/branches/camel-2.8.x/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java (original)
+++ camel/branches/camel-2.8.x/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java Wed Jan 4 18:55:36 2012
@@ -24,6 +24,8 @@ import org.apache.qpid.client.AMQConnect
import org.apache.qpid.url.URLSyntaxException;
/**
+ * This component supports the AMQP protocol using the Client API of the Apache Qpid project.
+ *
* @version
*/
public class AMQPComponent extends JmsComponent {
@@ -52,7 +54,7 @@ public class AMQPComponent extends JmsCo
}
/**
- * Lets install the default connection factory
+ * Let's install the default connection factory
*/
private void init() {
AMQConnectionFactory connectionFactory = new AMQConnectionFactory();
Modified: camel/branches/camel-2.8.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java Wed Jan 4 18:55:36 2012
@@ -39,7 +39,7 @@ public class AMQPRouteTest extends Camel
@BeforeClass
public static void startBroker() throws Exception {
- // lets create an in JVM broker
+ // create an in-JVM broker
try {
TransportConnection.createVMBroker(1);
} catch (Exception e) {
Modified: camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java Wed Jan 4 18:55:36 2012
@@ -160,7 +160,7 @@ public abstract class ProcessBuilder ext
ObjectHelper.notNull(getJpaTemplate(), "jpaTemplate", this);
ObjectHelper.notNull(getTransactionTemplate(), "transactionTemplate", this);
- // lets add the monitoring service - should there be an easier way??
+ // add the monitoring service - should there be an easier way??
if (engine == null) {
engine = new ActivityMonitorEngine(getJpaTemplate(), getTransactionTemplate(), getProcessRules());
}
@@ -170,7 +170,7 @@ public abstract class ProcessBuilder ext
defaultCamelContext.addService(engine);
}
- // lets create the routes for the activites
+ // create the routes for the activities
for (ActivityBuilder builder : activityBuilders) {
from(builder.getEndpoint()).process(builder.getProcessor());
}
Modified: camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java Wed Jan 4 18:55:36 2012
@@ -110,7 +110,7 @@ public class ActivityMonitorEngine exten
template.execute(new JpaCallback() {
public Object doInJpa(EntityManager entityManager) throws PersistenceException {
- // lets try lock the object first
+ // let's try locking the object first
if (isUseLocking()) {
LOG.info("Attempting to lock: " + activityState);
entityManager.lock(activityState, LockModeType.WRITE);
Modified: camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java Wed Jan 4 18:55:36 2012
@@ -49,7 +49,7 @@ public class JpaBamProcessor extends Jpa
protected void processEntity(Exchange exchange, ProcessInstance process) throws Exception {
LOG.debug("Processing process instance: {}", process);
- // lets force the lazy creation of this activity
+ // force the lazy creation of this activity
ActivityRules rules = getActivityRules();
ActivityState state = process.getOrCreateActivityState(rules);
Modified: camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java Wed Jan 4 18:55:36 2012
@@ -68,7 +68,7 @@ public class ActivityRules extends Servi
//-------------------------------------------------------------------------
public ActivityDefinition getActivityDefinition() {
- // lets always query for it, to avoid issues with refreshing before a commit etc
+ // let's always query for it, to avoid issues with refreshing before a commit etc
return builder.findOrCreateActivityDefinition(activityName);
}
Modified: camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java Wed Jan 4 18:55:36 2012
@@ -105,7 +105,7 @@ public class TemporalRule extends Servic
// TODO now we might need to set the second activity state
// to 'grey' to indicate it now could happen?
- // lets force the lazy creation of the second state
+ // let's force the lazy creation of the second state
ActivityState secondState = second.getOrCreateActivityState(instance);
if (expectedMillis > 0L) {
Date expected = secondState.getTimeExpected();
Modified: camel/branches/camel-2.8.x/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java Wed Jan 4 18:55:36 2012
@@ -74,14 +74,14 @@ public class BamRouteTest extends CamelS
return new ProcessBuilder(jpaTemplate, transactionTemplate) {
public void configure() throws Exception {
- // lets define some activities, correlating on an XPath on the message bodies
+ // let's define some activities, correlating on an XPath on the message bodies
ActivityBuilder a = activity("seda:a").name("a")
.correlate(xpath("/hello/@id"));
ActivityBuilder b = activity("seda:b").name("b")
.correlate(xpath("/hello/@id"));
- // now lets add some rules
+ // now let's add some rules
b.starts().after(a.completes())
.expectWithin(seconds(1))
.errorIfOver(seconds(errorTimeout)).to("mock:overdue");
Modified: camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java (original)
+++ camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintComponentResolver.java Wed Jan 4 18:55:36 2012
@@ -41,7 +41,7 @@ public class BlueprintComponentResolver
LOG.debug("Found component: {} in registry: {}", name, bean);
return (Component) bean;
} else {
- // lets use Camel's type conversion mechanism to convert things like CamelContext
+ // let's use Camel's type conversion mechanism to convert things like CamelContext
// and other types into a valid Component
Component component = CamelContextHelper.convertTo(context, Component.class, bean);
if (component != null) {
Modified: camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java (original)
+++ camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java Wed Jan 4 18:55:36 2012
@@ -82,7 +82,7 @@ public class PackageScanRouteBuilderFind
}
/**
- * Lets ignore beans that are explicitly configured in the Spring XML files
+ * Allows for ignoring beans that are explicitly configured in the Spring XML files
*/
protected boolean shouldIgnoreBean(Class<?> type) {
for (Object metadataObject : blueprintContainer.getMetadata(BeanMetadata.class)) {
Modified: camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java (original)
+++ camel/branches/camel-2.8.x/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java Wed Jan 4 18:55:36 2012
@@ -155,7 +155,7 @@ public class CamelNamespaceHandler imple
String contextId = element.getAttribute("id");
boolean implicitId = false;
- // lets avoid folks having to explicitly give an ID to a camel context
+ // let's avoid folks having to explicitly give an ID to a camel context
if (ObjectHelper.isEmpty(contextId)) {
// if no explicit id was set then use a default auto generated name
CamelContextNameStrategy strategy = new DefaultCamelContextNameStrategy();
@@ -164,7 +164,7 @@ public class CamelNamespaceHandler imple
implicitId = true;
}
- // now lets parse the routes with JAXB
+ // now let's parse the routes with JAXB
Binder<Node> binder;
try {
binder = getJaxbContext().createBinder();
@@ -237,7 +237,7 @@ public class CamelNamespaceHandler imple
}
private Metadata parseRouteContextNode(Element element, ParserContext context) {
- // now lets parse the routes with JAXB
+ // now parse the routes with JAXB
Binder<Node> binder;
try {
binder = getJaxbContext().createBinder();
@@ -271,7 +271,7 @@ public class CamelNamespaceHandler imple
}
private Metadata parseKeyStoreParametersNode(Element element, ParserContext context) {
- // now lets parse the key store parameters with JAXB
+ // now parse the key store parameters with JAXB
Binder<Node> binder;
try {
binder = getJaxbContext().createBinder();
@@ -305,7 +305,7 @@ public class CamelNamespaceHandler imple
}
private Metadata parseSecureRandomParametersNode(Element element, ParserContext context) {
- // now lets parse the key store parameters with JAXB
+ // now parse the key store parameters with JAXB
Binder<Node> binder;
try {
binder = getJaxbContext().createBinder();
@@ -339,7 +339,7 @@ public class CamelNamespaceHandler imple
}
private Metadata parseSSLContextParametersNode(Element element, ParserContext context) {
- // now lets parse the key store parameters with JAXB
+ // now parse the key store parameters with JAXB
Binder<Node> binder;
try {
binder = getJaxbContext().createBinder();
Modified: camel/branches/camel-2.8.x/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java (original)
+++ camel/branches/camel-2.8.x/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java Wed Jan 4 18:55:36 2012
@@ -65,7 +65,7 @@ public class LocalContextComponent exten
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
throws Exception {
- // lets first check if we are using a fully qualified name: [context:]contextId:endpointUri
+ // first check if we are using a fully qualified name: [context:]contextId:endpointUri
Map<String, Endpoint> map = getLocalCamelContext().getEndpointMap();
if (LOG.isTraceEnabled()) {
@@ -77,7 +77,7 @@ public class LocalContextComponent exten
return endpoint;
}
- // lets look to see if there is an endpoint of name 'remaining' using one of the local endpoints within
+ // look to see if there is an endpoint of name 'remaining' using one of the local endpoints within
// the black box CamelContext
String[] separators = {":", "://"};
for (String scheme : localProtocolSchemes) {
Modified: camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java Wed Jan 4 18:55:36 2012
@@ -27,7 +27,7 @@ import org.apache.camel.test.CamelTestSu
import org.junit.Test;
/**
- * Lets use the Java DSL to create a black box CamelContext and then test its use from another context
+ * Allows for use of the Java DSL to create a black box CamelContext and then test its use from another context
*/
public class JavaDslBlackBoxTest extends CamelTestSupport {
@@ -52,13 +52,13 @@ public class JavaDslBlackBoxTest extends
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry registry = super.createRegistry();
- // lets create our black box as a camel context and a set of routes
+ // let's create our black box as a Camel context and a set of routes
DefaultCamelContext blackBox = new DefaultCamelContext(registry);
blackBox.setName("blackBox");
blackBox.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- // receive purchase orders, lets process it in some way then
+ // we received purchase orders, so let's process it in some way then
// send an invoice to our invoice endpoint
from("direct:purchaseOrder").setHeader("received").constant("true").to("direct:invoice");
}
Modified: camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java Wed Jan 4 18:55:36 2012
@@ -19,7 +19,7 @@ package org.apache.camel.component.conte
import org.apache.camel.builder.RouteBuilder;
/**
- * Lets use the verbose context:camelContextId:actualEndpointName when referring to endpoints
+ * Tests use of the verbose context:camelContextId:actualEndpointName when referring to endpoints
*/
public class JavaDslBlackBoxWithVerboseUriTest extends JavaDslBlackBoxTest {
Modified: camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original)
+++ camel/branches/camel-2.8.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Wed Jan 4 18:55:36 2012
@@ -108,7 +108,7 @@ public abstract class AbstractCamelConte
private ClassLoader contextClassLoaderOnStart;
public AbstractCamelContextFactoryBean() {
- // Lets keep track of the class loader for when we actually do start things up
+ // Keep track of the class loader for when we actually do start things up
contextClassLoaderOnStart = Thread.currentThread().getContextClassLoader();
}
Modified: camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java Wed Jan 4 18:55:36 2012
@@ -37,7 +37,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
/**
- * Lets use a custom CamelModule to perform explicit binding of route builders
+ * Uses a custom CamelModule to perform explicit binding of route builders
*
* @version
*/
Modified: camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java Wed Jan 4 18:55:36 2012
@@ -21,7 +21,7 @@ import com.google.inject.Injector;
import org.junit.Assert;
import org.junit.Test;
/**
- * Lets use a RouteBuilder to bind instances of routes to the CamelContext
+ * Uses a RouteBuilder to bind instances of routes to the CamelContext
*
* @version
*/
Modified: camel/branches/camel-2.8.x/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-guice-jms/src/main/java/org/apache/camel/example/guice/jms/MyModule.java Wed Jan 4 18:55:36 2012
@@ -36,13 +36,13 @@ public class MyModule extends CamelModul
protected void configure() {
super.configure();
- // lets add in any RouteBuilder instances we want to use
+ // let's add in any RouteBuilder instances we want to use
bind(MyRouteBuilder.class);
bind(Printer.class);
}
/**
- * Lets configure the JMS component, parameterizing some properties from the
+ * Let's configure the JMS component, parameterizing some properties from the
* jndi.properties file
*/
@Provides
Modified: camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt (original)
+++ camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt Wed Jan 4 18:55:36 2012
@@ -1,11 +1,12 @@
Camel Component Project
====================
-This Project is a template of the Camel component.
-When you create the component project, you need to move the META-INF/services/org/apache/camel/component/helloworld
+This Project is a template of a Camel component.
+
+When you create a component project, you need to move the META-INF/services/org/apache/camel/component/${name}
file to META-INF/services/org/apache/camel/component/foo where "foo" is the URI scheme for your component and any
- related endpoints created on the fly.
+related endpoints created on the fly.
-For more help see the Apache Camel documentation
+For more help see the Apache Camel documentation:
http://cwiki.apache.org/CAMEL/writing-components.html
Modified: camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java?rev=1227265&r1=1227264&r2=1227265&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java (original)
+++ camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java Wed Jan 4 18:55:36 2012
@@ -34,7 +34,7 @@ public class MyRouteBuilder extends Rout
}
/**
- * Lets configure the Camel routing rules using Java code...
+ * Let's configure the Camel routing rules using Java code...
*/
public void configure() {