[camel] branch master updated: CAMEL-13124: camel3 - move xslt componet out of camel-core

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new cc827cb  CAMEL-13124: camel3 - move xslt componet out of camel-core
cc827cb is described below

commit cc827cbc8cf930ba2f6f0f41b00df1d16bfa1b3c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 29 08:04:31 2019 +0100

    CAMEL-13124: camel3 - move xslt componet out of camel-core
---
 .../main/java/org/apache/camel/builder/AggregationStrategies.java | 7 -------
 .../org/apache/camel/component/xslt}/XsltAggregationStrategy.java | 8 +-------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java b/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
index 68cbfa1..88fb01b 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
@@ -142,11 +142,4 @@ public final class AggregationStrategies {
         return adapter;
     }
 
-    /**
-     * Creates a {@link XsltAggregationStrategy} as the aggregation strategy.
-     */
-    public static XsltAggregationStrategy xslt(String xslFileLocation) {
-        return XsltAggregationStrategy.create(xslFileLocation);
-    }
-
 }
diff --git a/camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltAggregationStrategy.java
similarity index 95%
rename from camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java
rename to components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltAggregationStrategy.java
index 16862b2..6cab613 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java
+++ b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltAggregationStrategy.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.builder;
+package org.apache.camel.component.xslt;
 
 import java.io.IOException;
 import java.util.concurrent.RejectedExecutionException;
@@ -30,10 +30,6 @@ import org.apache.camel.AggregationStrategy;
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.Exchange;
-import org.apache.camel.component.xslt.XsltBuilder;
-import org.apache.camel.component.xslt.XsltUriResolver;
-import org.apache.camel.component.xslt.XsltEndpoint;
-import org.apache.camel.component.xslt.XsltOutput;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
@@ -66,8 +62,6 @@ import org.slf4j.LoggerFactory;
  */
 public class XsltAggregationStrategy extends ServiceSupport implements AggregationStrategy, CamelContextAware {
 
-    // TODO: move to camel-xslt in org.apache.camel.component.xslt package (not having split osgi packages)
-
     private static final Logger LOG = LoggerFactory.getLogger(XsltAggregationStrategy.class);
     private static final String DEFAULT_PROPERTY_NAME = "new-exchange";