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 2019/04/22 15:03:32 UTC

[camel] branch master updated (d49dff6 -> 35b1bab)

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

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


    from d49dff6  CAMEL-13425: Properties component can now clear its cache, also added JMX attributes/operations.
     new 6f25214  camel3 - a little bit more modularization
     new 35b1bab  CAMEL-13113: Remove camel-script component

The 36708 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 MIGRATION.md                                       |   4 +
 apache-camel/pom.xml                               |  10 -
 apache-camel/src/main/descriptors/common-bin.xml   |   2 -
 bom/camel-bom/pom.xml                              |  10 -
 .../camel-jooq/src/main/docs/jooq-component.adoc   |   8 +-
 .../camel/component/mock/MockExpressionClause.java |  14 -
 .../mock/MockExpressionClauseSupport.java          |  14 -
 components/camel-script/pom.xml                    | 127 -----
 .../src/main/docs/javaScript-language.adoc         | 212 --------
 .../camel-script/src/main/docs/php-language.adoc   | 151 ------
 .../src/main/docs/python-language.adoc             | 184 -------
 .../camel-script/src/main/docs/ruby-language.adoc  | 184 -------
 components/camel-script/src/main/docs/script.adoc  |  87 ----
 .../org/apache/camel/builder/script/Groovy.java    |  37 --
 .../apache/camel/builder/script/JavaScript.java    |  37 --
 .../camel/builder/script/JavaScriptLanguage.java   |  47 --
 .../camel/builder/script/PropertiesFunction.java   |  32 --
 .../apache/camel/builder/script/ScriptBuilder.java | 556 ---------------------
 .../builder/script/ScriptEvaluationException.java  |  38 --
 .../camel/builder/script/ScriptLanguage.java       |  40 --
 .../builder/script/ScriptLanguageResolver.java     |  33 --
 .../builder/script/ScriptPropertiesFunction.java   |  47 --
 .../org/apache/camel/script/osgi/Activator.java    | 297 -----------
 .../org/apache/camel/language/resolver/default     |  18 -
 .../builder/script/BeanShellScriptRouteTest.java   |  67 ---
 .../script/GroovyExpressionListMapTest.java        |  58 ---
 .../script/GroovyPropertiesFunctionTest.java       |  53 --
 .../script/GroovyPropertyComponentTest.java        |  55 --
 .../builder/script/GroovyScriptRouteTest.java      |  49 --
 .../GroovySetHeaderPropertyComponentTest.java      |  67 ---
 .../script/JavaScriptExpressionListMapTest.java    |  58 ---
 .../builder/script/JavaScriptExpressionTest.java   | 165 ------
 .../script/JavaScriptPropertiesFunctionTest.java   |  53 --
 .../apache/camel/builder/script/Jsr223Test.java    |  36 --
 .../script/LanguageJavaScriptNoCacheTest.java      |  51 --
 .../builder/script/LanguageJavaScriptTest.java     |  51 --
 .../camel/builder/script/RubyScriptTextTest.java   |  82 ---
 .../camel/builder/script/ScriptBuilderTest.java    |  53 --
 .../camel/builder/script/WireTapLogTest.java       |  44 --
 .../script/example/AnyLanguageFilterTest.java      |  43 --
 .../script/example/BeanShellFilterTest.java        |  43 --
 .../builder/script/example/GroovyFilterTest.java   |  42 --
 .../script/example/JavaScriptFilterTest.java       |  43 --
 .../builder/script/example/XPathFilterTest.java    |  48 --
 .../language/script/JavaScriptLanguageTest.java    |  33 --
 .../script/ScriptLanguageResourceTest.java         |  49 --
 .../apache/camel/script/osgi/ActivatorTest.java    |  73 ---
 .../src/test/resources/log4j2.properties           |  30 --
 .../src/test/resources/myjavascript.js             |  17 -
 .../builder/script/example/anyLanguageFilter.xml   |  39 --
 .../builder/script/example/beanShellFilter.xml     |  39 --
 .../camel/builder/script/example/groovyFilter.xml  |  39 --
 .../builder/script/example/javaScriptFilter.xml    |  39 --
 .../camel/builder/script/example/mygroovy.txt      |   1 -
 .../camel/builder/script/myproperties.properties   |  21 -
 components/pom.xml                                 |   1 -
 components/readme.adoc                             |   4 +-
 .../org/apache/camel/builder/ExpressionClause.java |  14 -
 .../camel/builder/ExpressionClauseSupport.java     |  15 -
 .../camel/builder/FlexibleAggregationStrategy.java |   2 +-
 .../org/apache/camel/builder/SimpleBuilder.java    |  24 +-
 .../apache/camel/language/bean/BeanExpression.java |   2 +-
 .../camel/model/language/ExpressionDefinition.java |   2 +-
 .../camel/model/language/JavaScriptExpression.java |  47 --
 .../org/apache/camel/model/routeWithChoice.xml     |   4 +-
 .../org/apache/camel/support}/ScriptHelper.java    |   7 +-
 docs/components/modules/ROOT/nav.adoc              |   5 -
 .../modules/ROOT/pages/javaScript-language.adoc    | 212 --------
 .../modules/ROOT/pages/jooq-component.adoc         |  47 +-
 .../modules/ROOT/pages/php-language.adoc           | 151 ------
 .../modules/ROOT/pages/python-language.adoc        | 184 -------
 .../modules/ROOT/pages/ruby-language.adoc          | 184 -------
 docs/components/modules/ROOT/pages/script.adoc     |  87 ----
 examples/camel-example-simplejirabot/README.md     |  44 --
 .../camel-example-simplejirabot/javadsl/pom.xml    |  35 --
 .../apache/camel/example/rss/MyRouteBuilder.java   |  42 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 --------
 .../javadsl/src/main/resources/META-INF/NOTICE.txt |  11 -
 .../resources/META-INF/spring/camel-context.xml    |  36 --
 .../javadsl/src/main/resources/log4j2.properties   |  23 -
 examples/camel-example-simplejirabot/pom.xml       | 130 -----
 .../camel-example-simplejirabot/xmlconf/pom.xml    |  35 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 --------
 .../xmlconf/src/main/resources/META-INF/NOTICE.txt |  11 -
 .../resources/META-INF/spring/camel-context.xml    |  48 --
 .../xmlconf/src/main/resources/log4j2.properties   |  23 -
 examples/pom.xml                                   |   1 -
 parent/pom.xml                                     |  10 -
 .../karaf/features/src/main/resources/features.xml |  25 -
 .../camel-script-starter/pom.xml                   |  53 --
 .../JavaScriptLanguageAutoConfiguration.java       | 117 -----
 .../JavaScriptLanguageConfiguration.java           |  52 --
 .../src/main/resources/META-INF/LICENSE.txt        | 203 --------
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../additional-spring-configuration-metadata.json  |  10 -
 .../src/main/resources/META-INF/spring.factories   |  20 -
 .../src/main/resources/META-INF/spring.provides    |  17 -
 platforms/spring-boot/components-starter/pom.xml   |   1 -
 .../camel-spring-boot-dependencies/pom.xml         |  10 -
 .../apache/camel/itest/karaf/CamelScriptTest.java  |  34 --
 .../org/apache/camel/itest/CamelGroovyTest.java    |   2 +-
 .../camel/itest/springboot/CamelScriptTest.java    |  49 --
 ...pdateSpringBootAutoConfigurationReadmeMojo.java |   2 -
 103 files changed, 76 insertions(+), 6107 deletions(-)
 delete mode 100644 components/camel-script/pom.xml
 delete mode 100644 components/camel-script/src/main/docs/javaScript-language.adoc
 delete mode 100644 components/camel-script/src/main/docs/php-language.adoc
 delete mode 100644 components/camel-script/src/main/docs/python-language.adoc
 delete mode 100644 components/camel-script/src/main/docs/ruby-language.adoc
 delete mode 100644 components/camel-script/src/main/docs/script.adoc
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/Groovy.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScript.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScriptLanguage.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/PropertiesFunction.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptEvaluationException.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptPropertiesFunction.java
 delete mode 100644 components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
 delete mode 100644 components/camel-script/src/main/resources/META-INF/services/org/apache/camel/language/resolver/default
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertiesFunctionTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertyComponentTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/GroovySetHeaderPropertyComponentTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptPropertiesFunctionTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/ScriptBuilderTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/WireTapLogTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/builder/script/example/XPathFilterTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/language/script/ScriptLanguageResourceTest.java
 delete mode 100644 components/camel-script/src/test/java/org/apache/camel/script/osgi/ActivatorTest.java
 delete mode 100644 components/camel-script/src/test/resources/log4j2.properties
 delete mode 100644 components/camel-script/src/test/resources/myjavascript.js
 delete mode 100644 components/camel-script/src/test/resources/org/apache/camel/builder/script/example/anyLanguageFilter.xml
 delete mode 100644 components/camel-script/src/test/resources/org/apache/camel/builder/script/example/beanShellFilter.xml
 delete mode 100644 components/camel-script/src/test/resources/org/apache/camel/builder/script/example/groovyFilter.xml
 delete mode 100644 components/camel-script/src/test/resources/org/apache/camel/builder/script/example/javaScriptFilter.xml
 delete mode 100644 components/camel-script/src/test/resources/org/apache/camel/builder/script/example/mygroovy.txt
 delete mode 100644 components/camel-script/src/test/resources/org/apache/camel/builder/script/myproperties.properties
 delete mode 100644 core/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
 rename core/{camel-core/src/main/java/org/apache/camel/builder => camel-support/src/main/java/org/apache/camel/support}/ScriptHelper.java (94%)
 delete mode 100644 docs/components/modules/ROOT/pages/javaScript-language.adoc
 delete mode 100644 docs/components/modules/ROOT/pages/php-language.adoc
 delete mode 100644 docs/components/modules/ROOT/pages/python-language.adoc
 delete mode 100644 docs/components/modules/ROOT/pages/ruby-language.adoc
 delete mode 100644 docs/components/modules/ROOT/pages/script.adoc
 delete mode 100644 examples/camel-example-simplejirabot/README.md
 delete mode 100644 examples/camel-example-simplejirabot/javadsl/pom.xml
 delete mode 100644 examples/camel-example-simplejirabot/javadsl/src/main/java/org/apache/camel/example/rss/MyRouteBuilder.java
 delete mode 100644 examples/camel-example-simplejirabot/javadsl/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 examples/camel-example-simplejirabot/javadsl/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 examples/camel-example-simplejirabot/javadsl/src/main/resources/META-INF/spring/camel-context.xml
 delete mode 100644 examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j2.properties
 delete mode 100644 examples/camel-example-simplejirabot/pom.xml
 delete mode 100644 examples/camel-example-simplejirabot/xmlconf/pom.xml
 delete mode 100644 examples/camel-example-simplejirabot/xmlconf/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 examples/camel-example-simplejirabot/xmlconf/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 examples/camel-example-simplejirabot/xmlconf/src/main/resources/META-INF/spring/camel-context.xml
 delete mode 100644 examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j2.properties
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/pom.xml
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageAutoConfiguration.java
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageConfiguration.java
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/resources/META-INF/spring.factories
 delete mode 100644 platforms/spring-boot/components-starter/camel-script-starter/src/main/resources/META-INF/spring.provides
 delete mode 100644 tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
 delete mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelScriptTest.java