Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA - Update spring schemas and missing license files

This commit is contained in:
Christopher L. Shannon (cshannon) 2019-03-15 07:24:31 -04:00
parent a9e7111a9a
commit ccf56875b0
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapterStatistics.java
View File

@ -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();

16
activemq-broker/src/test/java/org/apache/activemq/bugs/AMQ7085Test.java
View File

@ -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;

1
activemq-osgi/src/main/resources/META-INF/spring.schemas
View File

@ -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

1
activemq-spring/src/main/resources/META-INF/spring.schemas
View File

@ -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