From 974f6896a453022f2a805271f100fab6098916b3 Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Thu, 19 Apr 2012 15:15:19 +0000 Subject: [PATCH] fixing licenses git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1327985 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/camel/dlq.xml | 17 ++++++ .../command/DummyConnectionFactory.java | 20 ++++++- .../command/InvalidConnectionFactory.java | 16 ++++++ .../command/LowercasingPasswordFactory.java | 16 ++++++ .../kahadb/TransactionIdTransformer.java | 16 ++++++ .../org/apache/activemq/bugs/AMQ3274Test.java | 56 +++++++++++-------- .../failover/InitalReconnectDelayTest.java | 16 ++++++ .../TopicSubscriptionSlowConsumerTest.java | 27 +++++++-- .../bugs/amq3625/conf/JaasStompSSLBroker1.xml | 15 ++++- .../bugs/amq3625/conf/JaasStompSSLBroker2.xml | 16 ++++++ .../bugs/amq3625/conf/groups2.properties | 16 ++++++ .../activemq/bugs/amq3625/conf/login.config | 17 +++++- .../bugs/amq3625/conf/users2.properties | 16 ++++++ .../activemq/usecases/rebalance-broker1.xml | 17 ++++++ .../activemq/usecases/rebalance-broker2.xml | 17 ++++++ .../activemq/usecases/rebalance-broker3.xml | 17 ++++++ ...ledConnectionFactoryMaximumActiveTest.java | 34 +++++++---- .../pool/PooledConnectionFactoryTest.java | 32 +++++++---- .../activemq/pool/PooledConnectionTest.java | 26 ++++++--- .../src/main/webapp/websocket/chat.css | 16 ++++++ .../src/main/webapp/websocket/chat.js | 17 ++++++ .../src/main/webapp/websocket/stomp.js | 17 ++++++ .../apache/kahadb/journal/FileAppender.java | 19 ++++++- pom.xml | 4 +- 24 files changed, 417 insertions(+), 63 deletions(-) diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/dlq.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/dlq.xml index 1229b89d07..be04ee896c 100644 --- a/activemq-camel/src/test/resources/org/apache/activemq/camel/dlq.xml +++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/dlq.xml @@ -1,3 +1,20 @@ + + diff --git a/activemq-core/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml b/activemq-core/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml index 0c8585b3b9..0b68aed7d2 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/bugs/amq3625/conf/JaasStompSSLBroker2.xml @@ -1,4 +1,20 @@ + + diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker2.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker2.xml index a9167c9c1a..fd96b883bf 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker2.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker2.xml @@ -1,3 +1,20 @@ + + diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker3.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker3.xml index d5655b5052..3438feec17 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker3.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/rebalance-broker3.xml @@ -1,3 +1,20 @@ + + diff --git a/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.java b/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.java index ebb29ea8a0..38a9f784f3 100644 --- a/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.java +++ b/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryMaximumActiveTest.java @@ -1,24 +1,36 @@ +/** + * 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.pool; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.log4j.Logger; import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.Session; - -import org.apache.activemq.pool.PooledConnectionFactory; -import org.apache.activemq.ActiveMQConnectionFactory; - -import org.apache.log4j.Logger; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; /** diff --git a/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryTest.java b/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryTest.java index 6853d0d595..ef5b9328bf 100644 --- a/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryTest.java +++ b/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionFactoryTest.java @@ -1,23 +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 + * + * 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.pool; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.log4j.Logger; import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.Session; - -import org.apache.activemq.pool.PooledConnectionFactory; -import org.apache.activemq.ActiveMQConnectionFactory; - -import org.apache.log4j.Logger; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; /** diff --git a/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionTest.java b/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionTest.java index d98ae055aa..862ea34b17 100644 --- a/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionTest.java +++ b/activemq-pool/src/test/java/org/apache/activemq/pool/PooledConnectionTest.java @@ -1,18 +1,30 @@ /** - * + * 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.pool; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.IllegalStateException; -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * A couple of tests against the PooledConnection class. * diff --git a/activemq-web-demo/src/main/webapp/websocket/chat.css b/activemq-web-demo/src/main/webapp/websocket/chat.css index 0ec61a02fb..8cdfb9497c 100644 --- a/activemq-web-demo/src/main/webapp/websocket/chat.css +++ b/activemq-web-demo/src/main/webapp/websocket/chat.css @@ -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. + */ * { margin: 0; padding: 0; diff --git a/activemq-web-demo/src/main/webapp/websocket/chat.js b/activemq-web-demo/src/main/webapp/websocket/chat.js index 1171c63525..fe08d1bb06 100644 --- a/activemq-web-demo/src/main/webapp/websocket/chat.js +++ b/activemq-web-demo/src/main/webapp/websocket/chat.js @@ -1,3 +1,20 @@ +/** + * + * 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. + */ $(document).ready(function(){ var client, destination; diff --git a/activemq-web-demo/src/main/webapp/websocket/stomp.js b/activemq-web-demo/src/main/webapp/websocket/stomp.js index 41047e3c2b..73932b9505 100644 --- a/activemq-web-demo/src/main/webapp/websocket/stomp.js +++ b/activemq-web-demo/src/main/webapp/websocket/stomp.js @@ -1,3 +1,20 @@ +/** + * + * 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. + */ (function() { var Client, Stomp, WebSocketStompMock; var __hasProp = Object.prototype.hasOwnProperty, __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java b/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java index 2fbd8c4cfe..20d4bd2560 100644 --- a/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java +++ b/kahadb/src/main/java/org/apache/kahadb/journal/FileAppender.java @@ -1,8 +1,25 @@ +/** + * 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.kahadb.journal; -import java.io.IOException; import org.apache.kahadb.util.ByteSequence; +import java.io.IOException; + public interface FileAppender { public static final String PROPERTY_LOG_WRITE_STAT_WINDOW = "org.apache.kahadb.journal.appender.WRITE_STAT_WINDOW"; public static final int maxStat = Integer.parseInt(System.getProperty(PROPERTY_LOG_WRITE_STAT_WINDOW, "0")); diff --git a/pom.xml b/pom.xml index 78c734019b..508775a0c1 100755 --- a/pom.xml +++ b/pom.xml @@ -1194,8 +1194,7 @@ **/*.bin **/*.log - **/*README.txt - **/store/amq/help.txt + **/*.txt **/kahadb/**/*.data **/resources/*.xsd @@ -1207,6 +1206,7 @@ **/webapp/js/common.js **/webapp/js/css.js **/webapp/js/standardista-table-sorting.js + **/*.data **/webapp/test/assets/* **/webapp/js/plotkit/**/*