diff --git a/activemq-core/src/test/eclipse-resources/log4j.properties b/activemq-core/src/test/eclipse-resources/log4j.properties index f239db85a9..fe90b3775c 100755 --- a/activemq-core/src/test/eclipse-resources/log4j.properties +++ b/activemq-core/src/test/eclipse-resources/log4j.properties @@ -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. +## ------------------------------------------------------------------------ + # # The logging properties used for eclipse testing, We want to see debug output on the console. # diff --git a/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java b/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java index 6afc7bdacb..82900d0561 100644 --- a/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java @@ -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. + */ package org.apache.activemq; import java.util.Date; @@ -12,6 +29,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.Topic; +/** + * + */ public class JmsSendReceiveWithMessageExpirationTest extends TestSupport { private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory diff --git a/assembly/src/release/bin/linux/activemq b/assembly/src/release/bin/linux/activemq index b329ca9c2a..a4c0333e12 100644 --- a/assembly/src/release/bin/linux/activemq +++ b/assembly/src/release/bin/linux/activemq @@ -1,5 +1,22 @@ #! /bin/sh +# ------------------------------------------------------------------------ +# 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. +# ------------------------------------------------------------------------ + # Application APP_NAME="ActiveMQ" APP_LONG_NAME="ActiveMQ Broker" diff --git a/assembly/src/release/bin/linux/wrapper.conf b/assembly/src/release/bin/linux/wrapper.conf index 2329e85646..81727a39ca 100644 --- a/assembly/src/release/bin/linux/wrapper.conf +++ b/assembly/src/release/bin/linux/wrapper.conf @@ -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. +# ------------------------------------------------------------------------ + #******************************************************************** # Wrapper Properties #******************************************************************** diff --git a/assembly/src/release/bin/macosx/activemq b/assembly/src/release/bin/macosx/activemq index eab61729f7..b741d4035d 100644 --- a/assembly/src/release/bin/macosx/activemq +++ b/assembly/src/release/bin/macosx/activemq @@ -1,5 +1,22 @@ #! /bin/sh +# ------------------------------------------------------------------------ +# 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. +# ------------------------------------------------------------------------ + # Application APP_NAME="ActiveMQ" APP_LONG_NAME="ActiveMQ Broker" diff --git a/assembly/src/release/bin/macosx/wrapper.conf b/assembly/src/release/bin/macosx/wrapper.conf index df065af845..4802fb97c8 100644 --- a/assembly/src/release/bin/macosx/wrapper.conf +++ b/assembly/src/release/bin/macosx/wrapper.conf @@ -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. +# ------------------------------------------------------------------------ + #******************************************************************** # Wrapper Properties #******************************************************************** diff --git a/assembly/src/release/bin/win32/InstallService.bat b/assembly/src/release/bin/win32/InstallService.bat index 6db7baf7a2..f9eef276f2 100644 --- a/assembly/src/release/bin/win32/InstallService.bat +++ b/assembly/src/release/bin/win32/InstallService.bat @@ -1,4 +1,22 @@ @echo off + +REM ------------------------------------------------------------------------ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM ------------------------------------------------------------------------ + setlocal rem Java Service Wrapper general NT service install script diff --git a/assembly/src/release/bin/win32/UninstallService.bat b/assembly/src/release/bin/win32/UninstallService.bat index 1c2cbe0c65..5307ff52a5 100644 --- a/assembly/src/release/bin/win32/UninstallService.bat +++ b/assembly/src/release/bin/win32/UninstallService.bat @@ -1,4 +1,22 @@ @echo off + +REM ------------------------------------------------------------------------ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM ------------------------------------------------------------------------ + setlocal rem Java Service Wrapper general NT service uninstall script diff --git a/assembly/src/release/bin/win32/activemq.bat b/assembly/src/release/bin/win32/activemq.bat index ad8efd722f..64d34a106a 100644 --- a/assembly/src/release/bin/win32/activemq.bat +++ b/assembly/src/release/bin/win32/activemq.bat @@ -1,4 +1,22 @@ @echo off + +REM ------------------------------------------------------------------------ +REM Licensed to the Apache Software Foundation (ASF) under one or more +REM contributor license agreements. See the NOTICE file distributed with +REM this work for additional information regarding copyright ownership. +REM The ASF licenses this file to You under the Apache License, Version 2.0 +REM (the "License"); you may not use this file except in compliance with +REM the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. +REM ------------------------------------------------------------------------ + rem rem Find the application home. rem @@ -32,4 +50,4 @@ pause :end set _APP_HOME= -set _WRAPPER_CONF= \ No newline at end of file +set _WRAPPER_CONF= diff --git a/assembly/src/release/bin/win32/wrapper.conf b/assembly/src/release/bin/win32/wrapper.conf index 67a0b4bd76..e1a70c4183 100644 --- a/assembly/src/release/bin/win32/wrapper.conf +++ b/assembly/src/release/bin/win32/wrapper.conf @@ -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. +# ------------------------------------------------------------------------ + #******************************************************************** # Wrapper Properties #******************************************************************** @@ -114,4 +131,4 @@ wrapper.ntservice.dependency.1= wrapper.ntservice.starttype=AUTO_START # Allow the service to interact with the desktop. -wrapper.ntservice.interactive=false \ No newline at end of file +wrapper.ntservice.interactive=false diff --git a/doap.rdf b/doap.rdf index d5d8e7a6f8..0906e1f185 100644 --- a/doap.rdf +++ b/doap.rdf @@ -1,4 +1,21 @@ + +