Author: davsclaus
Date: Thu Jul 30 10:56:53 2009
New Revision: 799236
URL: http://svn.apache.org/viewvc?rev=799236&view=rev
Log:
renamed last type to definition
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
(contents, props changed)
- copied, changed from r799205,
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?rev=799236&r1=799235&r2=799236&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
Thu Jul 30 10:56:53 2009
@@ -33,7 +33,7 @@
*/
@XmlRootElement(name = "from")
@XmlAccessorType(XmlAccessType.FIELD)
-public class FromDefinition extends OptionalIdentifiedType<FromDefinition> {
+public class FromDefinition extends
OptionalIdentifiedDefinition<FromDefinition> {
@XmlAttribute
private String uri;
@XmlAttribute
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
(from r799205,
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java&r1=799205&r2=799236&rev=799236&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
Thu Jul 30 10:56:53 2009
@@ -30,14 +30,16 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.camel.CamelContext;
+
/**
* Allows an element to have an optional ID specified
*
* @version $Revision$
*/
-...@xmltype(name = "optionalIdentifiedType")
+...@xmltype(name = "optionalIdentifiedDefinition")
@XmlAccessorType(XmlAccessType.FIELD)
-public abstract class OptionalIdentifiedType<T extends OptionalIdentifiedType>
{
+public abstract class OptionalIdentifiedDefinition<T extends
OptionalIdentifiedDefinition> {
@XmlTransient
protected static Map<String, AtomicInteger> nodeCounters = new
HashMap<String, AtomicInteger>();
@XmlAttribute(required = false)
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=799236&r1=799235&r2=799236&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
Thu Jul 30 10:56:53 2009
@@ -71,7 +71,7 @@
* @version $Revision$
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
-public abstract class ProcessorDefinition<Type extends ProcessorDefinition>
extends OptionalIdentifiedType<Type> implements Block {
+public abstract class ProcessorDefinition<Type extends ProcessorDefinition>
extends OptionalIdentifiedDefinition<Type> implements Block {
protected final transient Log log = LogFactory.getLog(getClass());
private ErrorHandlerBuilder errorHandlerBuilder;
private NodeFactory nodeFactory;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java?rev=799236&r1=799235&r2=799236&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
Thu Jul 30 10:56:53 2009
@@ -36,7 +36,7 @@
*/
@XmlRootElement(name = "routes")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RoutesDefinition extends OptionalIdentifiedType<RoutesDefinition>
implements RouteContainer {
+public class RoutesDefinition extends
OptionalIdentifiedDefinition<RoutesDefinition> implements RouteContainer {
@XmlElementRef
private List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
@XmlTransient
Modified:
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index?rev=799236&r1=799235&r2=799236&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
(original)
+++ camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
Thu Jul 30 10:56:53 2009
@@ -41,7 +41,7 @@
MulticastDefinition
OnCompletionDefinition
OnExceptionDefinition
-OptionalIdentifiedType
+OptionalIdentifiedDefinition
OtherwiseDefinition
PackageScanDefinition
PipelineDefinition
