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/02/11 07:03:07 UTC
svn commit: r1069679 - in /camel/trunk/components:
camel-core-xml/src/main/java/org/apache/camel/core/xml/
camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/
camel-spring/src/main/java/org/apache/camel/spring/
Author: davsclaus
Date: Fri Feb 11 06:03:06 2011
New Revision: 1069679
URL: http://svn.apache.org/viewvc?rev=1069679&view=rev
Log:
CAMEL-3644: Added getter for endpoints in the abstract XML CamelContext FactoryBean so its avail in camel-spring and camel-blueprint. Polished.
Modified:
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelProducerTemplateFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelConsumerTemplateFactoryBean.java Fri Feb 11 06:03:06 2011
@@ -19,15 +19,10 @@ package org.apache.camel.core.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.impl.DefaultConsumerTemplate;
-import org.apache.camel.model.IdentifiedType;
import org.apache.camel.util.ServiceHelper;
/**
@@ -38,6 +33,7 @@ import org.apache.camel.util.ServiceHelp
*/
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class AbstractCamelConsumerTemplateFactoryBean extends AbstractCamelFactoryBean<ConsumerTemplate> {
+
@XmlTransient
private ConsumerTemplate template;
@XmlAttribute
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java Fri Feb 11 06:03:06 2011
@@ -411,6 +411,8 @@ public abstract class AbstractCamelConte
public abstract List<RouteDefinition> getRoutes();
+ public abstract List<? extends AbstractCamelEndpointFactoryBean> getEndpoints();
+
public abstract List<InterceptDefinition> getIntercepts();
public abstract List<InterceptFromDefinition> getInterceptFroms();
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java Fri Feb 11 06:03:06 2011
@@ -20,17 +20,12 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
import org.apache.camel.NoSuchEndpointException;
-import org.apache.camel.model.IdentifiedType;
import static org.apache.camel.util.ObjectHelper.notNull;
-
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFactoryBean<Endpoint> {
@XmlAttribute(required = false)
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelProducerTemplateFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelProducerTemplateFactoryBean.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelProducerTemplateFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelProducerTemplateFactoryBean.java Fri Feb 11 06:03:06 2011
@@ -20,14 +20,11 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultProducerTemplate;
-import org.apache.camel.model.IdentifiedType;
import org.apache.camel.util.ServiceHelper;
/**
@@ -78,6 +75,7 @@ public abstract class AbstractCamelProdu
// Properties
// -------------------------------------------------------------------------
+
public String getDefaultEndpoint() {
return defaultEndpoint;
}
@@ -97,5 +95,4 @@ public abstract class AbstractCamelProdu
this.maximumCacheSize = maximumCacheSize;
}
-
}
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelThreadPoolFactoryBean.java Fri Feb 11 06:03:06 2011
@@ -22,18 +22,11 @@ import java.util.concurrent.TimeUnit;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.xml.TimeUnitAdapter;
-import org.apache.camel.model.IdentifiedType;
-
-import static org.apache.camel.util.ObjectHelper.notNull;
/**
* A factory which instantiates {@link java.util.concurrent.ExecutorService} objects
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/AntPathMatcher.java Fri Feb 11 06:03:06 2011
@@ -21,39 +21,38 @@ import java.util.List;
import java.util.StringTokenizer;
/**
- * PathMatcher implementation for Ant-style path patterns. Examples are provided
- * below.
+ * PathMatcher implementation for Ant-style path patterns. Examples are provided below.
* <p>
- * Part of this mapping code has been kindly borrowed from <a
- * href="http://ant.apache.org">Apache Ant</a>.
+ * Part of this mapping code has been kindly borrowed from <a href="http://ant.apache.org">Apache Ant</a>
+ * and <a href="http://springframework.org">Spring Framework</a>.
* <p>
* The mapping matches URLs using the following rules:<br>
* <ul>
- * <li>? matches one character</li>
- * <li>* matches zero or more characters</li>
- * <li>** matches zero or more 'directories' in a path</li>
+ * <li>? matches one character</li>
+ * <li>* matches zero or more characters</li>
+ * <li>** matches zero or more 'directories' in a path</li>
* </ul>
* <p>
* Some examples:<br>
* <ul>
- * <li><code>com/t?st.jsp</code> - matches <code>com/test.jsp</code> but also
- * <code>com/tast.jsp</code> or <code>com/txst.jsp</code></li>
- * <li><code>com/*.jsp</code> - matches all <code>.jsp</code> files in the
- * <code>com</code> directory</li>
- * <li><code>com/**/test.jsp</code> - matches all <code>test.jsp</code>
- * files underneath the <code>com</code> path</li>
- * <li><code>org/springframework/**/*.jsp</code> - matches all
- * <code>.jsp</code> files underneath the <code>org/springframework</code> path</li>
- * <li><code>org/**/servlet/bla.jsp</code> - matches
- * <code>org/springframework/servlet/bla.jsp</code> but also
- * <code>org/springframework/testing/servlet/bla.jsp</code> and
- * <code>org/servlet/bla.jsp</code></li>
+ * <li><code>com/t?st.jsp</code> - matches <code>com/test.jsp</code> but also
+ * <code>com/tast.jsp</code> or <code>com/txst.jsp</code>
+ * </li>
+ * <li><code>com/*.jsp</code> - matches all <code>.jsp</code> files in the
+ * <code>com</code> directory
+ * </li>
+ * <li><code>com/**/test.jsp</code> - matches all <code>test.jsp</code>
+ * files underneath the <code>com</code> path
+ * </li>
+ * <li><code>org/springframework/**/*.jsp</code> - matches all
+ * <code>.jsp</code> files underneath the <code>org/springframework</code> path
+ * </li>
+ * <li><code>org/**/servlet/bla.jsp</code> - matches
+ * <code>org/springframework/servlet/bla.jsp</code> but also
+ * <code>org/springframework/testing/servlet/bla.jsp</code> and
+ * <code>org/servlet/bla.jsp</code>
+ * </li>
* </ul>
- *
- * @author Alef Arendsen
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @since 16.07.2003
*/
public class AntPathMatcher {
@@ -190,8 +189,8 @@ public class AntPathMatcher {
strLoop:
for (int i = 0; i <= strLength - patLength; i++) {
for (int j = 0; j < patLength; j++) {
- String subPat = (String)pattDirs[pattIdxStart + j + 1];
- String subStr = (String)pathDirs[pathIdxStart + i + j];
+ String subPat = pattDirs[pattIdxStart + j + 1];
+ String subStr = pathDirs[pathIdxStart + i + j];
if (!matchStrings(subPat, subStr)) {
continue strLoop;
}
@@ -451,7 +450,7 @@ public class AntPathMatcher {
tokens.add(token);
}
}
- return (String[])tokens.toArray(new String[tokens.size()]);
+ return tokens.toArray(new String[tokens.size()]);
}
}
Modified: camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java (original)
+++ camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/scan/PatternBasedPackageScanFilter.java Fri Feb 11 06:03:06 2011
@@ -23,14 +23,14 @@ import java.util.List;
import org.apache.camel.spi.PackageScanFilter;
/**
- * <code>PatternBasedPackageScanFilter</code> uses an underlying
+ * {@link PatternBasedPackageScanFilter} uses an underlying
* {@link AntPathMatcher} to filter scanned files according to include and
* exclude patterns.
*
* @see AntPathMatcher
*/
public class PatternBasedPackageScanFilter implements PackageScanFilter {
- private AntPathMatcher matcher = new AntPathMatcher();
+ private final AntPathMatcher matcher = new AntPathMatcher();
private List<String> excludePatterns;
private List<String> includePatterns;
@@ -38,8 +38,6 @@ public class PatternBasedPackageScanFilt
/**
* add and exclude pattern to the filter. Classes matching this pattern will
* not match the filter
- *
- * @param excludePattern
*/
public void addExcludePattern(String excludePattern) {
if (excludePatterns == null) {
@@ -51,8 +49,6 @@ public class PatternBasedPackageScanFilt
/**
* add and include pattern to the filter. Classes must match one of supplied
* include patterns to match the filter
- *
- * @param includePattern
*/
public void addIncludePattern(String includePattern) {
if (includePatterns == null) {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=1069679&r1=1069678&r2=1069679&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Fri Feb 11 06:03:06 2011
@@ -32,6 +32,7 @@ import org.apache.camel.ShutdownRoute;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
+import org.apache.camel.core.xml.AbstractCamelEndpointFactoryBean;
import org.apache.camel.core.xml.CamelJMXAgentDefinition;
import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
@@ -310,6 +311,10 @@ public class CamelContextFactoryBean ext
this.routes = routes;
}
+ public List<CamelEndpointFactoryBean> getEndpoints() {
+ return endpoints;
+ }
+
public List<InterceptDefinition> getIntercepts() {
return intercepts;
}