svn commit: r533137 - in /activemq/camel/trunk: ./ camel-core/ camel-core/src/main/java/org/apache/camel/ camel-core/src/test/java/org/apache/camel/

[jstrachan]

Author: jstrachan
Date: Fri Apr 27 08:19:37 2007
New Revision: 533137

URL: http://svn.apache.org/viewvc?view=rev&rev=533137
Log:
tidied up the javadoc & javadoc generation as well as tidying up some test case 
methods

Modified:
    activemq/camel/trunk/camel-core/pom.xml
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
    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?view=diff&rev=533137&r1=533136&r2=533137
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Fri Apr 27 08:19:37 2007
@@ -95,10 +95,29 @@
         </configuration>
       </plugin>
 
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <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>
+          </links>
+          <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
+          <linksource>true</linksource>
+          <maxmemory>256m</maxmemory>
+          <source>1.5</source>
+
           <groups>
             <group>
               <title>Camel API</title>
@@ -136,6 +155,5 @@
         </configuration>
       </plugin>
     </plugins>
-  </build>
-
+  </reporting>
 </project>

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?view=diff&rev=533137&r1=533136&r2=533137
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
 Fri Apr 27 08:19:37 2007
@@ -70,7 +70,7 @@
     /**
      * Resolves the given URI to an [EMAIL PROTECTED] Endpoint}.  If the URI 
has a singleton endpoint
      * registered, then the singleton is returned.  Otherwise, a new [EMAIL 
PROTECTED] Endpoint} is created
-     * and auto registered as a singleton if it is a singleton endpoint.
+     * and if the endpoint is a singleton it is registered as a singleton 
endpoint.
      */
     Endpoint getEndpoint(String uri);
 

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?view=diff&rev=533137&r1=533136&r2=533137
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
 Fri Apr 27 08:19:37 2007
@@ -53,9 +53,15 @@
         return new DefaultCamelContext();
     }
 
-    protected abstract RouteBuilder createRouteBuilder();
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                // no routes added by default
+            }
+        };
+    }
 
-    protected Endpoint<Exchange> resolveMandatoryEndpoint(String uri) {
+    protected Endpoint resolveMandatoryEndpoint(String uri) {
         return resolveMandatoryEndpoint(context, uri);
     }
 

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?view=diff&rev=533137&r1=533136&r2=533137
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java 
(original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java 
Fri Apr 27 08:19:37 2007
@@ -111,7 +111,7 @@
     /**
      * Resolves an endpoint and asserts that it is found
      */
-    protected Endpoint<Exchange> resolveMandatoryEndpoint(CamelContext 
context, String uri) {
+    protected Endpoint resolveMandatoryEndpoint(CamelContext context, String 
uri) {
         Endpoint endpoint = context.getEndpoint(uri);
 
         assertNotNull("No endpoint found for URI: " + uri, endpoint);

Modified: activemq/camel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=533137&r1=533136&r2=533137
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Apr 27 08:19:37 2007
@@ -411,6 +411,13 @@
         <scope>test</scope>
       </dependency>
 
+      <!-- optional JavaMail -->
+      <dependency>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>1.4</version>
+      </dependency>
+
       <!-- common testing dependencies -->
       <dependency>
         <groupId>org.apache.derby</groupId>