You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/01/29 13:12:52 UTC
[1/2] activemq git commit: Add schemas
Repository: activemq
Updated Branches:
refs/heads/activemq-5.15.x 4afb41afa -> 164312f88
Add schemas
(cherry picked from commit 5189b4e54594793f308c75e4b357bd855887fea1)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a7ee7ab3
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a7ee7ab3
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a7ee7ab3
Branch: refs/heads/activemq-5.15.x
Commit: a7ee7ab3a9539b8a6fe286f0546570d21f9d89e0
Parents: 4afb41a
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Mon Jan 29 08:07:46 2018 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Jan 29 08:12:09 2018 -0500
----------------------------------------------------------------------
activemq-osgi/src/main/resources/META-INF/spring.schemas | 1 +
activemq-spring/src/main/resources/META-INF/spring.schemas | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a7ee7ab3/activemq-osgi/src/main/resources/META-INF/spring.schemas
----------------------------------------------------------------------
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 35b0628..858016f 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -57,6 +57,7 @@ http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.2.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.3.xsd=activemq.xsd
http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
http://git-wip-us.apache.org/repos/asf/activemq/blob/a7ee7ab3/activemq-spring/src/main/resources/META-INF/spring.schemas
----------------------------------------------------------------------
diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas b/activemq-spring/src/main/resources/META-INF/spring.schemas
index 790b575..24f2029 100644
--- a/activemq-spring/src/main/resources/META-INF/spring.schemas
+++ b/activemq-spring/src/main/resources/META-INF/spring.schemas
@@ -57,6 +57,7 @@ http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.15.2.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.3.xsd=activemq.xsd
http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
[2/2] activemq git commit: NO-JIRA: Add missing license headers
Posted by cs...@apache.org.
NO-JIRA: Add missing license headers
(cherry picked from commit e5de25f4fc7401c4b5888bb9836eb5a6886bada2)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/164312f8
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/164312f8
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/164312f8
Branch: refs/heads/activemq-5.15.x
Commit: 164312f88840f08a3df5879dc340df87b38ed841
Parents: a7ee7ab
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Mon Jan 29 08:10:50 2018 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Jan 29 08:12:16 2018 -0500
----------------------------------------------------------------------
.../org/apache/activemq/network/BridgeFactory.java | 16 ++++++++++++++++
.../apache/activemq/network/BaseNetworkTest.java | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/164312f8/activemq-broker/src/main/java/org/apache/activemq/network/BridgeFactory.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/BridgeFactory.java b/activemq-broker/src/main/java/org/apache/activemq/network/BridgeFactory.java
index af6a6db..42d11e3 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/network/BridgeFactory.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/BridgeFactory.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.network;
import org.apache.activemq.transport.Transport;
http://git-wip-us.apache.org/repos/asf/activemq/blob/164312f8/activemq-unit-tests/src/test/java/org/apache/activemq/network/BaseNetworkTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/BaseNetworkTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/BaseNetworkTest.java
index 6bb9384..e5cd967 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/BaseNetworkTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/BaseNetworkTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.network;
import java.net.URI;