Author: davsclaus
Date: Wed Jul 2 12:50:43 2008
New Revision: 673477
URL: http://svn.apache.org/viewvc?rev=673477&view=rev
Log:
CAMEL-646: Polished javadoc for camel-spring
Added:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/package.html
- copied, changed from r673462,
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/package.html
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/package.html
- copied, changed from r673462,
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/package.html
Removed:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/package.html
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/SpringValidator.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/BeanEndpointFactory.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
Wed Jul 2 12:50:43 2008
@@ -26,6 +26,9 @@
import org.springframework.core.io.ResourceLoader;
/**
+ * A useful base class for components which depend on a resource
+ * such as things like Velocity or XQuery based components.
+ *
* @version $Revision$
*/
public abstract class ResourceBasedComponent extends
DefaultComponent<Exchange> {
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
Wed Jul 2 12:50:43 2008
@@ -32,7 +32,7 @@
/**
* A useful base class for endpoints which depend on a resource
- * such as things like Velocity or XQuery based components
+ * such as things like Velocity or XQuery based components.
*
* @version $Revision$
*/
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
Wed Jul 2 12:50:43 2008
@@ -21,6 +21,9 @@
import org.apache.camel.impl.DefaultConsumer;
/**
+ * An <a href="http://activemq.apache.org/camel/event.html";>Event Consumer</a>
+ * for working with Spring ApplicationEvents
+ *
* @version $Revision$
*/
public class EventConsumer extends DefaultConsumer<Exchange> {
Copied:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/package.html
(from r673462,
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/package.html)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/package.html?p2=activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/package.html&p1=activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/package.html&r1=673462&r2=673477&rev=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/package.html
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/package.html
Wed Jul 2 12:50:43 2008
@@ -19,7 +19,7 @@
</head>
<body>
-An <a href="http://activemq.apache.org/camel/event.html";>Event Endpoint</a>
for working with Spring ApplicationEvents
+Base classes for Spring based Components
</body>
</html>
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
Wed Jul 2 12:50:43 2008
@@ -28,6 +28,10 @@
import org.apache.camel.util.UnsafeUriCharactersEncoder;
/**
+ * Test Component.
+ *
+ * @see org.apache.camel.component.test.TestEndpoint
+ *
* @version $Revision$
*/
public class TestComponent extends DefaultComponent<Exchange> {
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/SpringValidator.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/SpringValidator.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/SpringValidator.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/SpringValidator.java
Wed Jul 2 12:50:43 2008
@@ -26,6 +26,8 @@
import org.springframework.core.io.Resource;
/**
+ * Validator that uses Spring for reading the scheme resource.
+ *
* @version $Revision$
*/
public class SpringValidator extends ValidatingProcessor {
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProxyFactoryType.java
Wed Jul 2 12:50:43 2008
@@ -22,6 +22,8 @@
import org.apache.camel.model.IdentifiedType;
/**
+ * The <proxy> tag element.
+ *
* @version $Revision$
*/ // to fudge the XSD generation
@XmlRootElement(name = "proxy")
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelServiceExporterType.java
Wed Jul 2 12:50:43 2008
@@ -22,6 +22,8 @@
import org.apache.camel.model.IdentifiedType;
/**
+ * The <export> tag element.
+ *
* @version $Revision$
*/
@XmlRootElement(name = "export")
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/BeanEndpointFactory.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/BeanEndpointFactory.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/BeanEndpointFactory.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/BeanEndpointFactory.java
Wed Jul 2 12:50:43 2008
@@ -20,6 +20,9 @@
import org.springframework.beans.factory.FactoryBean;
/**
+ * Spring [EMAIL PROTECTED] org.springframework.beans.factory.FactoryBean} for
creating
+ * Camel [EMAIL PROTECTED] BeanEndpoint} objects.
+ *
* @version $Revision$
*/
public class BeanEndpointFactory implements FactoryBean {
Added:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html?rev=673477&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
(added)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/factory/package.html
Wed Jul 2 12:50:43 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>
+
+Base classes for Factories
+
+</body>
+</html>
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Wed Jul 2 12:50:43 2008
@@ -56,6 +56,9 @@
import org.springframework.beans.factory.xml.ParserContext;
+/**
+ * Camel namespace for the spring XML configuration file.
+ */
public class CamelNamespaceHandler extends NamespaceHandlerSupport {
protected BeanDefinitionParser endpointParser = new
BeanDefinitionParser(EndpointFactoryBean.class);
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java
Wed Jul 2 12:50:43 2008
@@ -14,5 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+/**
+ * The classes for working with Camel and Spring along with the primary
factory beans.
+ */
@javax.xml.bind.annotation.XmlSchema(namespace =
"http://activemq.apache.org/camel/schema/spring";, elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.camel.spring;
Copied:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/package.html
(from r673462,
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/package.html)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/package.html?p2=activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/package.html&p1=activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/package.html&r1=673462&r2=673477&rev=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/package.html
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/package.html
Wed Jul 2 12:50:43 2008
@@ -19,7 +19,7 @@
</head>
<body>
-Spring 2.x custom XML handling to allow namespace based XML to be parsed from
inside any Spring XML
+Camel services for POJO based Spring Remoting.
</body>
</html>
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
Wed Jul 2 12:50:43 2008
@@ -20,9 +20,13 @@
import org.springframework.context.ApplicationContext;
/**
+ * Dependeny Injected Bean injector.
+ *
* @version $Revision$
+ * @deprecated not used. Will be removed in Camel 2.0.
*/
public class BeanInjector extends BeanConfigurerSupport {
+
public BeanInjector(ApplicationContext applicationContext) throws
Exception {
setBeanFactory(applicationContext);
afterPropertiesSet();
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java
Wed Jul 2 12:50:43 2008
@@ -41,8 +41,6 @@
private static final transient Log LOG =
LogFactory.getLog(TransactionInterceptor.class);
private final TransactionTemplate transactionTemplate;
-
-
public TransactionInterceptor(TransactionTemplate transactionTemplate) {
this.transactionTemplate = transactionTemplate;
}
@@ -80,7 +78,6 @@
TRANSACTED.set(exchange, Boolean.TRUE);
}
-
// process the exchange
processNext(exchange);
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java?rev=673477&r1=673476&r2=673477&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
Wed Jul 2 12:50:43 2008
@@ -22,7 +22,11 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+/**
+ * Reflection utilities, extending Spring ReflectionUtils.
+ */
public class ReflectionUtils extends org.springframework.util.ReflectionUtils {
+
public static <T extends Annotation> void callLifecycleMethod(final Object
bean, final Class<T> annotation) {
ReflectionUtils.doWithMethods(bean.getClass(), new
ReflectionUtils.MethodCallback() {
public void doWith(Method method) throws IllegalArgumentException,
IllegalAccessException {
@@ -58,4 +62,5 @@
ReflectionUtils.handleReflectionException(ex);
}
}
+
}
