Author: davsclaus
Date: Tue Sep 27 07:05:57 2011
New Revision: 1176238
URL: http://svn.apache.org/viewvc?rev=1176238&view=rev
Log:
CAMEL-4490: Preparing for restoring ResourceBasedEndpoint in camel-spring to be
100% backwards compatible.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
- copied, changed from r1176207,
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/package.html
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
Modified:
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
(from r1176207,
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java&r1=1176207&r2=1176238&rev=1176238&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceBasedEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
Tue Sep 27 07:05:57 2011
@@ -32,16 +32,16 @@ import org.slf4j.LoggerFactory;
* A useful base class for endpoints which depend on a resource
* such as things like Velocity or XQuery based components.
*/
-public class ResourceBasedEndpoint extends ProcessorEndpoint {
+public abstract class ResourceEndpoint extends ProcessorEndpoint {
protected final transient Logger log = LoggerFactory.getLogger(getClass());
private String resourceUri;
private boolean contentCache;
private byte[] buffer;
- public ResourceBasedEndpoint() {
+ public ResourceEndpoint() {
}
- public ResourceBasedEndpoint(String endpointUri, Component component,
String resourceUri) {
+ public ResourceEndpoint(String endpointUri, Component component, String
resourceUri) {
super(endpointUri, component);
this.resourceUri = resourceUri;
}
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/package.html
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/package.html?rev=1176238&view=auto
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/package.html
(added)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/package.html
Tue Sep 27 07:05:57 2011
@@ -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 Components
+
+</body>
+</html>
Modified:
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java?rev=1176238&r1=1176237&r2=1176238&view=diff
==============================================================================
---
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
(original)
+++
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
Tue Sep 27 07:05:57 2011
@@ -28,14 +28,14 @@ import org.apache.camel.Component;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
-import org.apache.camel.component.ResourceBasedEndpoint;
+import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
/**
* Freemarker endpoint
*/
-public class FreemarkerEndpoint extends ResourceBasedEndpoint {
+public class FreemarkerEndpoint extends ResourceEndpoint {
private String encoding;
private Configuration configuration;
Modified:
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java?rev=1176238&r1=1176237&r2=1176238&view=diff
==============================================================================
---
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
(original)
+++
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
Tue Sep 27 07:05:57 2011
@@ -26,13 +26,13 @@ import org.apache.camel.Component;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
-import org.apache.camel.component.ResourceBasedEndpoint;
+import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.util.ExchangeHelper;
/**
* @version
*/
-public class StringTemplateEndpoint extends ResourceBasedEndpoint {
+public class StringTemplateEndpoint extends ResourceEndpoint {
public StringTemplateEndpoint() {
}
Modified:
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=1176238&r1=1176237&r2=1176238&view=diff
==============================================================================
---
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
(original)
+++
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
Tue Sep 27 07:05:57 2011
@@ -28,7 +28,7 @@ import java.util.Properties;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
-import org.apache.camel.component.ResourceBasedEndpoint;
+import org.apache.camel.component.ResourceEndpoint;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -42,7 +42,7 @@ import org.apache.velocity.runtime.log.C
/**
* @version
*/
-public class VelocityEndpoint extends ResourceBasedEndpoint {
+public class VelocityEndpoint extends ResourceEndpoint {
private VelocityEngine velocityEngine;
private boolean loaderCache = true;
private String encoding;