Author: davsclaus
Date: Sat Jul 26 01:51:38 2008
New Revision: 679971
URL: http://svn.apache.org/viewvc?rev=679971&view=rev
Log:
Fixed javadoc warnings. Added missing package.html. Upgraded to cobertura 1.9.
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html
(with props)
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ErrorHandlerWrappingStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Sat Jul 26 01:51:38 2008
@@ -136,28 +136,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>
- http://java.sun.com/j2se/1.5.0/docs/api/
- </link>
- <link>
- http://java.sun.com/j2ee/1.4/docs/api/
- </link>
- <link>
- http://jakarta.apache.org/commons/logging/apidocs/
- </link>
- <link>
- http://jakarta.apache.org/commons/pool/apidocs/
- </link>
- <link>
- http://junit.sourceforge.net/javadoc/
- </link>
- <link>
- http://logging.apache.org/log4j/docs/api/
- </link>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
</links>
- <stylesheetfile>
- ${basedir}/../etc/css/stylesheet.css
- </stylesheetfile>
+ <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
<source>1.5</source>
@@ -244,28 +227,11 @@
</executions>
<configuration>
<links>
- <link>
- http://java.sun.com/j2se/1.5.0/docs/api/
- </link>
- <link>
- http://java.sun.com/j2ee/1.4/docs/api/
- </link>
- <link>
- http://jakarta.apache.org/commons/logging/apidocs/
- </link>
- <link>
- http://jakarta.apache.org/commons/pool/apidocs/
- </link>
- <link>
- http://junit.sourceforge.net/javadoc/
- </link>
- <link>
- http://logging.apache.org/log4j/docs/api/
- </link>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
</links>
- <stylesheetfile>
- ${basedir}/../etc/css/stylesheet.css
- </stylesheetfile>
+
<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
<source>1.5</source>
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchangeFormatter.java
Sat Jul 26 01:51:38 2008
@@ -20,7 +20,7 @@
import org.apache.camel.processor.interceptor.ExchangeFormatter;
/**
- * A default [EMAIL PROTECTED] ExchangeFormatter} which just uses the [EMAIL
PROTECTED] org.apache.camel.Exchange#toString()} method
+ * A default [EMAIL PROTECTED] ExchangeFormatter} which just uses the [EMAIL
PROTECTED] org.apache.camel.Exchange} <tt>toString()</tt> method
*
* @version $Revision$
*/
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
Sat Jul 26 01:51:38 2008
@@ -75,11 +75,6 @@
return asyncCallbacks == null || asyncCallbacks.isEmpty();
}
- /**
- * Returns the unique ID of this unit of work, lazily creating one if it
does not yet have one
- *
- * @return
- */
public String getId() {
if (id == null) {
id = DEFAULT_ID_GENERATOR.generateId();
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html?rev=679971&view=auto
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html
(added)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html
Sat Jul 26 01:51:38 2008
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Camel <a href="http://activemq.apache.org/camel/constant.html";>Constant</a>
language.
+
+</body>
+</html>
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/package.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
Sat Jul 26 01:51:38 2008
@@ -132,7 +132,7 @@
/**
* Sends the exchange to a list of endpoints using the
- * [EMAIL PROTECTED] MulticastProcessor} pattern
+ * [EMAIL PROTECTED] org.apache.camel.processor.MulticastProcessor} pattern
*/
public Type to(String... uris) {
for (String uri : uris) {
@@ -143,7 +143,7 @@
/**
* Sends the exchange to a list of endpoints using the
- * [EMAIL PROTECTED] MulticastProcessor} pattern
+ * [EMAIL PROTECTED] org.apache.camel.processor.MulticastProcessor} pattern
*/
public Type to(Endpoint... endpoints) {
for (Endpoint endpoint : endpoints) {
@@ -154,7 +154,7 @@
/**
* Sends the exchange to a list of endpoint using the
- * [EMAIL PROTECTED] MulticastProcessor} pattern
+ * [EMAIL PROTECTED] org.apache.camel.processor.MulticastProcessor} pattern
*/
public Type to(Collection<Endpoint> endpoints) {
for (Endpoint endpoint : endpoints) {
@@ -279,7 +279,8 @@
}
/**
- * Creates an [EMAIL PROTECTED] IdempotentConsumer} to avoid duplicate
messages
+ * Creates an [EMAIL PROTECTED]
org.apache.camel.processor.idempotent.IdempotentConsumer}
+ * to avoid duplicate messages
*/
public IdempotentConsumerType idempotentConsumer(Expression
messageIdExpression,
MessageIdRepository messageIdRepository) {
@@ -289,7 +290,8 @@
}
/**
- * Creates an [EMAIL PROTECTED] IdempotentConsumer} to avoid duplicate
messages
+ * Creates an [EMAIL PROTECTED]
org.apache.camel.processor.idempotent.IdempotentConsumer}
+ * to avoid duplicate messages
*
* @return the builder used to create the expression
*/
@@ -370,7 +372,8 @@
* List</a> pattern.
*
* @param receipients is the builder of the expression used in the
- * [EMAIL PROTECTED] RecipientList} to decide the
destinations
+ * [EMAIL PROTECTED]
org.apache.camel.processor.RecipientList}
+ * to decide the destinations
*/
public Type recipientList(Expression receipients) {
RecipientListType answer = new RecipientListType(receipients);
@@ -384,7 +387,8 @@
* List</a> pattern.
*
* @return the expression clause for the expression used in the
- * [EMAIL PROTECTED] RecipientList} to decide the
destinations
+ * [EMAIL PROTECTED]
org.apache.camel.processor.RecipientList}
+ * to decide the destinations
*/
public ExpressionClause<ProcessorType<Type>> recipientList() {
RecipientListType answer = new RecipientListType();
@@ -1366,7 +1370,8 @@
/**
* Unmarshals the in body using the specified [EMAIL PROTECTED] DataFormat}
- * reference in the [EMAIL PROTECTED] Registry} and sets the output on the
out message body.
+ * reference in the [EMAIL PROTECTED] org.apache.camel.spi.Registry} and
sets
+ * the output on the out message body.
*
* @return this object
*/
@@ -1408,7 +1413,8 @@
/**
* Marshals the in body the specified [EMAIL PROTECTED] DataFormat}
- * reference in the [EMAIL PROTECTED] Registry} and sets the output on the
out message body.
+ * reference in the [EMAIL PROTECTED] org.apache.camel.spi.Registry} and
sets
+ * the output on the out message body.
*
* @return this object
*/
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ErrorHandlerWrappingStrategy.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ErrorHandlerWrappingStrategy.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ErrorHandlerWrappingStrategy.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ErrorHandlerWrappingStrategy.java
Sat Jul 26 01:51:38 2008
@@ -22,20 +22,21 @@
/**
* The purpose of this interface is to allow an implementation to
* provide custom logic to wrap a processor with error handler
+ *
* @version $Revision$
*/
public interface ErrorHandlerWrappingStrategy {
/**
* This method is invoked by
- * [EMAIL PROTECTED] ProcessorType#wrapProcessor(RouteContext, Processor)
+ * [EMAIL PROTECTED] ProcessorType#wrapProcessor(RouteContext, Processor)}
* to give the implementor an opportunity to wrap the target processor
* in a route.
*
* @param processorType the object that invokes this method
* @param target the processor to be wrapped
* @return processor wrapped with an interceptor or not wrapped
- * @throws Exception
+ * @throws Exception can be thrown
*/
Processor wrapProcessorInErrorHandler(RouteContext routeContext,
ProcessorType processorType,
Processor target) throws Exception;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
Sat Jul 26 01:51:38 2008
@@ -30,14 +30,14 @@
/**
* This method is invoked by
- * [EMAIL PROTECTED] ProcessorType#wrapProcessor(RouteContext, Processor)
+ * [EMAIL PROTECTED] ProcessorType#wrapProcessor(RouteContext, Processor)}
* to give the implementor an opportunity to wrap the target processor
* in a route.
*
* @param processorType the object that invokes this method
* @param target the processor to be wrapped
* @return processor wrapped with an interceptor or not wrapped
- * @throws Exception
+ * @throws Exception can be thrown
*/
Processor wrapProcessorInInterceptors(ProcessorType processorType,
Processor target) throws Exception;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RouteContext.java
Sat Jul 26 01:51:38 2008
@@ -76,15 +76,11 @@
/**
* This method retrieves the InterceptStrategy instances this route
context.
- *
- * @return InterceptStrategy
*/
List<InterceptStrategy> getInterceptStrategies();
/**
* This method sets the InterceptStrategy instances on this route context.
- *
- * @param interceptStrategies
*/
void setInterceptStrategies(List<InterceptStrategy> interceptStrategies);
@@ -92,31 +88,22 @@
/**
* This method retrieves the ErrorHandlerWrappingStrategy.
- *
- * @return ErrorHandlerWrappingStrategy
*/
ErrorHandlerWrappingStrategy getErrorHandlerWrappingStrategy();
/**
* This method sets the ErrorHandlerWrappingStrategy.
- *
*/
void setErrorHandlerWrappingStrategy(ErrorHandlerWrappingStrategy
strategy);
/**
- * If this flag is true, [EMAIL PROTECTED]
ProcessorType#addRoutes(RouteContext, java.util.Collection)
+ * If this flag is true, [EMAIL PROTECTED]
ProcessorType#addRoutes(RouteContext, java.util.Collection)}
* will not add processor to addEventDrivenProcessor to the RouteContext
and it
* will prevent from adding an EventDrivenRoute.
*
*/
void setIsRouteAdded(boolean value);
- /**
- * @see [EMAIL PROTECTED] #setIsRouteAdded(boolean)}
- *
- */
boolean isRouteAdded();
-
-
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/UnitOfWork.java
Sat Jul 26 01:51:38 2008
@@ -29,15 +29,11 @@
/**
* Adds a synchronization hook
- *
- * @param synchronization
*/
void addSynchronization(Synchronization synchronization);
/**
* Removes a synchronization hook
- *
- * @param synchronization
*/
void removeSynchronization(Synchronization synchronization);
@@ -48,8 +44,6 @@
/**
* Returns the unique ID of this unit of work, lazily creating one if it
does not yet have one
- *
- * @return
*/
String getId();
}
Modified:
activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-mina/src/test/resources/log4j.properties
Sat Jul 26 01:51:38 2008
@@ -32,4 +32,4 @@
log4j.appender.file.file=target/camel-mina-test.log
# debug loging for Camel
-log4j.logger.org.apache.camel.component.mina=INFO
+log4j.logger.org.apache.camel.component.mina=DEBUG
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=679971&r1=679970&r2=679971&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Sat Jul 26 01:51:38 2008
@@ -962,7 +962,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
<configuration>
<check>
<branchRate>85</branchRate>
@@ -1151,7 +1151,6 @@
<configuration>
<formats>
<format>html</format>
- <format>xml</format>
</formats>
</configuration>
</plugin>
@@ -1166,16 +1165,8 @@
<configuration>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
- <link>http://commons.apache.org/collections/api-release/</link>
- <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
- <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
- <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://mina.apache.org/report/trunk/apidocs/</link>
+ <link>http://java.sun.com/javaee/5/docs/api/</link>
+
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
