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 2013/08/23 10:36:07 UTC
[1/2] git commit: CAMEL-6556: Use compile+runtime dependency scope
for maven plugin to include provided JARs.
Updated Branches:
refs/heads/master f1ead1197 -> baca21110
CAMEL-6556: Use compile+runtime dependency scope for maven plugin to include provided JARs.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/baca2111
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/baca2111
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/baca2111
Branch: refs/heads/master
Commit: baca21110d06fc1dc95f6ac2a561a11e7d74a549
Parents: bfaa900
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Aug 23 10:35:06 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Aug 23 10:36:01 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/maven/DotMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/EmbeddedMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/RunMojo.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/baca2111/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
index 7cc1c1f..61f04e7 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
@@ -53,7 +53,7 @@ import org.codehaus.plexus.util.cli.Commandline;
*
* @version
* @goal dot
- * @requiresDependencyResolution test
+ * @requiresDependencyResolution compile+runtime
* @phase prepare-package
* @execute phase="test-compile"
* @see <a href="http://www.graphviz.org/">GraphViz</a>
http://git-wip-us.apache.org/repos/asf/camel/blob/baca2111/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
index c13f2e0..e70b880 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
@@ -36,7 +36,7 @@ import org.codehaus.mojo.exec.AbstractExecMojo;
* the DOT file before closing the context down.
*
* @goal embedded
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution compile+runtime
* @execute phase="test-compile"
*/
public class EmbeddedMojo extends AbstractExecMojo {
http://git-wip-us.apache.org/repos/asf/camel/blob/baca2111/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 4837c8c..6f3921d 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -60,7 +60,7 @@ import org.codehaus.mojo.exec.Property;
* and <code>camel-*.xml</code> and starting up the context.
*
* @goal run
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution compile+runtime
* @execute phase="test-compile"
*/
public class RunMojo extends AbstractExecMojo {
[2/2] git commit: CAMEL-6652: Added unit test
Posted by da...@apache.org.
CAMEL-6652: Added unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfaa900a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfaa900a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfaa900a
Branch: refs/heads/master
Commit: bfaa900ac2120f5576d370b969b70e1e782d85b7
Parents: f1ead11
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Aug 23 10:18:22 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Aug 23 10:36:01 2013 +0200
----------------------------------------------------------------------
.../camel/management/ManagedEndpointTest.java | 53 ++++++++++++++++++++
1 file changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bfaa900a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointTest.java
new file mode 100644
index 0000000..a0f7982
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointTest.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
+ *
+ * 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.management;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class ManagedEndpointTest extends ManagementTestSupport {
+
+ public void testManageEndpoint() throws Exception {
+ MBeanServer mbeanServer = getMBeanServer();
+
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"seda://test\"");
+ mbeanServer.isRegistered(on);
+
+ on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
+ mbeanServer.isRegistered(on);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ Endpoint result = endpoint("mock:result");
+
+ from("seda:test")
+ .to(result);
+ }
+ };
+ }
+
+}
\ No newline at end of file