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 2023/12/12 15:32:21 UTC
(camel) 01/07: CAMEL-20141: Consolidate camel-joor and camel-java-joor-dsl
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch joor
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8fb024f1711c75c870e5673dfb149cc1125707d8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 12 11:54:58 2023 +0100
CAMEL-20141: Consolidate camel-joor and camel-java-joor-dsl
---
.../java/org/apache/camel/language}/joor/ByteArrayClassLoader.java | 2 +-
.../main/java/org/apache/camel/language}/joor/CompilationUnit.java | 4 ++--
.../java/org/apache/camel/language}/joor/JavaJoorClassLoader.java | 2 +-
.../java/org/apache/camel/language/joor/JoorScriptingCompiler.java | 2 ++
.../src/main/java/org/apache/camel/language}/joor/MultiCompile.java | 2 +-
.../java/org/apache/camel/language}/joor/CompilationUnitTest.java | 2 +-
dsl/camel-java-joor-dsl/pom.xml | 6 ++----
.../org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 3 +++
8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ByteArrayClassLoader.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/ByteArrayClassLoader.java
similarity index 97%
rename from dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ByteArrayClassLoader.java
rename to components/camel-joor/src/main/java/org/apache/camel/language/joor/ByteArrayClassLoader.java
index ed6f8d8914c..3e415342392 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/ByteArrayClassLoader.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/ByteArrayClassLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.java.joor;
+package org.apache.camel.language.joor;
import java.util.Map;
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/CompilationUnit.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/CompilationUnit.java
similarity index 97%
rename from dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/CompilationUnit.java
rename to components/camel-joor/src/main/java/org/apache/camel/language/joor/CompilationUnit.java
index 3f802eafc50..5f3f677e559 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/CompilationUnit.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/CompilationUnit.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.java.joor;
+package org.apache.camel.language.joor;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -108,7 +108,7 @@ public class CompilationUnit {
return this;
}
- Map<String, String> getInput() {
+ public Map<String, String> getInput() {
return files;
}
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
similarity index 98%
rename from dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
rename to components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
index c1fa8a50573..16ba5a91f1c 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.java.joor;
+package org.apache.camel.language.joor;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java
index 1be6bc8e29c..c41335ac9b7 100644
--- a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorScriptingCompiler.java
@@ -41,6 +41,8 @@ import org.slf4j.LoggerFactory;
public class JoorScriptingCompiler extends ServiceSupport implements StaticService {
+ // TODO: Use MultiCompile
+
private static final Pattern BEAN_INJECTION_PATTERN = Pattern.compile("(#bean:)([A-Za-z0-9-_]*)");
private static final Logger LOG = LoggerFactory.getLogger(JoorScriptingCompiler.class);
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java b/components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java
similarity index 99%
rename from dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
rename to components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java
index 24984f7ad82..7a5e07f387a 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
+++ b/components/camel-joor/src/main/java/org/apache/camel/language/joor/MultiCompile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.java.joor;
+package org.apache.camel.language.joor;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/CompilationUnitTest.java b/components/camel-joor/src/test/java/org/apache/camel/language/joor/CompilationUnitTest.java
similarity index 98%
rename from dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/CompilationUnitTest.java
rename to components/camel-joor/src/test/java/org/apache/camel/language/joor/CompilationUnitTest.java
index 5987cd13235..f1f3b73ab08 100644
--- a/dsl/camel-java-joor-dsl/src/test/java/org/apache/camel/dsl/java/joor/CompilationUnitTest.java
+++ b/components/camel-joor/src/test/java/org/apache/camel/language/joor/CompilationUnitTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dsl.java.joor;
+package org.apache.camel.language.joor;
import java.util.Set;
diff --git a/dsl/camel-java-joor-dsl/pom.xml b/dsl/camel-java-joor-dsl/pom.xml
index c73369265d3..2f7d750f220 100644
--- a/dsl/camel-java-joor-dsl/pom.xml
+++ b/dsl/camel-java-joor-dsl/pom.xml
@@ -49,11 +49,9 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-dsl-support</artifactId>
</dependency>
-
<dependency>
- <groupId>org.jooq</groupId>
- <artifactId>joor</artifactId>
- <version>${joor-version}</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-joor</artifactId>
</dependency>
<dependency>
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
index b3605946ff7..83188ac5e09 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
@@ -34,6 +34,9 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dsl.support.ExtendedRouteBuilderLoaderSupport;
+import org.apache.camel.language.joor.CompilationUnit;
+import org.apache.camel.language.joor.JavaJoorClassLoader;
+import org.apache.camel.language.joor.MultiCompile;
import org.apache.camel.spi.CompilePostProcessor;
import org.apache.camel.spi.CompileStrategy;
import org.apache.camel.spi.Resource;