activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject [activemq] branch master updated: NO-JIRA - Update spring schemas and missing license files
Date Fri, 15 Mar 2019 11:24:59 GMT
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new ccf5687  NO-JIRA - Update spring schemas and missing license files
ccf5687 is described below

commit ccf56875b0660214e0a61bd2f8adc418143551fc
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
AuthorDate: Fri Mar 15 07:24:31 2019 -0400

    NO-JIRA - Update spring schemas and missing license files
---
 .../activemq/store/PersistenceAdapterStatistics.java   | 18 ++++++++++++++++++
 .../java/org/apache/activemq/bugs/AMQ7085Test.java     | 16 ++++++++++++++++
 .../src/main/resources/META-INF/spring.schemas         |  1 +
 .../src/main/resources/META-INF/spring.schemas         |  1 +
 4 files changed, 36 insertions(+)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterStatistics.java
b/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterStatistics.java
index 0a21469..b299822 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterStatistics.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterStatistics.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.store;
 
 import org.apache.activemq.management.StatsImpl;
@@ -22,6 +38,7 @@ public class PersistenceAdapterStatistics extends StatsImpl {
         readTime.addTime(time);
     }
 
+    @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
         writeTime.setEnabled(enabled);
@@ -34,6 +51,7 @@ public class PersistenceAdapterStatistics extends StatsImpl {
 
     public TimeStatisticImpl getReadTime() { return readTime; }
 
+    @Override
     public void reset() {
         if (isDoReset()) {
             writeTime.reset();
diff --git a/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java b/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java
index 5848ef5..d8e2516 100644
--- a/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java
+++ b/activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.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.bugs;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 67b0cd3..8fb2dfb 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -63,6 +63,7 @@ http\://activemq.apache.org/schema/core/activemq-core-5.15.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.6.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.7.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.8.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.9.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
 
diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas b/activemq-spring/src/main/resources/META-INF/spring.schemas
index d340983..9771bf8 100644
--- a/activemq-spring/src/main/resources/META-INF/spring.schemas
+++ b/activemq-spring/src/main/resources/META-INF/spring.schemas
@@ -63,6 +63,7 @@ http\://activemq.apache.org/schema/core/activemq-core-5.15.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.6.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.7.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.8.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.9.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


Mime
View raw message