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 2017/02/14 18:20:17 UTC
[1/4] camel git commit: CAMEL-10828: camel-catalog-nexus - Initial
work
Repository: camel
Updated Branches:
refs/heads/master bb25ff806 -> 39926008f
CAMEL-10828: camel-catalog-nexus - Initial work
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbbe4b4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbbe4b4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbbe4b4c
Branch: refs/heads/master
Commit: fbbe4b4cc4cce218c86c9a2c5c067c3a6584cf70
Parents: b4f9c7e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 14 15:44:35 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 19:11:59 2017 +0100
----------------------------------------------------------------------
platforms/catalog-nexus/pom.xml | 1 -
.../catalog/nexus/BaseNexusRepository.java | 54 ++++++++++++--------
.../catalog/nexus/LocalFileNexusRepository.java | 31 +++++++++++
.../catalog/nexus/LocalNexusRepositoryTest.java | 53 +++++++++++++++++++
.../src/test/resources/log4j2.properties | 28 ++++++++++
.../src/test/resources/nexus-sample-result.xml | 37 ++++++++++++++
6 files changed, 183 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fbbe4b4c/platforms/catalog-nexus/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/pom.xml b/platforms/catalog-nexus/pom.xml
index 97d7d61..e3bfe15 100644
--- a/platforms/catalog-nexus/pom.xml
+++ b/platforms/catalog-nexus/pom.xml
@@ -75,7 +75,6 @@
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/camel/blob/fbbe4b4c/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
index 77cf43f..25b7b07 100644
--- a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
@@ -19,6 +19,7 @@ package org.apache.camel.catalog.nexus;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -49,7 +50,8 @@ public abstract class BaseNexusRepository {
private AtomicBoolean started = new AtomicBoolean();
private CamelCatalog camelCatalog;
- private Long delay = 60L; // use 60 second delay between index runs
+ private int initialDelay = 10;
+ private int delay = 60;
private String nexusUrl = "http://nexus/service/local/data_index";
private String classifier;
@@ -77,14 +79,25 @@ public abstract class BaseNexusRepository {
this.nexusUrl = nexusUrl;
}
- public Long getDelay() {
+ public int getInitialDelay() {
+ return initialDelay;
+ }
+
+ /**
+ * Delay in seconds before the initial (first) scan.
+ */
+ public void setInitialDelay(int initialDelay) {
+ this.initialDelay = initialDelay;
+ }
+
+ public int getDelay() {
return delay;
}
/**
* Delay in seconds between scanning.
*/
- public void setDelay(Long delay) {
+ public void setDelay(int delay) {
this.delay = delay;
}
@@ -107,19 +120,18 @@ public abstract class BaseNexusRepository {
throw new IllegalArgumentException("CamelCatalog must be configured");
}
- if (started.compareAndSet(false, true)) {
- log.info("NexusRepository is already started");
+ if (nexusUrl == null || nexusUrl.isEmpty()) {
+ log.warn("Nexus service not found. Indexing Nexus is not enabled!");
return;
}
- log.info("Starting NexusRepository");
-
- if (nexusUrl == null || nexusUrl.isEmpty()) {
- log.warn("Nexus service not found. Indexing Nexus is not enabled!");
+ if (!started.compareAndSet(false, true)) {
+ log.info("NexusRepository is already started");
return;
}
- log.info("Indexing Nexus every {} seconds interval", delay);
+ log.info("Starting NexusRepository to scan every {} seconds", delay);
+
executorService = Executors.newScheduledThreadPool(1);
executorService.scheduleWithFixedDelay(() -> {
@@ -136,7 +148,7 @@ public abstract class BaseNexusRepository {
} finally {
log.debug("Indexing Nexus {} +++ end +++", nexusUrl);
}
- }, 10, delay, TimeUnit.SECONDS);
+ }, initialDelay, delay, TimeUnit.SECONDS);
}
/**
@@ -158,13 +170,16 @@ public abstract class BaseNexusRepository {
*/
abstract void onNewArtifacts(Set<NexusArtifactDto> newArtifacts);
+ protected URL createNexusUrl() throws MalformedURLException {
+ String query = nexusUrl + "?q=" + getClassifier();
+ return new URL(query);
+ }
+
/**
* Runs the task to index nexus for new artifacts
*/
protected void indexNexus() throws Exception {
// must have q parameter so use component to find all component
- String query = nexusUrl + "?q=" + getClassifier();
- URL url = new URL(query);
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
@@ -173,24 +188,23 @@ public abstract class BaseNexusRepository {
DocumentBuilder documentBuilder = factory.newDocumentBuilder();
+ URL url = createNexusUrl();
InputStream is = url.openStream();
try {
Document dom = documentBuilder.parse(is);
XPathFactory xpFactory = XPathFactory.newInstance();
XPath exp = xpFactory.newXPath();
- // TODO: we dont have classifier for components
- NodeList list = (NodeList) exp.evaluate("//classifier[text() = '" + getClassifier() + "']", dom, XPathConstants.NODESET);
+ NodeList list = (NodeList) exp.evaluate("//data/artifact", dom, XPathConstants.NODESET);
Set<NexusArtifactDto> newArtifacts = new LinkedHashSet<>();
for (int i = 0; i < list.getLength(); i++) {
Node node = list.item(i);
- Node parent = node.getParentNode();
- String g = getNodeText(parent.getChildNodes(), "groupId");
- String a = getNodeText(parent.getChildNodes(), "artifactId");
- String v = getNodeText(parent.getChildNodes(), "version");
- String l = getNodeText(parent.getChildNodes(), "artifactLink");
+ String g = getNodeText(node.getChildNodes(), "groupId");
+ String a = getNodeText(node.getChildNodes(), "artifactId");
+ String v = getNodeText(node.getChildNodes(), "version");
+ String l = getNodeText(node.getChildNodes(), "artifactLink");
if (g != null & a != null & v != null & l != null) {
NexusArtifactDto dto = new NexusArtifactDto();
http://git-wip-us.apache.org/repos/asf/camel/blob/fbbe4b4c/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
new file mode 100644
index 0000000..dd10306
--- /dev/null
+++ b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
@@ -0,0 +1,31 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
+package org.apache.camel.catalog.nexus;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class LocalFileNexusRepository extends ComponentNexusRepository {
+
+ @Override
+ protected URL createNexusUrl() throws MalformedURLException {
+ File file = new File("src/test/resources/nexus-sample-result.xml");
+ return new URL("file:" + file.getAbsolutePath());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/fbbe4b4c/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
new file mode 100644
index 0000000..7f7d7c5
--- /dev/null
+++ b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
@@ -0,0 +1,53 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
+package org.apache.camel.catalog.nexus;
+
+import junit.framework.TestCase;
+import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.junit.Test;
+
+public class LocalNexusRepositoryTest extends TestCase {
+
+ private LocalFileNexusRepository repo = new LocalFileNexusRepository();
+ private CamelCatalog catalog = new DefaultCamelCatalog();
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ repo.setCamelCatalog(catalog);
+ repo.setInitialDelay(1);
+ repo.setNexusUrl("dummy");
+ }
+
+ @Test
+ public void testLocalNexus() throws Exception {
+ int before = catalog.findComponentNames().size();
+
+ repo.start();
+
+ // TODO: wait 5 sec
+ Thread.sleep(5000);
+
+ repo.stop();
+
+ int after = catalog.findComponentNames().size();
+
+ assertTrue("There should be 1 component found", after - before == 1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/fbbe4b4c/platforms/catalog-nexus/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/test/resources/log4j2.properties b/platforms/catalog-nexus/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..775c567
--- /dev/null
+++ b/platforms/catalog-nexus/src/test/resources/log4j2.properties
@@ -0,0 +1,28 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-catalog-nexus-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+rootLogger.level = INFO
+rootLogger.appenderRef.file.ref = file
http://git-wip-us.apache.org/repos/asf/camel/blob/fbbe4b4c/platforms/catalog-nexus/src/test/resources/nexus-sample-result.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/test/resources/nexus-sample-result.xml b/platforms/catalog-nexus/src/test/resources/nexus-sample-result.xml
new file mode 100644
index 0000000..16b60b0
--- /dev/null
+++ b/platforms/catalog-nexus/src/test/resources/nexus-sample-result.xml
@@ -0,0 +1,37 @@
+<!--
+ 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.
+-->
+<search-results>
+ <totalCount>1</totalCount>
+ <from>-1</from>
+ <count>-1</count>
+ <tooManyResults>false</tooManyResults>
+ <data>
+ <artifact>
+ <resourceURI>http://nexus.dummy/service/local/repositories/staging/content/org/foo/beverage-component/2.19.0/beverage-component-2.19.0.jar</resourceURI>
+ <groupId>org.foo</groupId>
+ <artifactId>beverage-component</artifactId>
+ <version>2.19.0</version>
+ <packaging>jar</packaging>
+ <extension>jar</extension>
+ <repoId>staging</repoId>
+ <contextId>Staging</contextId>
+ <pomLink>http://nexus.dummy/service/local/artifact/maven/redirect?r=staging&g=org.foo&a=beverage-component&v=2.19.0&e=pom</pomLink>
+ <artifactLink>http://nexus.dummy/service/local/artifact/maven/redirect?r=staging&g=org.foo&a=beverage-component&v=2.19.0&e=jar</artifactLink>
+ <highlightedFragment><blockquote>Artifact ID<UL><LI>beverage-<B>component</B></LI></UL></blockquote></highlightedFragment>
+ </artifact>
+ </data>
+</search-results>
\ No newline at end of file
[3/4] camel git commit: CAMEL-10828: camel-catalog-nexus - Initial
work
Posted by da...@apache.org.
CAMEL-10828: camel-catalog-nexus - Initial work
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a54d2cca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a54d2cca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a54d2cca
Branch: refs/heads/master
Commit: a54d2cca6589d751596121e3197bcc910c97ddb3
Parents: bb25ff8
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 14 14:41:27 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 19:11:59 2017 +0100
----------------------------------------------------------------------
platforms/catalog-nexus/pom.xml | 93 ++++++++
.../catalog/nexus/BaseNexusRepository.java | 233 +++++++++++++++++++
.../camel/catalog/nexus/NexusArtifactDto.java | 111 +++++++++
.../camel/catalog/nexus/NexusRepository.java | 35 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
platforms/pom.xml | 1 +
7 files changed, 687 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/catalog-nexus/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/pom.xml b/platforms/catalog-nexus/pom.xml
new file mode 100644
index 0000000..97d7d61
--- /dev/null
+++ b/platforms/catalog-nexus/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ 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.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>platforms</artifactId>
+ <version>2.19.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-catalog-nexus</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Platforms :: Catalog :: Nexus</name>
+ <description>Camel Catalog Nexus</description>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.catalog.nexus
+ </camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-catalog-provider-springboot</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
new file mode 100644
index 0000000..88e5a0c
--- /dev/null
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
@@ -0,0 +1,233 @@
+/**
+ * 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.
+ */
+package org.apache.camel.catalog.nexus;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public abstract class BaseNexusRepository {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private final Set<NexusArtifactDto> indexedArtifacts = new LinkedHashSet<>();
+
+ private volatile ScheduledExecutorService executorService;
+ private AtomicBoolean started = new AtomicBoolean();
+
+ private Long delay = 60L; // use 60 second delay between index runs
+ private String nexusUrl = "http://nexus/service/local/data_index";
+ private String classifier = "component";
+
+ public String getNexusUrl() {
+ return nexusUrl;
+ }
+
+ /**
+ * The URL to the Nexus repository to query. The syntax should be <tt>http://nexus/service/local/data_index</tt>, where
+ * nexus is the hostname.
+ */
+ public void setNexusUrl(String nexusUrl) {
+ this.nexusUrl = nexusUrl;
+ }
+
+ public Long getDelay() {
+ return delay;
+ }
+
+ /**
+ * Delay in seconds between scanning.
+ */
+ public void setDelay(Long delay) {
+ this.delay = delay;
+ }
+
+ public String getClassifier() {
+ return classifier;
+ }
+
+ /**
+ * Classifier to index. Should be either <tt>component</tt>, or <tt>connector</tt>
+ */
+ public void setClassifier(String classifier) {
+ this.classifier = classifier;
+ }
+
+ /**
+ * Starts the Nexus indexer.
+ */
+ public void start() {
+ if (started.compareAndSet(false, true)) {
+ log.info("NexusRepository is already started");
+ return;
+ }
+
+ log.info("Starting NexusRepository");
+
+ if (nexusUrl == null || nexusUrl.isEmpty()) {
+ log.warn("Nexus service not found. Indexing Nexus is not enabled!");
+ return;
+ }
+
+ log.info("Indexing Nexus every {} seconds interval", delay);
+ executorService = Executors.newScheduledThreadPool(1);
+
+ executorService.scheduleWithFixedDelay(() -> {
+ try {
+ log.debug("Indexing Nexus {} +++ start +++", nexusUrl);
+ indexNexus();
+ } catch (Throwable e) {
+ if (e.getMessage().contains("UnknownHostException")) {
+ // less noise if its unknown host
+ log.warn("Error indexing Nexus " + nexusUrl + " due unknown hosts: " + e.getMessage());
+ } else {
+ log.warn("Error indexing Nexus " + nexusUrl + " due " + e.getMessage(), e);
+ }
+ } finally {
+ log.debug("Indexing Nexus {} +++ end +++", nexusUrl);
+ }
+ }, 10, delay, TimeUnit.SECONDS);
+ }
+
+ /**
+ * Stops the Nexus indexer.
+ */
+ public void stop() {
+ log.info("Stopping NexusRepository");
+ if (executorService != null) {
+ executorService.shutdownNow();
+ executorService = null;
+ }
+ indexedArtifacts.clear();
+
+ started.set(false);
+ }
+
+ /**
+ * Callback when new artifacts has been discovered in Nexus
+ */
+ abstract void onNewArtifacts(Set<NexusArtifactDto> newArtifacts);
+
+ /**
+ * Runs the task to index nexus for new artifacts
+ */
+ protected void indexNexus() throws Exception {
+ // must have q parameter so use component to find all component
+ String query = nexusUrl + "?q=" + getClassifier();
+ URL url = new URL(query);
+
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setIgnoringElementContentWhitespace(true);
+ factory.setIgnoringComments(true);
+
+ DocumentBuilder documentBuilder = factory.newDocumentBuilder();
+
+ InputStream is = url.openStream();
+ try {
+ Document dom = documentBuilder.parse(is);
+
+ XPathFactory xpFactory = XPathFactory.newInstance();
+ XPath exp = xpFactory.newXPath();
+ // TODO: we dont have classifier for components
+ NodeList list = (NodeList) exp.evaluate("//classifier[text() = '" + getClassifier() + "']", dom, XPathConstants.NODESET);
+
+ Set<NexusArtifactDto> newArtifacts = new LinkedHashSet<>();
+ for (int i = 0; i < list.getLength(); i++) {
+ Node node = list.item(i);
+ Node parent = node.getParentNode();
+
+ String g = getNodeText(parent.getChildNodes(), "groupId");
+ String a = getNodeText(parent.getChildNodes(), "artifactId");
+ String v = getNodeText(parent.getChildNodes(), "version");
+ String l = getNodeText(parent.getChildNodes(), "artifactLink");
+
+ if (g != null & a != null & v != null & l != null) {
+ NexusArtifactDto dto = new NexusArtifactDto();
+ dto.setGroupId(g);
+ dto.setArtifactId(a);
+ dto.setVersion(v);
+ dto.setArtifactLink(l);
+
+ log.debug("Found: {}:{}:{}", dto.getGroupId(), dto.getArtifactId(), dto.getVersion());
+
+ // is it a new artifact
+ boolean newArtifact = true;
+ for (NexusArtifactDto existing : indexedArtifacts) {
+ if (existing.getGroupId().equals(dto.getGroupId())
+ && existing.getArtifactId().equals(dto.getArtifactId())
+ && existing.getVersion().equals(dto.getVersion())) {
+ newArtifact = false;
+ break;
+ }
+ }
+ if (newArtifact) {
+ newArtifacts.add(dto);
+ }
+ }
+ }
+
+ // if there is any new artifacts then process them
+ if (!newArtifacts.isEmpty()) {
+ onNewArtifacts(newArtifacts);
+ }
+ } finally {
+ close(is);
+ }
+ }
+
+ private static String getNodeText(NodeList list, String name) {
+ for (int i = 0; i < list.getLength(); i++) {
+ Node child = list.item(i);
+ if (name.equals(child.getNodeName())) {
+ return child.getTextContent();
+ }
+ }
+ return null;
+ }
+
+ private static void close(Closeable... closeables) {
+ for (Closeable c : closeables) {
+ try {
+ if (c != null) {
+ c.close();
+ }
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusArtifactDto.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusArtifactDto.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusArtifactDto.java
new file mode 100644
index 0000000..21f11e8
--- /dev/null
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusArtifactDto.java
@@ -0,0 +1,111 @@
+/**
+ * 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.
+ */
+package org.apache.camel.catalog.nexus;
+
+import java.io.Serializable;
+
+/**
+ * Represents a Maven artifact from the Nexus repository.
+ */
+public class NexusArtifactDto implements Serializable {
+
+ private String groupId;
+ private String artifactId;
+ private String version;
+ private String artifactLink;
+
+ public NexusArtifactDto() {
+ }
+
+ public NexusArtifactDto(String groupId, String artifactId, String version, String artifactLink) {
+ this.groupId = groupId;
+ this.artifactId = artifactId;
+ this.version = version;
+ this.artifactLink = artifactLink;
+ }
+
+ public String getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
+ }
+
+ public String getArtifactId() {
+ return artifactId;
+ }
+
+ public void setArtifactId(String artifactId) {
+ this.artifactId = artifactId;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getArtifactLink() {
+ return artifactLink;
+ }
+
+ public void setArtifactLink(String artifactLink) {
+ this.artifactLink = artifactLink;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ // use gav for equals/hashCode
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ NexusArtifactDto that = (NexusArtifactDto) o;
+
+ if (!groupId.equals(that.groupId)) {
+ return false;
+ }
+ if (!artifactId.equals(that.artifactId)) {
+ return false;
+ }
+ return version.equals(that.version);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = groupId.hashCode();
+ result = 31 * result + artifactId.hashCode();
+ result = 31 * result + version.hashCode();
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return "NexusArtifactDto[" +
+ "groupId='" + groupId + '\'' +
+ ", artifactId='" + artifactId + '\'' +
+ ", version='" + version + '\'' +
+ ", artifactLink='" + artifactLink + '\'' +
+ ']';
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusRepository.java
new file mode 100644
index 0000000..153df3a
--- /dev/null
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/NexusRepository.java
@@ -0,0 +1,35 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
+package org.apache.camel.catalog.nexus;
+
+import java.util.List;
+
+/**
+ * Nexus repository
+ */
+public interface NexusRepository {
+
+ /**
+ * Search for new artifacts in the Nexus repository.
+ *
+ * @param filter the filter artifacts
+ * @param latestVersionOnly to only include the latest version of a given Maven <tt>groupId:artifactId</tt>
+ * @return the found artifacts
+ */
+ List<NexusArtifactDto> searchArtifacts(String filter, boolean latestVersionOnly);
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/catalog-nexus/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/resources/META-INF/LICENSE.txt b/platforms/catalog-nexus/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/platforms/catalog-nexus/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/catalog-nexus/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/resources/META-INF/NOTICE.txt b/platforms/catalog-nexus/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/platforms/catalog-nexus/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/a54d2cca/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 6327a97..61d5b05 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -41,6 +41,7 @@
<module>catalog-provider-springboot</module>
<module>catalog-lucene</module>
<module>catalog-maven</module>
+ <module>catalog-nexus</module>
<module>catalog-rest</module>
<module>catalog-rest-app</module>
</modules>
[4/4] camel git commit: CAMEL-10828: camel-catalog-nexus - Initial
work
Posted by da...@apache.org.
CAMEL-10828: camel-catalog-nexus - Initial work
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39926008
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39926008
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39926008
Branch: refs/heads/master
Commit: 39926008f25b3ada3fd375410dbc38ceeb21d323
Parents: fbbe4b4
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 14 19:11:51 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 19:19:46 2017 +0100
----------------------------------------------------------------------
.../catalog/nexus/BaseNexusRepository.java | 10 +++++++++
.../catalog/nexus/ComponentNexusRepository.java | 22 ++++++++++++++++----
.../catalog/nexus/LocalFileNexusRepository.java | 5 +++++
.../catalog/nexus/LocalNexusRepositoryTest.java | 5 ++++-
4 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/39926008/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
index 25b7b07..02cd8c7 100644
--- a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
@@ -176,6 +176,16 @@ public abstract class BaseNexusRepository {
}
/**
+ * Creates the url to download the artifact.
+ *
+ * @param dto the artifact
+ * @return the url to download
+ */
+ protected String createArtifactURL(NexusArtifactDto dto) {
+ return dto.getArtifactLink();
+ }
+
+ /**
* Runs the task to index nexus for new artifacts
*/
protected void indexNexus() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/39926008/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
index 5887d12..d1663ca 100644
--- a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
@@ -23,6 +23,8 @@ import java.net.URLClassLoader;
import java.util.Properties;
import java.util.Set;
+import org.apache.camel.catalog.CamelCatalog;
+
import static org.apache.camel.catalog.CatalogHelper.loadText;
/**
@@ -39,8 +41,8 @@ public class ComponentNexusRepository extends BaseNexusRepository {
// now download the new artifact JARs and look inside to find more details
for (NexusArtifactDto dto : newArtifacts) {
try {
- // download using url classloader reader
- URL jarUrl = new URL(dto.getArtifactLink());
+ String url = createArtifactURL(dto);
+ URL jarUrl = new URL(url);
addCustomCamelComponentsFromArtifact(dto, jarUrl);
} catch (Exception e) {
log.warn("Error downloading component JAR " + dto.getArtifactLink() + ". This exception is ignored. " + e.getMessage());
@@ -48,6 +50,19 @@ public class ComponentNexusRepository extends BaseNexusRepository {
}
}
+ /**
+ * Adds the component to the {@link CamelCatalog}
+ *
+ * @param dto the artifact
+ * @param camelCatalog the Camel Catalog
+ * @param scheme component name
+ * @param javaType component java class
+ * @param json component json schema
+ */
+ protected void addComponent(NexusArtifactDto dto, CamelCatalog camelCatalog, String scheme, String javaType, String json) {
+ log.info("Added component: {}:{}:{} to Camel Catalog", dto.getGroupId(), dto.getArtifactId(), dto.getVersion());
+ camelCatalog.addComponent(scheme, javaType, json);
+ }
/**
* Adds any discovered third party Camel components from the artifact.
@@ -67,8 +82,7 @@ public class ComponentNexusRepository extends BaseNexusRepository {
if (javaType != null) {
String json = loadComponentJSonSchema(classLoader, scheme);
if (json != null) {
- log.info("Added component: {}:{}:{} to Camel Catalog", dto.getGroupId(), dto.getArtifactId(), dto.getVersion());
- getCamelCatalog().addComponent(scheme, javaType, json);
+ addComponent(dto, getCamelCatalog(), scheme, javaType, json);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/39926008/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
index dd10306..1d341d3 100644
--- a/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
+++ b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalFileNexusRepository.java
@@ -28,4 +28,9 @@ public class LocalFileNexusRepository extends ComponentNexusRepository {
return new URL("file:" + file.getAbsolutePath());
}
+ @Override
+ protected String createArtifactURL(NexusArtifactDto dto) {
+ // load from file instead
+ return "file:target/" + dto.getArtifactId() + "-" + dto.getVersion() + ".jar";
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/39926008/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
index 7f7d7c5..9f9d7ec 100644
--- a/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
+++ b/platforms/catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusRepositoryTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.catalog.nexus;
import junit.framework.TestCase;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.junit.Ignore;
import org.junit.Test;
public class LocalNexusRepositoryTest extends TestCase {
@@ -36,12 +37,14 @@ public class LocalNexusRepositoryTest extends TestCase {
}
@Test
+ @Ignore("Work in progress")
public void testLocalNexus() throws Exception {
int before = catalog.findComponentNames().size();
repo.start();
- // TODO: wait 5 sec
+ // TODO: create custom component we can use for testing here
+ // and only wait as long until a new component is added
Thread.sleep(5000);
repo.stop();
[2/4] camel git commit: CAMEL-10828: camel-catalog-nexus - Initial
work
Posted by da...@apache.org.
CAMEL-10828: camel-catalog-nexus - Initial work
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4f9c7e6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4f9c7e6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4f9c7e6
Branch: refs/heads/master
Commit: b4f9c7e62b568065381d2a91f8aa1443d489a55e
Parents: a54d2cc
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 14 15:02:48 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 14 19:11:59 2017 +0100
----------------------------------------------------------------------
.../catalog/nexus/BaseNexusRepository.java | 22 ++-
.../catalog/nexus/ComponentNexusRepository.java | 137 +++++++++++++++++++
2 files changed, 157 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b4f9c7e6/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
index 88e5a0c..77cf43f 100644
--- a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
@@ -32,6 +32,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
+import org.apache.camel.catalog.CamelCatalog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -40,16 +41,29 @@ import org.w3c.dom.NodeList;
public abstract class BaseNexusRepository {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ final Logger log = LoggerFactory.getLogger(getClass());
private final Set<NexusArtifactDto> indexedArtifacts = new LinkedHashSet<>();
private volatile ScheduledExecutorService executorService;
private AtomicBoolean started = new AtomicBoolean();
+ private CamelCatalog camelCatalog;
private Long delay = 60L; // use 60 second delay between index runs
private String nexusUrl = "http://nexus/service/local/data_index";
- private String classifier = "component";
+ private String classifier;
+
+ public BaseNexusRepository(String classifier) {
+ this.classifier = classifier;
+ }
+
+ public CamelCatalog getCamelCatalog() {
+ return camelCatalog;
+ }
+
+ public void setCamelCatalog(CamelCatalog camelCatalog) {
+ this.camelCatalog = camelCatalog;
+ }
public String getNexusUrl() {
return nexusUrl;
@@ -89,6 +103,10 @@ public abstract class BaseNexusRepository {
* Starts the Nexus indexer.
*/
public void start() {
+ if (camelCatalog == null) {
+ throw new IllegalArgumentException("CamelCatalog must be configured");
+ }
+
if (started.compareAndSet(false, true)) {
log.info("NexusRepository is already started");
return;
http://git-wip-us.apache.org/repos/asf/camel/blob/b4f9c7e6/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
----------------------------------------------------------------------
diff --git a/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
new file mode 100644
index 0000000..5887d12
--- /dev/null
+++ b/platforms/catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/ComponentNexusRepository.java
@@ -0,0 +1,137 @@
+/**
+ * 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.
+ */
+package org.apache.camel.catalog.nexus;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Properties;
+import java.util.Set;
+
+import static org.apache.camel.catalog.CatalogHelper.loadText;
+
+/**
+ * Nexus repository that can scan for custom Camel components and add to the {@link org.apache.camel.catalog.CamelCatalog}.
+ */
+public class ComponentNexusRepository extends BaseNexusRepository {
+
+ public ComponentNexusRepository() {
+ super("component");
+ }
+
+ @Override
+ public void onNewArtifacts(Set<NexusArtifactDto> newArtifacts) {
+ // now download the new artifact JARs and look inside to find more details
+ for (NexusArtifactDto dto : newArtifacts) {
+ try {
+ // download using url classloader reader
+ URL jarUrl = new URL(dto.getArtifactLink());
+ addCustomCamelComponentsFromArtifact(dto, jarUrl);
+ } catch (Exception e) {
+ log.warn("Error downloading component JAR " + dto.getArtifactLink() + ". This exception is ignored. " + e.getMessage());
+ }
+ }
+ }
+
+
+ /**
+ * Adds any discovered third party Camel components from the artifact.
+ */
+ private void addCustomCamelComponentsFromArtifact(NexusArtifactDto dto, URL jarUrl ) {
+ try (URLClassLoader classLoader = new URLClassLoader(new URL[]{jarUrl});) {
+ // is there any custom Camel components in this library?
+ Properties properties = loadComponentProperties(classLoader);
+ if (properties != null) {
+ String components = (String) properties.get("components");
+ if (components != null) {
+ String[] part = components.split("\\s");
+ for (String scheme : part) {
+ if (!getCamelCatalog().findComponentNames().contains(scheme)) {
+ // find the class name
+ String javaType = extractComponentJavaType(classLoader, scheme);
+ if (javaType != null) {
+ String json = loadComponentJSonSchema(classLoader, scheme);
+ if (json != null) {
+ log.info("Added component: {}:{}:{} to Camel Catalog", dto.getGroupId(), dto.getArtifactId(), dto.getVersion());
+ getCamelCatalog().addComponent(scheme, javaType, json);
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ log.warn("Error scanning JAR for custom Camel components", e);
+ }
+ }
+
+ private Properties loadComponentProperties(URLClassLoader classLoader) {
+ Properties answer = new Properties();
+ try {
+ // load the component files using the recommended way by a component.properties file
+ InputStream is = classLoader.getResourceAsStream("META-INF/services/org/apache/camel/component.properties");
+ if (is != null) {
+ answer.load(is);
+ }
+ } catch (Throwable e) {
+ log.warn("Error loading META-INF/services/org/apache/camel/component.properties file", e);
+ }
+ return answer;
+ }
+
+ private String extractComponentJavaType(URLClassLoader classLoader, String scheme) {
+ try {
+ InputStream is = classLoader.getResourceAsStream("META-INF/services/org/apache/camel/component/" + scheme);
+ if (is != null) {
+ Properties props = new Properties();
+ props.load(is);
+ return (String) props.get("class");
+ }
+ } catch (Throwable e) {
+ log.warn("Error loading META-INF/services/org/apache/camel/component/" + scheme + " file", e);
+ }
+
+ return null;
+ }
+
+ private String loadComponentJSonSchema(URLClassLoader classLoader, String scheme) {
+ String answer = null;
+
+ String path = null;
+ String javaType = extractComponentJavaType(classLoader, scheme);
+ if (javaType != null) {
+ int pos = javaType.lastIndexOf(".");
+ path = javaType.substring(0, pos);
+ path = path.replace('.', '/');
+ path = path + "/" + scheme + ".json";
+ }
+
+ if (path != null) {
+ try {
+ InputStream is = classLoader.getResourceAsStream(path);
+ if (is != null) {
+ answer = loadText(is);
+ }
+ } catch (Throwable e) {
+ log.warn("Error loading " + path + " file", e);
+ }
+ }
+
+ return answer;
+ }
+}