diff --git a/activemq-console/src/main/java/org/apache/activemq/console/ConsoleCommandHandler.java b/activemq-console/src/main/java/org/apache/activemq/console/ConsoleCommandHandler.java index 4700838581..24852db2a6 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/ConsoleCommandHandler.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/ConsoleCommandHandler.java @@ -1,4 +1,4 @@ -/* +/** * 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. @@ -16,16 +16,17 @@ */ package org.apache.activemq.console; -import org.apache.activemq.broker.util.CommandHandler; -import org.apache.activemq.console.command.ShellCommand; -import org.apache.activemq.console.formatter.GlobalWriter; -import org.apache.activemq.console.formatter.CommandShellOutputFormatter; +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; import javax.jms.TextMessage; -import java.util.List; -import java.util.ArrayList; -import java.util.StringTokenizer; -import java.io.ByteArrayOutputStream; + +import org.apache.activemq.broker.util.CommandHandler; +import org.apache.activemq.console.command.ShellCommand; +import org.apache.activemq.console.formatter.CommandShellOutputFormatter; +import org.apache.activemq.console.formatter.GlobalWriter; /** * A default implementation of the @{link CommandHandler} interface @@ -44,7 +45,7 @@ public class ConsoleCommandHandler implements CommandHandler { // lets turn the text into a list of arguments String requestText = request.getText(); - List tokens = tokenize(requestText); + List tokens = tokenize(requestText); command.execute(tokens); out.flush(); @@ -55,8 +56,8 @@ public class ConsoleCommandHandler implements CommandHandler { response.setText(answer); } - protected List tokenize(String text) { - List answer = new ArrayList(); + protected List tokenize(String text) { + List answer = new ArrayList(); StringTokenizer iter = new StringTokenizer(text); while (iter.hasMoreTokens()) { answer.add(iter.nextToken()); diff --git a/activemq-console/src/main/java/org/apache/activemq/console/Main.java b/activemq-console/src/main/java/org/apache/activemq/console/Main.java index 138226376c..65bad2b8e6 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/Main.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/Main.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -30,37 +29,35 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Set; -import java.util.HashSet; import java.util.StringTokenizer; /** - * Main class that can bootstrap an ActiveMQ broker console. Handles command line - * argument parsing to set up and run broker tasks. - * + * Main class that can bootstrap an ActiveMQ broker console. Handles command + * line argument parsing to set up and run broker tasks. + * * @version $Revision$ */ public class Main { - public static final String TASK_DEFAULT_CLASS = "org.apache.activemq.console.command.ShellCommand"; - - private File activeMQHome; - private File activeMQBase; - private ClassLoader classLoader; - private Set extensions = new HashSet(5); - private Set activeMQClassPath = new HashSet(5); - - + public static final String TASK_DEFAULT_CLASS = "org.apache.activemq.console.command.ShellCommand"; private static boolean useDefExt = true; + private File activeMQHome; + private File activeMQBase; + private ClassLoader classLoader; + private Set extensions = new HashSet(5); + private Set activeMQClassPath = new HashSet(5); + public static void main(String[] args) { Main app = new Main(); // Convert arguments to collection for easier management - List tokens = new LinkedList(Arrays.asList(args)); + List tokens = new LinkedList(Arrays.asList(args)); // Parse for extension directory option app.parseExtensions(tokens); @@ -69,24 +66,25 @@ public class Main { // ${activemq.base}/conf // ${activemq.base}/lib/* (only if activemq.base != activemq.home) // ${activemq.home}/lib/* - // ${activemq.base}/lib/optional/* (only if activemq.base != activemq.home) + // ${activemq.base}/lib/optional/* (only if activemq.base != + // activemq.home) // ${activemq.home}/lib/optional/* // ${activemq.base}/lib/web/* (only if activemq.base != activemq.home) // ${activemq.home}/lib/web/* // - if(useDefExt && app.canUseExtdir()) { + if (useDefExt && app.canUseExtdir()) { boolean baseIsHome = app.getActiveMQBase().equals(app.getActiveMQHome()); File baseLibDir = new File(app.getActiveMQBase(), "lib"); File homeLibDir = new File(app.getActiveMQHome(), "lib"); - if(!baseIsHome) { + if (!baseIsHome) { app.addExtensionDirectory(baseLibDir); } app.addExtensionDirectory(homeLibDir); - if(!baseIsHome) { + if (!baseIsHome) { app.addExtensionDirectory(new File(baseLibDir, "optional")); app.addExtensionDirectory(new File(baseLibDir, "web")); } @@ -95,7 +93,8 @@ public class Main { } - // Add any custom classpath specified from the system property activemq.classpath + // Add any custom classpath specified from the system property + // activemq.classpath app.addClassPathList(System.getProperty("activemq.classpath")); try { @@ -104,7 +103,7 @@ public class Main { System.out.println("Could not load class: " + e.getMessage()); try { ClassLoader cl = app.getClassLoader(); - if( cl!=null ) { + if (cl != null) { System.out.println("Class loader setup: "); printClassLoaderTree(cl); } @@ -117,14 +116,14 @@ public class Main { /** * Print out what's in the classloader tree being used. - * + * * @param cl * @return depth */ private static int printClassLoaderTree(ClassLoader cl) { int depth = 0; - if( cl.getParent()!=null ) { - depth = printClassLoaderTree(cl.getParent())+1; + if (cl.getParent() != null) { + depth = printClassLoaderTree(cl.getParent()) + 1; } StringBuffer indent = new StringBuffer(); @@ -132,21 +131,21 @@ public class Main { indent.append(" "); } - if( cl instanceof URLClassLoader ) { - URLClassLoader ucl = (URLClassLoader) cl; - System.out.println(indent+cl.getClass().getName()+" {"); + if (cl instanceof URLClassLoader) { + URLClassLoader ucl = (URLClassLoader)cl; + System.out.println(indent + cl.getClass().getName() + " {"); URL[] urls = ucl.getURLs(); for (int i = 0; i < urls.length; i++) { - System.out.println(indent+" "+urls[i]); + System.out.println(indent + " " + urls[i]); } - System.out.println(indent+"}"); + System.out.println(indent + "}"); } else { - System.out.println(indent+cl.getClass().getName()); + System.out.println(indent + cl.getClass().getName()); } return depth; } - public void parseExtensions(List tokens) { + public void parseExtensions(List tokens) { if (tokens.isEmpty()) { return; } @@ -156,15 +155,16 @@ public class Main { // Parse for all --extdir and --noDefExt options while (i < count) { - String token = (String)tokens.get(i); + String token = tokens.get(i); // If token is an extension dir option if (token.equals("--extdir")) { // Process token count--; tokens.remove(i); - // If no extension directory is specified, or next token is another option - if (i >= count || ((String)tokens.get(i)).startsWith("-")) { + // If no extension directory is specified, or next token is + // another option + if (i >= count || tokens.get(i).startsWith("-")) { System.out.println("Extension directory not specified."); System.out.println("Ignoring extension directory option."); continue; @@ -172,9 +172,9 @@ public class Main { // Process extension dir token count--; - File extDir = new File((String)tokens.remove(i)); + File extDir = new File(tokens.remove(i)); - if(!canUseExtdir()) { + if (!canUseExtdir()) { System.out.println("Extension directory feature not available due to the system classpath being able to load: " + TASK_DEFAULT_CLASS); System.out.println("Ignoring extension directory option."); continue; @@ -187,7 +187,8 @@ public class Main { } addExtensionDirectory(extDir); - } else if (token.equals("--noDefExt")) { // If token is --noDefExt option + } else if (token.equals("--noDefExt")) { // If token is + // --noDefExt option count--; tokens.remove(i); useDefExt = false; @@ -198,19 +199,23 @@ public class Main { } - public void runTaskClass(List tokens) throws Throwable { + public void runTaskClass(List tokens) throws Throwable { - System.out.println("ACTIVEMQ_HOME: "+ getActiveMQHome()); - System.out.println("ACTIVEMQ_BASE: "+ getActiveMQBase()); + System.out.println("ACTIVEMQ_HOME: " + getActiveMQHome()); + System.out.println("ACTIVEMQ_BASE: " + getActiveMQBase()); ClassLoader cl = getClassLoader(); // Use reflection to run the task. try { - String[] args = (String[]) tokens.toArray(new String[tokens.size()]); + String[] args = tokens.toArray(new String[tokens.size()]); Class task = cl.loadClass(TASK_DEFAULT_CLASS); - Method runTask = task.getMethod("main", new Class[] { String[].class, InputStream.class, PrintStream.class }); - runTask.invoke(task.newInstance(), new Object[] { args, System.in, System.out }); + Method runTask = task.getMethod("main", new Class[] { + String[].class, InputStream.class, PrintStream.class + }); + runTask.invoke(task.newInstance(), new Object[] { + args, System.in, System.out + }); } catch (InvocationTargetException e) { throw e.getCause(); } @@ -234,9 +239,10 @@ public class Main { } /** - * The extension directory feature will not work if the broker factory is already in the classpath - * since we have to load him from a child ClassLoader we build for it to work correctly. - * + * The extension directory feature will not work if the broker factory is + * already in the classpath since we have to load him from a child + * ClassLoader we build for it to work correctly. + * * @return true, if extension dir can be used. false otherwise. */ public boolean canUseExtdir() { @@ -249,39 +255,45 @@ public class Main { } public ClassLoader getClassLoader() throws MalformedURLException { - if(classLoader==null) { + if (classLoader == null) { // Setup the ClassLoader classLoader = Main.class.getClassLoader(); if (!extensions.isEmpty() || !activeMQClassPath.isEmpty()) { - ArrayList urls = new ArrayList(); + ArrayList urls = new ArrayList(); - for (Iterator iter = activeMQClassPath.iterator(); iter.hasNext();) { - File dir = (File) iter.next(); - // try{ System.out.println("Adding to classpath: " + dir.getCanonicalPath()); }catch(Exception e){} + for (Iterator iter = activeMQClassPath.iterator(); iter.hasNext();) { + File dir = iter.next(); + // try{ System.out.println("Adding to classpath: " + + // dir.getCanonicalPath()); }catch(Exception e){} urls.add(dir.toURL()); } - for (Iterator iter = extensions.iterator(); iter.hasNext();) { - File dir = (File) iter.next(); - if( dir.isDirectory() ) { + for (Iterator iter = extensions.iterator(); iter.hasNext();) { + File dir = iter.next(); + if (dir.isDirectory()) { File[] files = dir.listFiles(); - if( files!=null ) { + if (files != null) { - // Sort the jars so that classpath built is consistently - // in the same order. Also allows us to use jar names to control + // Sort the jars so that classpath built is + // consistently + // in the same order. Also allows us to use jar + // names to control // classpath order. - Arrays.sort(files, new Comparator(){ + Arrays.sort(files, new Comparator() { public int compare(Object o1, Object o2) { - File f1 = (File) o1; - File f2 = (File) o2; + File f1 = (File)o1; + File f2 = (File)o2; return f1.getName().compareTo(f2.getName()); } }); for (int j = 0; j < files.length; j++) { - if( files[j].getName().endsWith(".zip") || files[j].getName().endsWith(".jar") ) { - // try{ System.out.println("Adding to classpath: " + files[j].getCanonicalPath()); }catch(Exception e){} + if (files[j].getName().endsWith(".zip") || files[j].getName().endsWith(".jar")) { + // try{ System.out.println("Adding to + // classpath: " + + // files[j].getCanonicalPath()); + // }catch(Exception e){} urls.add(files[j].toURL()); } } @@ -303,29 +315,29 @@ public class Main { } public File getActiveMQHome() { - if(activeMQHome==null) { - if(System.getProperty("activemq.home") != null) { + if (activeMQHome == null) { + if (System.getProperty("activemq.home") != null) { activeMQHome = new File(System.getProperty("activemq.home")); } - if(activeMQHome==null){ + if (activeMQHome == null) { // guess from the location of the jar URL url = Main.class.getClassLoader().getResource("org/apache/activemq/console/Main.class"); if (url != null) { try { - JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); + JarURLConnection jarConnection = (JarURLConnection)url.openConnection(); url = jarConnection.getJarFileURL(); URI baseURI = new URI(url.toString()).resolve(".."); activeMQHome = new File(baseURI).getCanonicalFile(); - System.setProperty("activemq.home",activeMQHome.getAbsolutePath()); + System.setProperty("activemq.home", activeMQHome.getAbsolutePath()); } catch (Exception ignored) { } } } - if(activeMQHome==null){ + if (activeMQHome == null) { activeMQHome = new File("../."); - System.setProperty("activemq.home",activeMQHome.getAbsolutePath()); + System.setProperty("activemq.home", activeMQHome.getAbsolutePath()); } } @@ -333,14 +345,14 @@ public class Main { } public File getActiveMQBase() { - if(activeMQBase==null) { - if(System.getProperty("activemq.base") != null) { + if (activeMQBase == null) { + if (System.getProperty("activemq.base") != null) { activeMQBase = new File(System.getProperty("activemq.base")); } - if(activeMQBase==null){ + if (activeMQBase == null) { activeMQBase = getActiveMQHome(); - System.setProperty("activemq.base",activeMQBase.getAbsolutePath()); + System.setProperty("activemq.base", activeMQBase.getAbsolutePath()); } } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractAmqCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractAmqCommand.java index 8d0c4ca7d9..9f7a91e8dc 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractAmqCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractAmqCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,31 +16,36 @@ */ package org.apache.activemq.console.command; -import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.activemq.console.formatter.GlobalWriter; - -import javax.jms.ConnectionFactory; -import javax.jms.Connection; -import javax.jms.JMSException; import java.net.URI; import java.net.URISyntaxException; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.JMSException; + +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.console.formatter.GlobalWriter; public abstract class AbstractAmqCommand extends AbstractCommand { private URI brokerUrl; private ConnectionFactory factory; - private final List connections = new ArrayList(); + private final List connections = new ArrayList(); /** - * Establishes a connection to the remote broker specified by the broker url. + * Establishes a connection to the remote broker specified by the broker + * url. + * * @return - connection to the broker * @throws JMSException */ protected Connection createConnection() throws JMSException { if (getBrokerUrl() == null) { - GlobalWriter.printException(new IllegalStateException("You must specify a broker URL to connect to using the --amqurl option.")); + GlobalWriter + .printException(new IllegalStateException("You must specify a broker " + + "URL to connect to using the --amqurl option.")); return null; } @@ -56,7 +60,9 @@ public abstract class AbstractAmqCommand extends AbstractCommand { } /** - * Establishes a connection to the remote broker specified by the broker url. + * Establishes a connection to the remote broker specified by the broker + * url. + * * @param username - username for the connection * @param password - password for the connection * @return - connection to the broker @@ -64,7 +70,9 @@ public abstract class AbstractAmqCommand extends AbstractCommand { */ protected Connection createConnection(String username, String password) throws JMSException { if (getBrokerUrl() == null) { - GlobalWriter.printException(new IllegalStateException("You must specify a broker URL to connect to using the --amqurl option.")); + GlobalWriter + .printException(new IllegalStateException( + "You must specify a broker URL to connect to using the --amqurl option.")); return null; } @@ -83,10 +91,11 @@ public abstract class AbstractAmqCommand extends AbstractCommand { * Close all created connections. */ protected void closeAllConnections() { - for (Iterator i=connections.iterator(); i.hasNext();) { + for (Iterator i = connections.iterator(); i.hasNext();) { try { - ((Connection)i.next()).close(); - } catch (Exception e) { } + i.next().close(); + } catch (Exception e) { + } } connections.clear(); @@ -94,6 +103,7 @@ public abstract class AbstractAmqCommand extends AbstractCommand { /** * Handle the --amqurl option. + * * @param token - current option * @param tokens - succeeding list of arguments * @throws Exception @@ -110,7 +120,8 @@ public abstract class AbstractAmqCommand extends AbstractCommand { // If broker url already specified if (getBrokerUrl() != null) { - GlobalWriter.printException(new IllegalArgumentException("Multiple broker URL cannot be specified.")); + GlobalWriter + .printException(new IllegalArgumentException("Multiple broker URL cannot be specified.")); tokens.clear(); return; } @@ -132,6 +143,7 @@ public abstract class AbstractAmqCommand extends AbstractCommand { /** * Set the broker url. + * * @param brokerUrl - new broker url */ protected void setBrokerUrl(URI brokerUrl) { @@ -140,6 +152,7 @@ public abstract class AbstractAmqCommand extends AbstractCommand { /** * Set the broker url. + * * @param address - address of the new broker url * @throws URISyntaxException */ @@ -149,6 +162,7 @@ public abstract class AbstractAmqCommand extends AbstractCommand { /** * Get the current broker url. + * * @return current broker url */ protected URI getBrokerUrl() { diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java index 2b858d78fc..9358a210b1 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,23 +16,25 @@ */ package org.apache.activemq.console.command; +import java.util.List; + import org.apache.activemq.ActiveMQConnectionMetaData; import org.apache.activemq.console.formatter.GlobalWriter; -import java.util.List; - public abstract class AbstractCommand implements Command { public static final String COMMAND_OPTION_DELIMETER = ","; - private boolean isPrintHelp = false; - private boolean isPrintVersion = false; + private boolean isPrintHelp; + private boolean isPrintVersion; /** - * Exceute a generic command, which includes parsing the options for the command and running the specific task. + * Execute a generic command, which includes parsing the options for the + * command and running the specific task. + * * @param tokens - command arguments * @throws Exception */ - public void execute(List tokens) throws Exception { + public void execute(List tokens) throws Exception { // Parse the options specified by "-" parseOptions(tokens); @@ -41,24 +42,26 @@ public abstract class AbstractCommand implements Command { if (isPrintHelp) { printHelp(); - // Print the AMQ version + // Print the AMQ version } else if (isPrintVersion) { GlobalWriter.printVersion(ActiveMQConnectionMetaData.PROVIDER_VERSION); - // Run the specified task + // Run the specified task } else { runTask(tokens); } } /** - * Parse any option parameters in the command arguments specified by a '-' as the first character of the token. + * Parse any option parameters in the command arguments specified by a '-' + * as the first character of the token. + * * @param tokens - command arguments * @throws Exception */ - protected void parseOptions(List tokens) throws Exception { + protected void parseOptions(List tokens) throws Exception { while (!tokens.isEmpty()) { - String token = (String)tokens.remove(0); + String token = tokens.remove(0); if (token.startsWith("-")) { // Token is an option handleOption(token, tokens); @@ -71,25 +74,25 @@ public abstract class AbstractCommand implements Command { } /** - * Handle the general options for each command, which includes -h, -?, --help, -D, --version. + * Handle the general options for each command, which includes -h, -?, + * --help, -D, --version. + * * @param token - option token to handle * @param tokens - succeeding command arguments * @throws Exception */ - protected void handleOption(String token, List tokens) throws Exception { + protected void handleOption(String token, List tokens) throws Exception { // If token is a help option if (token.equals("-h") || token.equals("-?") || token.equals("--help")) { isPrintHelp = true; tokens.clear(); - // If token is a version option + // If token is a version option } else if (token.equals("--version")) { isPrintVersion = true; tokens.clear(); - } - - // If token is a system property define option - else if (token.startsWith("-D")) { + } else if (token.startsWith("-D")) { + // If token is a system property define option String key = token.substring(2); String value = ""; int pos = key.indexOf("="); @@ -98,11 +101,8 @@ public abstract class AbstractCommand implements Command { key = key.substring(0, pos); } System.setProperty(key, value); - - } - - // Token is unrecognized - else { + } else { + // Token is unrecognized GlobalWriter.printInfo("Unrecognized option: " + token); isPrintHelp = true; } @@ -110,13 +110,14 @@ public abstract class AbstractCommand implements Command { /** * Run the specific task. + * * @param tokens - command arguments * @throws Exception */ - abstract protected void runTask(List tokens) throws Exception; + protected abstract void runTask(List tokens) throws Exception; /** * Print the help messages for the specific task */ - abstract protected void printHelp(); + protected abstract void printHelp(); } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java index 5cddac82e7..7290338a3d 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AbstractJmxCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,14 +16,15 @@ */ package org.apache.activemq.console.command; -import org.apache.activemq.console.formatter.GlobalWriter; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.List; -import javax.management.remote.JMXServiceURL; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; -import java.util.List; -import java.net.MalformedURLException; -import java.io.IOException; +import javax.management.remote.JMXServiceURL; + +import org.apache.activemq.console.formatter.GlobalWriter; public abstract class AbstractJmxCommand extends AbstractCommand { public static final String DEFAULT_JMX_URL = "service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"; @@ -107,7 +107,7 @@ public abstract class AbstractJmxCommand extends AbstractCommand { * @param tokens - succeeding command arguments * @throws Exception */ - protected void handleOption(String token, List tokens) throws Exception { + protected void handleOption(String token, List tokens) throws Exception { // Try to handle the options first if (token.equals("--jmxurl")) { // If no jmx url specified, or next token is a new option diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/AmqBrowseCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/AmqBrowseCommand.java index 526ef8a896..79a9e3a052 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/AmqBrowseCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/AmqBrowseCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,18 +16,19 @@ */ package org.apache.activemq.console.command; -import org.apache.activemq.console.util.AmqMessagesUtil; -import org.apache.activemq.console.formatter.GlobalWriter; -import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq.command.ActiveMQTopic; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; import javax.jms.Destination; -import java.util.List; -import java.util.ArrayList; -import java.util.Set; -import java.util.HashSet; -import java.util.StringTokenizer; -import java.util.Iterator; + +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.console.formatter.GlobalWriter; +import org.apache.activemq.console.util.AmqMessagesUtil; public class AmqBrowseCommand extends AbstractAmqCommand { public static final String QUEUE_PREFIX = "queue:"; @@ -36,176 +36,7 @@ public class AmqBrowseCommand extends AbstractAmqCommand { public static final String VIEW_GROUP_HEADER = "header:"; public static final String VIEW_GROUP_CUSTOM = "custom:"; - public static final String VIEW_GROUP_BODY = "body:"; - - private final List queryAddObjects = new ArrayList(10); - private final List querySubObjects = new ArrayList(10); - private final Set groupViews = new HashSet(10); - private final Set queryViews = new HashSet(10); - - /** - * Execute the browse command, which allows you to browse the messages in a given JMS destination - * @param tokens - command arguments - * @throws Exception - */ - protected void runTask(List tokens) throws Exception { - try { - // If no destination specified - if (tokens.isEmpty()) { - GlobalWriter.printException(new IllegalArgumentException("No JMS destination specified.")); - return; - } - - // If no broker url specified - if (getBrokerUrl() == null) { - GlobalWriter.printException(new IllegalStateException("No broker url specified. Use the --amqurl option to specify a broker url.")); - return; - } - - // Display the messages for each destination - for (Iterator i=tokens.iterator(); i.hasNext();) { - String destName = (String)i.next(); - Destination dest; - - // If destination has been explicitly specified as a queue - if (destName.startsWith(QUEUE_PREFIX)) { - dest = new ActiveMQQueue(destName.substring(QUEUE_PREFIX.length())); - - // If destination has been explicitly specified as a topic - } else if (destName.startsWith(TOPIC_PREFIX)) { - dest = new ActiveMQTopic(destName.substring(TOPIC_PREFIX.length())); - - // By default destination is assumed to be a queue - } else { - dest = new ActiveMQQueue(destName); - } - - // Query for the messages to view - List addMsgs = AmqMessagesUtil.getMessages(getBrokerUrl(), dest, queryAddObjects); - - // Query for the messages to remove from view - if (querySubObjects.size() > 0) { - List subMsgs = AmqMessagesUtil.getMessages(getBrokerUrl(), dest, querySubObjects); - addMsgs.removeAll(subMsgs); - } - - // Display the messages - GlobalWriter.printMessage(AmqMessagesUtil.filterMessagesView(addMsgs, groupViews, queryViews)); - } - - } catch (Exception e) { - GlobalWriter.printException(new RuntimeException("Failed to execute browse task. Reason: " + e)); - throw new Exception(e); - } - } - - /** - * Handle the --msgsel, --xmsgsel, --view, -V options. - * @param token - option token to handle - * @param tokens - succeeding command arguments - * @throws Exception - */ - protected void handleOption(String token, List tokens) throws Exception { - - // If token is an additive message selector option - if (token.startsWith("--msgsel")) { - - // If no message selector is specified, or next token is a new option - if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { - GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); - return; - } - - StringTokenizer queryTokens = new StringTokenizer((String)tokens.remove(0), COMMAND_OPTION_DELIMETER); - while (queryTokens.hasMoreTokens()) { - queryAddObjects.add(queryTokens.nextToken()); - } - } - - // If token is a substractive message selector option - else if (token.startsWith("--xmsgsel")) { - - // If no message selector is specified, or next token is a new option - if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { - GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); - return; - } - - StringTokenizer queryTokens = new StringTokenizer((String)tokens.remove(0), COMMAND_OPTION_DELIMETER); - while (queryTokens.hasMoreTokens()) { - querySubObjects.add(queryTokens.nextToken()); - } - - } - - // If token is a view option - else if (token.startsWith("--view")) { - - // If no view specified, or next token is a new option - if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { - GlobalWriter.printException(new IllegalArgumentException("Attributes to view not specified")); - return; - } - - // Add the attributes to view - StringTokenizer viewTokens = new StringTokenizer((String)tokens.remove(0), COMMAND_OPTION_DELIMETER); - while (viewTokens.hasMoreTokens()) { - String viewToken = viewTokens.nextToken(); - - // If view is explicitly specified to belong to the JMS header - if (viewToken.equals(VIEW_GROUP_HEADER)) { - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + viewToken.substring(VIEW_GROUP_HEADER.length())); - - // If view is explicitly specified to belong to the JMS custom header - } else if (viewToken.equals(VIEW_GROUP_CUSTOM)) { - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + viewToken.substring(VIEW_GROUP_CUSTOM.length())); - - // If view is explicitly specified to belong to the JMS body - } else if (viewToken.equals(VIEW_GROUP_BODY)) { - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken.substring(VIEW_GROUP_BODY.length())); - - // If no view explicitly specified, let's check the view for each group - } else { - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + viewToken); - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + viewToken); - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken); - } - } - } - - // If token is a predefined group view option - else if (token.startsWith("-V")) { - String viewGroup = token.substring(2); - // If option is a header group view - if (viewGroup.equals("header")) { - groupViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX); - - // If option is a custom header group view - } else if (viewGroup.equals("custom")) { - groupViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX); - - // If option is a body group view - } else if (viewGroup.equals("body")) { - groupViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX); - - // Unknown group view - } else { - GlobalWriter.printInfo("Unknown group view: " + viewGroup + ". Ignoring group view option."); - } - } - - // Let super class handle unknown option - else { - super.handleOption(token, tokens); - } - } - - /** - * Print the help messages for the browse command - */ - protected void printHelp() { - GlobalWriter.printHelp(helpFile); - } + public static final String VIEW_GROUP_BODY = "body:"; protected String[] helpFile = new String[] { "Task Usage: Main browse --amqurl [browse-options] ", @@ -238,4 +69,173 @@ public class AmqBrowseCommand extends AbstractAmqCommand { " * To use wildcard queries, the field must be a string and the query enclosed in ''", "", }; + + private final List queryAddObjects = new ArrayList(10); + private final List querySubObjects = new ArrayList(10); + private final Set groupViews = new HashSet(10); + private final Set queryViews = new HashSet(10); + + /** + * Execute the browse command, which allows you to browse the messages in a + * given JMS destination + * + * @param tokens - command arguments + * @throws Exception + */ + protected void runTask(List tokens) throws Exception { + try { + // If no destination specified + if (tokens.isEmpty()) { + GlobalWriter.printException(new IllegalArgumentException("No JMS destination specified.")); + return; + } + + // If no broker url specified + if (getBrokerUrl() == null) { + GlobalWriter.printException(new IllegalStateException("No broker url specified. Use the --amqurl option to specify a broker url.")); + return; + } + + // Display the messages for each destination + for (Iterator i = tokens.iterator(); i.hasNext();) { + String destName = (String)i.next(); + Destination dest; + + // If destination has been explicitly specified as a queue + if (destName.startsWith(QUEUE_PREFIX)) { + dest = new ActiveMQQueue(destName.substring(QUEUE_PREFIX.length())); + + // If destination has been explicitly specified as a topic + } else if (destName.startsWith(TOPIC_PREFIX)) { + dest = new ActiveMQTopic(destName.substring(TOPIC_PREFIX.length())); + + // By default destination is assumed to be a queue + } else { + dest = new ActiveMQQueue(destName); + } + + // Query for the messages to view + List addMsgs = AmqMessagesUtil.getMessages(getBrokerUrl(), dest, queryAddObjects); + + // Query for the messages to remove from view + if (querySubObjects.size() > 0) { + List subMsgs = AmqMessagesUtil.getMessages(getBrokerUrl(), dest, querySubObjects); + addMsgs.removeAll(subMsgs); + } + + // Display the messages + GlobalWriter.printMessage(AmqMessagesUtil.filterMessagesView(addMsgs, groupViews, queryViews)); + } + + } catch (Exception e) { + GlobalWriter.printException(new RuntimeException("Failed to execute browse task. Reason: " + e)); + throw new Exception(e); + } + } + + /** + * Handle the --msgsel, --xmsgsel, --view, -V options. + * + * @param token - option token to handle + * @param tokens - succeeding command arguments + * @throws Exception + */ + protected void handleOption(String token, List tokens) throws Exception { + + // If token is an additive message selector option + if (token.startsWith("--msgsel")) { + + // If no message selector is specified, or next token is a new + // option + if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { + GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); + return; + } + + StringTokenizer queryTokens = new StringTokenizer((String)tokens.remove(0), COMMAND_OPTION_DELIMETER); + while (queryTokens.hasMoreTokens()) { + queryAddObjects.add(queryTokens.nextToken()); + } + } else if (token.startsWith("--xmsgsel")) { + // If token is a substractive message selector option + + // If no message selector is specified, or next token is a new + // option + if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { + GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); + return; + } + + StringTokenizer queryTokens = new StringTokenizer((String)tokens.remove(0), COMMAND_OPTION_DELIMETER); + while (queryTokens.hasMoreTokens()) { + querySubObjects.add(queryTokens.nextToken()); + } + + } else if (token.startsWith("--view")) { + // If token is a view option + + // If no view specified, or next token is a new option + if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { + GlobalWriter.printException(new IllegalArgumentException("Attributes to view not specified")); + return; + } + + // Add the attributes to view + StringTokenizer viewTokens = new StringTokenizer((String)tokens.remove(0), COMMAND_OPTION_DELIMETER); + while (viewTokens.hasMoreTokens()) { + String viewToken = viewTokens.nextToken(); + + // If view is explicitly specified to belong to the JMS header + if (viewToken.equals(VIEW_GROUP_HEADER)) { + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + viewToken.substring(VIEW_GROUP_HEADER.length())); + + // If view is explicitly specified to belong to the JMS + // custom header + } else if (viewToken.equals(VIEW_GROUP_CUSTOM)) { + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + viewToken.substring(VIEW_GROUP_CUSTOM.length())); + + // If view is explicitly specified to belong to the JMS body + } else if (viewToken.equals(VIEW_GROUP_BODY)) { + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken.substring(VIEW_GROUP_BODY.length())); + + // If no view explicitly specified, let's check the view for + // each group + } else { + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + viewToken); + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + viewToken); + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken); + } + } + } else if (token.startsWith("-V")) { + // If token is a predefined group view option + String viewGroup = token.substring(2); + // If option is a header group view + if (viewGroup.equals("header")) { + groupViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX); + + // If option is a custom header group view + } else if (viewGroup.equals("custom")) { + groupViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX); + + // If option is a body group view + } else if (viewGroup.equals("body")) { + groupViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX); + + // Unknown group view + } else { + GlobalWriter.printInfo("Unknown group view: " + viewGroup + ". Ignoring group view option."); + } + } else { + // Let super class handle unknown option + super.handleOption(token, tokens); + } + } + + /** + * Print the help messages for the browse command + */ + protected void printHelp() { + GlobalWriter.printHelp(helpFile); + } + } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/BrowseCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/BrowseCommand.java index cb6d4dee23..9d11b8d923 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/BrowseCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/BrowseCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,37 +16,72 @@ */ package org.apache.activemq.console.command; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; + +import javax.management.ObjectInstance; + import org.apache.activemq.console.formatter.GlobalWriter; import org.apache.activemq.console.util.AmqMessagesUtil; import org.apache.activemq.console.util.JmxMBeansUtil; -import javax.management.ObjectInstance; -import java.util.List; -import java.util.StringTokenizer; -import java.util.ArrayList; -import java.util.Set; -import java.util.HashSet; -import java.util.Iterator; - public class BrowseCommand extends AbstractJmxCommand { + public static final String QUEUE_PREFIX = "queue:"; public static final String TOPIC_PREFIX = "topic:"; public static final String VIEW_GROUP_HEADER = "header:"; public static final String VIEW_GROUP_CUSTOM = "custom:"; - public static final String VIEW_GROUP_BODY = "body:"; + public static final String VIEW_GROUP_BODY = "body:"; - private final List queryAddObjects = new ArrayList(10); - private final List querySubObjects = new ArrayList(10); - private final Set groupViews = new HashSet(10); - private final Set queryViews = new HashSet(10); + protected String[] helpFile = new String[] { + "Task Usage: Main browse [browse-options] ", "Description: Display selected destination's messages.", + "", + "Browse Options:", + " --msgsel Add to the search list messages matched by the query similar to", + " the messages selector format.", + " -V Predefined view that allows you to view the message header, custom", + " message header, or the message body.", + " --view ,,... Select the specific attribute of the message to view.", + " --jmxurl Set the JMX URL to connect to.", + " --version Display the version information.", + " -h,-?,--help Display the browse broker help information.", + "", + "Examples:", + " Main browse FOO.BAR", + " - Print the message header, custom message header, and message body of all messages in the", + " queue FOO.BAR", + "", + " Main browse -Vheader,body queue:FOO.BAR", + " - Print only the message header and message body of all messages in the queue FOO.BAR", + "", + " Main browse -Vheader --view custom:MyField queue:FOO.BAR", + " - Print the message header and the custom field 'MyField' of all messages in the queue FOO.BAR", + "", + " Main browse --msgsel JMSMessageID='*:10',JMSPriority>5 FOO.BAR", + " - Print all the message fields that has a JMSMessageID in the header field that matches the", + " wildcard *:10, and has a JMSPriority field > 5 in the queue FOO.BAR", + " * To use wildcard queries, the field must be a string and the query enclosed in ''", + "" + }; + + private final List queryAddObjects = new ArrayList(10); + private final List querySubObjects = new ArrayList(10); + private final Set groupViews = new HashSet(10); + private final Set queryViews = new HashSet(10); /** - * Execute the browse command, which allows you to browse the messages in a given JMS destination + * Execute the browse command, which allows you to browse the messages in a + * given JMS destination + * * @param tokens - command arguments * @throws Exception */ - protected void runTask(List tokens) throws Exception { + protected void runTask(List tokens) throws Exception { try { // If there is no queue name specified, let's select all if (tokens.isEmpty()) { @@ -55,11 +89,11 @@ public class BrowseCommand extends AbstractJmxCommand { } // Iterate through the queue names - for (Iterator i=tokens.iterator(); i.hasNext();) { + for (Iterator i = tokens.iterator(); i.hasNext();) { List queueList = JmxMBeansUtil.queryMBeans(useJmxServiceUrl(), "Type=Queue,Destination=" + i.next() + ",*"); // Iterate through the queue result - for (Iterator j=queueList.iterator(); j.hasNext();) { + for (Iterator j = queueList.iterator(); j.hasNext();) { List messages = JmxMBeansUtil.createMessageQueryFilter(useJmxServiceUrl(), ((ObjectInstance)j.next()).getObjectName()).query(queryAddObjects); GlobalWriter.printMessage(JmxMBeansUtil.filterMessagesView(messages, groupViews, queryViews)); } @@ -72,16 +106,18 @@ public class BrowseCommand extends AbstractJmxCommand { /** * Handle the --msgsel, --xmsgsel, --view, -V options. + * * @param token - option token to handle * @param tokens - succeeding command arguments * @throws Exception */ - protected void handleOption(String token, List tokens) throws Exception { + protected void handleOption(String token, List tokens) throws Exception { // If token is an additive message selector option if (token.startsWith("--msgsel")) { - // If no message selector is specified, or next token is a new option + // If no message selector is specified, or next token is a new + // option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); return; @@ -91,12 +127,11 @@ public class BrowseCommand extends AbstractJmxCommand { while (queryTokens.hasMoreTokens()) { queryAddObjects.add(queryTokens.nextToken()); } - } + } else if (token.startsWith("--xmsgsel")) { + // If token is a substractive message selector option - // If token is a substractive message selector option - else if (token.startsWith("--xmsgsel")) { - - // If no message selector is specified, or next token is a new option + // If no message selector is specified, or next token is a new + // option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); return; @@ -107,10 +142,8 @@ public class BrowseCommand extends AbstractJmxCommand { querySubObjects.add(queryTokens.nextToken()); } - } - - // If token is a view option - else if (token.startsWith("--view")) { + } else if (token.startsWith("--view")) { + // If token is a view option // If no view specified, or next token is a new option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { @@ -127,46 +160,44 @@ public class BrowseCommand extends AbstractJmxCommand { if (viewToken.equals(VIEW_GROUP_HEADER)) { queryViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + viewToken.substring(VIEW_GROUP_HEADER.length())); - // If view is explicitly specified to belong to the JMS custom header + // If view is explicitly specified to belong to the JMS + // custom header } else if (viewToken.equals(VIEW_GROUP_CUSTOM)) { queryViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + viewToken.substring(VIEW_GROUP_CUSTOM.length())); - // If view is explicitly specified to belong to the JMS body + // If view is explicitly specified to belong to the JMS body } else if (viewToken.equals(VIEW_GROUP_BODY)) { queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken.substring(VIEW_GROUP_BODY.length())); - // If no view explicitly specified, let's check the view for each group + // If no view explicitly specified, let's check the view for + // each group } else { queryViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + viewToken); queryViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + viewToken); - queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken); + queryViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + viewToken); } } - } - - // If token is a predefined group view option - else if (token.startsWith("-V")) { + } else if (token.startsWith("-V")) { + // If token is a predefined group view option String viewGroup = token.substring(2); // If option is a header group view if (viewGroup.equals("header")) { groupViews.add(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX); - // If option is a custom header group view + // If option is a custom header group view } else if (viewGroup.equals("custom")) { groupViews.add(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX); - // If option is a body group view + // If option is a body group view } else if (viewGroup.equals("body")) { groupViews.add(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX); - // Unknown group view + // Unknown group view } else { GlobalWriter.printInfo("Unknown group view: " + viewGroup + ". Ignoring group view option."); } - } - - // Let super class handle unknown option - else { + } else { + // Let super class handle unknown option super.handleOption(token, tokens); } } @@ -178,35 +209,4 @@ public class BrowseCommand extends AbstractJmxCommand { GlobalWriter.printHelp(helpFile); } - protected String[] helpFile = new String[] { - "Task Usage: Main browse [browse-options] ", - "Description: Display selected destination's messages.", - "", - "Browse Options:", - " --msgsel Add to the search list messages matched by the query similar to", - " the messages selector format.", - " -V Predefined view that allows you to view the message header, custom", - " message header, or the message body.", - " --view ,,... Select the specific attribute of the message to view.", - " --jmxurl Set the JMX URL to connect to.", - " --version Display the version information.", - " -h,-?,--help Display the browse broker help information.", - "", - "Examples:", - " Main browse FOO.BAR", - " - Print the message header, custom message header, and message body of all messages in the", - " queue FOO.BAR", - "", - " Main browse -Vheader,body queue:FOO.BAR", - " - Print only the message header and message body of all messages in the queue FOO.BAR", - "", - " Main browse -Vheader --view custom:MyField queue:FOO.BAR", - " - Print the message header and the custom field 'MyField' of all messages in the queue FOO.BAR", - "", - " Main browse --msgsel JMSMessageID='*:10',JMSPriority>5 FOO.BAR", - " - Print all the message fields that has a JMSMessageID in the header field that matches the", - " wildcard *:10, and has a JMSPriority field > 5 in the queue FOO.BAR", - " * To use wildcard queries, the field must be a string and the query enclosed in ''", - "", - }; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java index 085b743a7d..89f03a2c93 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/BstatCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,18 +16,34 @@ */ package org.apache.activemq.console.command; -import java.util.List; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class BstatCommand extends QueryCommand { + + protected String[] helpFile = new String[] { + "Task Usage: activemq-admin bstat [bstat-options] [broker-name]", + "Description: Performs a predefined query that displays useful statistics regarding the specified broker.", + " If no broker name is specified, it will try and select from all registered brokers.", + "", + "Bstat Options:", + " --jmxurl Set the JMX URL to connect to.", + " --version Display the version information.", + " -h,-?,--help Display the query broker help information.", + "", + "Examples:", + " activemq-admin bstat localhost", + " - Display a summary of statistics for the broker 'localhost'" + }; + /** * Performs a predefiend query option * @param tokens - command arguments * @throws Exception */ - protected void runTask(List tokens) throws Exception { - List queryTokens = new ArrayList(); + protected void runTask(List tokens) throws Exception { + List queryTokens = new ArrayList(); // Find the first non-option token String brokerName = "*"; for (Iterator i = tokens.iterator(); i.hasNext();) { @@ -47,26 +62,12 @@ public class BstatCommand extends QueryCommand { queryTokens.add("Type=*,BrokerName=" + brokerName); queryTokens.add("-xQTopic=ActiveMQ.Advisory.*"); queryTokens.add("--vuew"); - queryTokens.add("Type,BrokerName,Destination,ConnectorName,EnqueueCount," + - "DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages," + - "TotalMessages,ConsumerCount,TotalConsumerCount,DispatchQueueSize"); + queryTokens.add("Type,BrokerName,Destination,ConnectorName,EnqueueCount," + + "DequeueCount,TotalEnqueueCount,TotalDequeueCount,Messages," + + "TotalMessages,ConsumerCount,TotalConsumerCount,DispatchQueueSize"); // Call the query command super.runTask(queryTokens); } - protected String[] helpFile = new String[] { - "Task Usage: activemq-admin bstat [bstat-options] [broker-name]", - "Description: Performs a predefined query that displays useful statistics regarding the specified broker.", - " If no broker name is specified, it will try and select from all registered brokers.", - "", - "Bstat Options:", - " --jmxurl Set the JMX URL to connect to.", - " --version Display the version information.", - " -h,-?,--help Display the query broker help information.", - "", - "Examples:", - " activemq-admin bstat localhost", - " - Display a summary of statistics for the broker 'localhost'" - }; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/Command.java b/activemq-console/src/main/java/org/apache/activemq/console/command/Command.java index 4f91fc4446..6927c9e3c6 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/Command.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/Command.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -26,5 +25,5 @@ public interface Command { * @param tokens - arguments to the command * @throws Exception */ - public void execute(List tokens) throws Exception; + void execute(List tokens) throws Exception; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/ListCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/ListCommand.java index 5e80a9b7e9..027b2faa7a 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/ListCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/ListCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,15 +16,26 @@ */ package org.apache.activemq.console.command; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.apache.activemq.console.formatter.GlobalWriter; import org.apache.activemq.console.util.JmxMBeansUtil; -import java.util.List; -import java.util.Set; -import java.util.HashSet; - public class ListCommand extends AbstractJmxCommand { + protected String[] helpFile = new String[] { + "Task Usage: Main list [list-options]", + "Description: Lists all available broker in the specified JMX context.", + "", + "List Options:", + " --jmxurl Set the JMX URL to connect to.", + " --version Display the version information.", + " -h,-?,--help Display the stop broker help information.", + "" + }; + /** * List all running brokers registered in the specified JMX context * @param tokens - command arguments @@ -33,7 +43,7 @@ public class ListCommand extends AbstractJmxCommand { */ protected void runTask(List tokens) throws Exception { try { - Set propsView = new HashSet(); + Set propsView = new HashSet(); propsView.add("BrokerName"); GlobalWriter.printMBean(JmxMBeansUtil.filterMBeansView(JmxMBeansUtil.getAllBrokers(useJmxServiceUrl()), propsView)); } catch (Exception e) { @@ -49,14 +59,4 @@ public class ListCommand extends AbstractJmxCommand { GlobalWriter.printHelp(helpFile); } - protected String[] helpFile = new String[] { - "Task Usage: Main list [list-options]", - "Description: Lists all available broker in the specified JMX context.", - "", - "List Options:", - " --jmxurl Set the JMX URL to connect to.", - " --version Display the version information.", - " -h,-?,--help Display the stop broker help information.", - "" - }; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/PurgeCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/PurgeCommand.java index ccd9d83164..77f8729f10 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/PurgeCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/PurgeCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,30 +16,56 @@ */ package org.apache.activemq.console.command; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.StringTokenizer; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectInstance; +import javax.management.ObjectName; +import javax.management.openmbean.CompositeData; +import javax.management.remote.JMXConnector; + import org.apache.activemq.console.formatter.GlobalWriter; import org.apache.activemq.console.util.JmxMBeansUtil; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.management.MBeanServerConnection; -import javax.management.openmbean.CompositeData; -import javax.management.remote.JMXConnector; -import java.util.List; -import java.util.StringTokenizer; -import java.util.ArrayList; -import java.util.Iterator; - public class PurgeCommand extends AbstractJmxCommand { - private final List queryAddObjects = new ArrayList(10); - private final List querySubObjects = new ArrayList(10); + protected String[] helpFile = new String[] { + "Task Usage: Main purge [browse-options] ", + "Description: Delete selected destination's messages that matches the message selector.", + "", + "Browse Options:", + " --msgsel Add to the search list messages matched by the query similar to", + " the messages selector format.", + " --jmxurl Set the JMX URL to connect to.", + " --version Display the version information.", + " -h,-?,--help Display the browse broker help information.", + "", + "Examples:", + " Main purge FOO.BAR", + " - Delete all the messages in queue FOO.BAR", + + " Main purge --msgsel JMSMessageID='*:10',JMSPriority>5 FOO.*", + " - Delete all the messages in the destinations that matches FOO.* and has a JMSMessageID in", + " the header field that matches the wildcard *:10, and has a JMSPriority field > 5 in the", + " queue FOO.BAR", + " * To use wildcard queries, the field must be a string and the query enclosed in ''", + "", + }; + + private final List queryAddObjects = new ArrayList(10); + private final List querySubObjects = new ArrayList(10); /** - * Execute the purge command, which allows you to purge the messages in a given JMS destination + * Execute the purge command, which allows you to purge the messages in a + * given JMS destination + * * @param tokens - command arguments * @throws Exception */ - protected void runTask(List tokens) throws Exception { + protected void runTask(List tokens) throws Exception { try { // If there is no queue name specified, let's select all if (tokens.isEmpty()) { @@ -48,10 +73,10 @@ public class PurgeCommand extends AbstractJmxCommand { } // Iterate through the queue names - for (Iterator i=tokens.iterator(); i.hasNext();) { + for (Iterator i = tokens.iterator(); i.hasNext();) { List queueList = JmxMBeansUtil.queryMBeans(useJmxServiceUrl(), "Type=Queue,Destination=" + i.next() + ",*"); - for (Iterator j=queueList.iterator(); j.hasNext();) { + for (Iterator j = queueList.iterator(); j.hasNext();) { ObjectName queueName = ((ObjectInstance)j.next()).getObjectName(); if (queryAddObjects.isEmpty()) { purgeQueue(queueName); @@ -69,6 +94,7 @@ public class PurgeCommand extends AbstractJmxCommand { /** * Purge all the messages in the queue + * * @param queue - ObjectName of the queue to purge * @throws Exception */ @@ -82,6 +108,7 @@ public class PurgeCommand extends AbstractJmxCommand { /** * Purge selected messages in the queue + * * @param queue - ObjectName of the queue to purge the messages from * @param messages - List of messages to purge * @throws Exception @@ -91,11 +118,13 @@ public class PurgeCommand extends AbstractJmxCommand { MBeanServerConnection server = conn.getMBeanServerConnection(); Object[] param = new Object[1]; - for (Iterator i=messages.iterator(); i.hasNext();) { + for (Iterator i = messages.iterator(); i.hasNext();) { CompositeData msg = (CompositeData)i.next(); param[0] = "" + msg.get("JMSMessageID"); GlobalWriter.printInfo("Removing message: " + param[0] + " from queue: " + queue.getKeyProperty("Destination")); - server.invoke(queue, "removeMessage", param, new String[] {"java.lang.String"}); + server.invoke(queue, "removeMessage", param, new String[] { + "java.lang.String" + }); } conn.close(); @@ -103,15 +132,17 @@ public class PurgeCommand extends AbstractJmxCommand { /** * Handle the --msgsel, --xmsgsel. + * * @param token - option token to handle * @param tokens - succeeding command arguments * @throws Exception */ - protected void handleOption(String token, List tokens) throws Exception { + protected void handleOption(String token, List tokens) throws Exception { // If token is an additive message selector option if (token.startsWith("--msgsel")) { - // If no message selector is specified, or next token is a new option + // If no message selector is specified, or next token is a new + // option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); return; @@ -121,12 +152,11 @@ public class PurgeCommand extends AbstractJmxCommand { while (queryTokens.hasMoreTokens()) { queryAddObjects.add(queryTokens.nextToken()); } - } + } else if (token.startsWith("--xmsgsel")) { + // If token is a substractive message selector option - // If token is a substractive message selector option - else if (token.startsWith("--xmsgsel")) { - - // If no message selector is specified, or next token is a new option + // If no message selector is specified, or next token is a new + // option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { GlobalWriter.printException(new IllegalArgumentException("Message selector not specified")); return; @@ -137,10 +167,8 @@ public class PurgeCommand extends AbstractJmxCommand { querySubObjects.add(queryTokens.nextToken()); } - } - - // Let super class handle unknown option - else { + } else { + // Let super class handle unknown option super.handleOption(token, tokens); } } @@ -152,26 +180,4 @@ public class PurgeCommand extends AbstractJmxCommand { GlobalWriter.printHelp(helpFile); } - protected String[] helpFile = new String[] { - "Task Usage: Main purge [browse-options] ", - "Description: Delete selected destination's messages that matches the message selector.", - "", - "Browse Options:", - " --msgsel Add to the search list messages matched by the query similar to", - " the messages selector format.", - " --jmxurl Set the JMX URL to connect to.", - " --version Display the version information.", - " -h,-?,--help Display the browse broker help information.", - "", - "Examples:", - " Main purge FOO.BAR", - " - Delete all the messages in queue FOO.BAR", - - " Main purge --msgsel JMSMessageID='*:10',JMSPriority>5 FOO.*", - " - Delete all the messages in the destinations that matches FOO.* and has a JMSMessageID in", - " the header field that matches the wildcard *:10, and has a JMSPriority field > 5 in the", - " queue FOO.BAR", - " * To use wildcard queries, the field must be a string and the query enclosed in ''", - "", - }; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java index c3bc70212f..c2ce54193a 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/QueryCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,40 +16,92 @@ */ package org.apache.activemq.console.command; -import org.apache.activemq.console.util.JmxMBeansUtil; -import org.apache.activemq.console.formatter.GlobalWriter; - -import java.util.List; -import java.util.Properties; import java.util.ArrayList; import java.util.Enumeration; -import java.util.StringTokenizer; -import java.util.Set; import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; + +import org.apache.activemq.console.formatter.GlobalWriter; +import org.apache.activemq.console.util.JmxMBeansUtil; public class QueryCommand extends AbstractJmxCommand { // Predefined type=identifier query private static final Properties PREDEFINED_OBJNAME_QUERY = new Properties(); static { - PREDEFINED_OBJNAME_QUERY.setProperty("Broker", "Type=Broker,BrokerName=%1,*"); - PREDEFINED_OBJNAME_QUERY.setProperty("Connection", "Type=Connection,Connection=%1,*"); - PREDEFINED_OBJNAME_QUERY.setProperty("Connector", "Type=Connector,ConnectorName=%1,*"); + PREDEFINED_OBJNAME_QUERY.setProperty("Broker", "Type=Broker,BrokerName=%1,*"); + PREDEFINED_OBJNAME_QUERY.setProperty("Connection", "Type=Connection,Connection=%1,*"); + PREDEFINED_OBJNAME_QUERY.setProperty("Connector", "Type=Connector,ConnectorName=%1,*"); PREDEFINED_OBJNAME_QUERY.setProperty("NetworkConnector", "Type=NetworkConnector,BrokerName=%1,*"); - PREDEFINED_OBJNAME_QUERY.setProperty("Queue", "Type=Queue,Destination=%1,*"); - PREDEFINED_OBJNAME_QUERY.setProperty("Topic", "Type=Topic,Destination=%1,*"); + PREDEFINED_OBJNAME_QUERY.setProperty("Queue", "Type=Queue,Destination=%1,*"); + PREDEFINED_OBJNAME_QUERY.setProperty("Topic", "Type=Topic,Destination=%1,*"); }; - private final List queryAddObjects = new ArrayList(10); - private final List querySubObjects = new ArrayList(10); - private final Set queryViews = new HashSet(10); + protected String[] helpFile = new String[] { + "Task Usage: Main query [query-options]", + "Description: Display selected broker component's attributes and statistics.", + "", + "Query Options:", + " -Q= Add to the search list the specific object type matched", + " by the defined object identifier.", + " -xQ= Remove from the search list the specific object type", + " matched by the object identifier.", + " --objname Add to the search list objects matched by the query similar", + " to the JMX object name format.", + " --xobjname Remove from the search list objects matched by the query", + " similar to the JMX object name format.", + " --view ,,... Select the specific attribute of the object to view.", + " By default all attributes will be displayed.", + " --jmxurl Set the JMX URL to connect to.", + " --version Display the version information.", + " -h,-?,--help Display the query broker help information.", + "", "Examples:", + " query", + " - Print all the attributes of all registered objects queues, topics, connections, etc).", + "", + " query -QQueue=TEST.FOO", + " - Print all the attributes of the queue with destination name TEST.FOO.", + "", + " query -QTopic=*", + " - Print all the attributes of all registered topics.", + "", + " query --view EnqueueCount,DequeueCount", + " - Print the attributes EnqueueCount and DequeueCount of all registered objects.", + "", + " query -QTopic=* --view EnqueueCount,DequeueCount", + " - Print the attributes EnqueueCount and DequeueCount of all registered topics.", + "", + " query -QTopic=* -QQueue=* --view EnqueueCount,DequeueCount", + " - Print the attributes EnqueueCount and DequeueCount of all registered topics and", + " queues.", + "", + " query -QTopic=* -xQTopic=ActiveMQ.Advisory.*", + " - Print all attributes of all topics except those that has a name that begins", + " with \"ActiveMQ.Advisory\".", + "", + " query --objname Type=*Connect*,BrokerName=local* -xQNetworkConnector=*", + " - Print all attributes of all connectors, connections excluding network connectors", + " that belongs to the broker that begins with local.", + "", + " query -QQueue=* -xQQueue=????", + " - Print all attributes of all queues except those that are 4 letters long.", + "", + }; + + private final List queryAddObjects = new ArrayList(10); + private final List querySubObjects = new ArrayList(10); + private final Set queryViews = new HashSet(10); /** * Queries the mbeans registered in the specified JMX context + * * @param tokens - command arguments * @throws Exception */ - protected void runTask(List tokens) throws Exception { + protected void runTask(List tokens) throws Exception { try { // Query for the mbeans to add List addMBeans = JmxMBeansUtil.queryMBeans(useJmxServiceUrl(), queryAddObjects, queryViews); @@ -61,7 +112,6 @@ public class QueryCommand extends AbstractJmxCommand { addMBeans.removeAll(subMBeans); } - GlobalWriter.printMBean(JmxMBeansUtil.filterMBeansView(addMBeans, queryViews)); } catch (Exception e) { @@ -72,11 +122,12 @@ public class QueryCommand extends AbstractJmxCommand { /** * Handle the -Q, -xQ, --objname, --xobjname, --view options. + * * @param token - option token to handle * @param tokens - succeeding command arguments * @throws Exception */ - protected void handleOption(String token, List tokens) throws Exception { + protected void handleOption(String token, List tokens) throws Exception { // If token is a additive predefined query define option if (token.startsWith("-Q")) { String key = token.substring(2); @@ -98,10 +149,8 @@ public class QueryCommand extends AbstractJmxCommand { while (queryTokens.hasMoreTokens()) { queryAddObjects.add(queryTokens.nextToken()); } - } - - // If token is a substractive predefined query define option - else if (token.startsWith("-xQ")) { + } else if (token.startsWith("-xQ")) { + // If token is a substractive predefined query define option String key = token.substring(3); String value = ""; int pos = key.indexOf("="); @@ -121,12 +170,11 @@ public class QueryCommand extends AbstractJmxCommand { while (queryTokens.hasMoreTokens()) { querySubObjects.add(queryTokens.nextToken()); } - } + } else if (token.startsWith("--objname")) { + // If token is an additive object name query option - // If token is an additive object name query option - else if (token.startsWith("--objname")) { - - // If no object name query is specified, or next token is a new option + // If no object name query is specified, or next token is a new + // option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { GlobalWriter.printException(new IllegalArgumentException("Object name query not specified")); return; @@ -136,12 +184,11 @@ public class QueryCommand extends AbstractJmxCommand { while (queryTokens.hasMoreTokens()) { queryAddObjects.add(queryTokens.nextToken()); } - } + } else if (token.startsWith("--xobjname")) { + // If token is a substractive object name query option - // If token is a substractive object name query option - else if (token.startsWith("--xobjname")) { - - // If no object name query is specified, or next token is a new option + // If no object name query is specified, or next token is a new + // option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { GlobalWriter.printException(new IllegalArgumentException("Object name query not specified")); return; @@ -151,10 +198,8 @@ public class QueryCommand extends AbstractJmxCommand { while (queryTokens.hasMoreTokens()) { querySubObjects.add(queryTokens.nextToken()); } - } - - // If token is a view option - else if (token.startsWith("--view")) { + } else if (token.startsWith("--view")) { + // If token is a view option // If no view specified, or next token is a new option if (tokens.isEmpty() || ((String)tokens.get(0)).startsWith("-")) { @@ -167,10 +212,8 @@ public class QueryCommand extends AbstractJmxCommand { while (viewTokens.hasMoreElements()) { queryViews.add(viewTokens.nextElement()); } - } - - // Let super class handle unknown option - else { + } else { + // Let super class handle unknown option super.handleOption(token, tokens); } } @@ -181,56 +224,5 @@ public class QueryCommand extends AbstractJmxCommand { protected void printHelp() { GlobalWriter.printHelp(helpFile); } - - protected String[] helpFile = new String[] { - "Task Usage: Main query [query-options]", - "Description: Display selected broker component's attributes and statistics.", - "", - "Query Options:", - " -Q= Add to the search list the specific object type matched", - " by the defined object identifier.", - " -xQ= Remove from the search list the specific object type", - " matched by the object identifier.", - " --objname Add to the search list objects matched by the query similar", - " to the JMX object name format.", - " --xobjname Remove from the search list objects matched by the query", - " similar to the JMX object name format.", - " --view ,,... Select the specific attribute of the object to view.", - " By default all attributes will be displayed.", - " --jmxurl Set the JMX URL to connect to.", - " --version Display the version information.", - " -h,-?,--help Display the query broker help information.", - "", - "Examples:", - " query", - " - Print all the attributes of all registered objects queues, topics, connections, etc).", - "", - " query -QQueue=TEST.FOO", - " - Print all the attributes of the queue with destination name TEST.FOO.", - "", - " query -QTopic=*", - " - Print all the attributes of all registered topics.", - "", - " query --view EnqueueCount,DequeueCount", - " - Print the attributes EnqueueCount and DequeueCount of all registered objects.", - "", - " query -QTopic=* --view EnqueueCount,DequeueCount", - " - Print the attributes EnqueueCount and DequeueCount of all registered topics.", - "", - " query -QTopic=* -QQueue=* --view EnqueueCount,DequeueCount", - " - Print the attributes EnqueueCount and DequeueCount of all registered topics and", - " queues.", - "", - " query -QTopic=* -xQTopic=ActiveMQ.Advisory.*", - " - Print all attributes of all topics except those that has a name that begins", - " with \"ActiveMQ.Advisory\".", - "", - " query --objname Type=*Connect*,BrokerName=local* -xQNetworkConnector=*", - " - Print all attributes of all connectors, connections excluding network connectors", - " that belongs to the broker that begins with local.", - "", - " query -QQueue=* -xQQueue=????", - " - Print all attributes of all queues except those that are 4 letters long.", - "", - }; + } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java index 36bd445dfc..9ecc80a3f0 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,50 +16,50 @@ */ package org.apache.activemq.console.command; -import org.apache.activemq.console.formatter.GlobalWriter; -import org.apache.activemq.console.formatter.CommandShellOutputFormatter; - -import java.util.List; -import java.util.Arrays; -import java.util.ArrayList; import java.io.InputStream; import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.activemq.console.formatter.CommandShellOutputFormatter; +import org.apache.activemq.console.formatter.GlobalWriter; public class ShellCommand extends AbstractCommand { private boolean interactive; private String[] helpFile; - public ShellCommand() { this(false); } public ShellCommand(boolean interactive) { this.interactive = interactive; - this.helpFile = new String[]{ - (interactive ? "Usage: [task] [task-options] [task data]" : "Usage: Main [--extdir ] [task] [task-options] [task data]"), - "", - "Tasks (default task is start):", - " start - Creates and starts a broker using a configuration file, or a broker URI.", - " stop - Stops a running broker specified by the broker name.", - " list - Lists all available brokers in the specified JMX context.", - " query - Display selected broker component's attributes and statistics.", - " browse - Display selected messages in a specified destination.", - "", - "Task Options (Options specific to each task):", - " --extdir - Add the jar files in the directory to the classpath.", - " --version - Display the version information.", - " -h,-?,--help - Display this help information. To display task specific help, use " + (interactive ? "" : "Main ") + "[task] -h,-?,--help", - "", - "Task Data:", - " - Information needed by each specific task.", - "" + this.helpFile = new String[] { + interactive ? "Usage: [task] [task-options] [task data]" : "Usage: Main [--extdir ] [task] [task-options] [task data]", + "", + "Tasks (default task is start):", + " start - Creates and starts a broker using a configuration file, or a broker URI.", + " stop - Stops a running broker specified by the broker name.", + " list - Lists all available brokers in the specified JMX context.", + " query - Display selected broker component's attributes and statistics.", + " browse - Display selected messages in a specified destination.", + "", + "Task Options (Options specific to each task):", + " --extdir - Add the jar files in the directory to the classpath.", + " --version - Display the version information.", + " -h,-?,--help - Display this help information. To display task specific help, use " + (interactive ? "" : "Main ") + "[task] -h,-?,--help", + "", + "Task Data:", + " - Information needed by each specific task.", + "" }; } /** * Main method to run a command shell client. + * * @param args - command line arguments * @param in - input stream to use * @param out - output stream to use @@ -70,7 +69,7 @@ public class ShellCommand extends AbstractCommand { GlobalWriter.instantiate(new CommandShellOutputFormatter(out)); // Convert arguments to list for easier management - List tokens = new ArrayList(Arrays.asList(args)); + List tokens = new ArrayList(Arrays.asList(args)); ShellCommand main = new ShellCommand(); try { @@ -82,7 +81,6 @@ public class ShellCommand extends AbstractCommand { } } - public boolean isInteractive() { return interactive; } @@ -93,13 +91,14 @@ public class ShellCommand extends AbstractCommand { /** * Parses for specific command task. + * * @param tokens - command arguments * @throws Exception */ - protected void runTask(List tokens) throws Exception { - + protected void runTask(List tokens) throws Exception { + // Process task token - if( tokens.size() > 0 ) { + if (tokens.size() > 0) { String taskToken = (String)tokens.remove(0); if (taskToken.equals("start")) { new StartCommand().execute(tokens); @@ -123,7 +122,7 @@ public class ShellCommand extends AbstractCommand { } else { printHelp(); } - + } /** diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java index 4f236c479d..dd36062e9a 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/ShutdownCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,23 +16,43 @@ */ package org.apache.activemq.console.command; -import org.apache.activemq.console.util.JmxMBeansUtil; -import org.apache.activemq.console.formatter.GlobalWriter; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.ObjectInstance; -import javax.management.remote.JMXServiceURL; -import java.util.List; -import java.util.Iterator; import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; +import java.util.List; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectInstance; +import javax.management.ObjectName; +import javax.management.remote.JMXServiceURL; + +import org.apache.activemq.console.formatter.GlobalWriter; +import org.apache.activemq.console.util.JmxMBeansUtil; public class ShutdownCommand extends AbstractJmxCommand { - private boolean isStopAllBrokers = false; + + protected String[] helpFile = new String[] { + "Task Usage: Main stop [stop-options] [broker-name1] [broker-name2] ...", + "Description: Stops a running broker.", + "", + "Stop Options:", + " --jmxurl Set the JMX URL to connect to.", + " --all Stop all brokers.", + " --version Display the version information.", + " -h,-?,--help Display the stop broker help information.", + "", + "Broker Names:", + " Name of the brokers that will be stopped.", + " If omitted, it is assumed that there is only one broker running, and it will be stopped.", + " Use -all to stop all running brokers.", + "" + }; + + private boolean isStopAllBrokers; /** * Shuts down the specified broker or brokers + * * @param brokerNames - names of brokers to shutdown * @throws Exception */ @@ -45,10 +64,8 @@ public class ShutdownCommand extends AbstractJmxCommand { if (isStopAllBrokers) { mbeans = JmxMBeansUtil.getAllBrokers(useJmxServiceUrl()); brokerNames.clear(); - } - - // Stop the default broker - else if (brokerNames.isEmpty()) { + } else if (brokerNames.isEmpty()) { + // Stop the default broker mbeans = JmxMBeansUtil.getAllBrokers(useJmxServiceUrl()); // If there is no broker to stop @@ -56,21 +73,19 @@ public class ShutdownCommand extends AbstractJmxCommand { GlobalWriter.printInfo("There are no brokers to stop."); return; - // There should only be one broker to stop + // There should only be one broker to stop } else if (mbeans.size() > 1) { GlobalWriter.printInfo("There are multiple brokers to stop. Please select the broker(s) to stop or use --all to stop all brokers."); return; - // Get the first broker only + // Get the first broker only } else { Object firstBroker = mbeans.iterator().next(); mbeans.clear(); mbeans.add(firstBroker); } - } - - // Stop each specified broker - else { + } else { + // Stop each specified broker String brokerName; mbeans = new HashSet(); while (!brokerNames.isEmpty()) { @@ -94,6 +109,7 @@ public class ShutdownCommand extends AbstractJmxCommand { /** * Stops the list of brokers. + * * @param jmxServiceUrl - JMX service url to connect to * @param brokerBeans - broker mbeans to stop * @throws Exception @@ -102,18 +118,23 @@ public class ShutdownCommand extends AbstractJmxCommand { MBeanServerConnection server = createJmxConnector().getMBeanServerConnection(); ObjectName brokerObjName; - for (Iterator i=brokerBeans.iterator(); i.hasNext();) { + for (Iterator i = brokerBeans.iterator(); i.hasNext();) { brokerObjName = ((ObjectInstance)i.next()).getObjectName(); String brokerName = brokerObjName.getKeyProperty("BrokerName"); GlobalWriter.print("Stopping broker: " + brokerName); try { - server.invoke(brokerObjName, "terminateJVM", new Object[] {Integer.valueOf(0)}, new String[] {"int"}); + server.invoke(brokerObjName, "terminateJVM", new Object[] { + Integer.valueOf(0) + }, new String[] { + "int" + }); GlobalWriter.print("Succesfully stopped broker: " + brokerName); } catch (Exception e) { // TODO: Check exceptions throwned - //System.out.println("Failed to stop broker: [ " + brokerName + " ]. Reason: " + e.getMessage()); + // System.out.println("Failed to stop broker: [ " + brokerName + + // " ]. Reason: " + e.getMessage()); } } @@ -122,11 +143,12 @@ public class ShutdownCommand extends AbstractJmxCommand { /** * Handle the --all option. + * * @param token - option token to handle * @param tokens - succeeding command arguments * @throws Exception */ - protected void handleOption(String token, List tokens) throws Exception { + protected void handleOption(String token, List tokens) throws Exception { // Try to handle the options first if (token.equals("--all")) { isStopAllBrokers = true; @@ -143,20 +165,4 @@ public class ShutdownCommand extends AbstractJmxCommand { GlobalWriter.printHelp(helpFile); } - protected String[] helpFile = new String[] { - "Task Usage: Main stop [stop-options] [broker-name1] [broker-name2] ...", - "Description: Stops a running broker.", - "", - "Stop Options:", - " --jmxurl Set the JMX URL to connect to.", - " --all Stop all brokers.", - " --version Display the version information.", - " -h,-?,--help Display the stop broker help information.", - "", - "Broker Names:", - " Name of the brokers that will be stopped.", - " If omitted, it is assumed that there is only one broker running, and it will be stopped.", - " Use -all to stop all running brokers.", - "" - }; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/StartCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/StartCommand.java index 3a7b0fdc02..ac44c2c1e6 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/command/StartCommand.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/command/StartCommand.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -18,127 +17,19 @@ package org.apache.activemq.console.command; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.console.formatter.GlobalWriter; -import java.util.List; -import java.util.ArrayList; -import java.util.Iterator; -import java.net.URI; -import java.net.URISyntaxException; - public class StartCommand extends AbstractCommand { - public static final String DEFAULT_CONFIG_URI = "xbean:activemq.xml"; - - private URI configURI; - private List brokers = new ArrayList(5); - - /** - * The default task to start a broker or a group of brokers - * @param brokerURIs - */ - protected void runTask(List brokerURIs) throws Exception { - try { - // If no config uri, use default setting - if (brokerURIs.isEmpty()) { - setConfigUri(new URI(DEFAULT_CONFIG_URI)); - startBroker(getConfigUri()); - - // Set configuration data, if available, which in this case would be the config URI - } else { - String strConfigURI; - - while (!brokerURIs.isEmpty()) { - strConfigURI = (String)brokerURIs.remove(0); - - try { - setConfigUri(new URI(strConfigURI)); - } catch (URISyntaxException e) { - GlobalWriter.printException(e); - return; - } - - startBroker(getConfigUri()); - } - } - - // Prevent the main thread from exiting unless it is terminated elsewhere - waitForShutdown(); - } catch (Exception e) { - GlobalWriter.printException(new RuntimeException("Failed to execute start task. Reason: " + e, e)); - throw new Exception(e); - } - } - - /** - * Create and run a broker specified by the given configuration URI - * @param configURI - * @throws Exception - */ - public void startBroker(URI configURI) throws Exception { - System.out.println("Loading message broker from: " + configURI); - BrokerService broker = BrokerFactory.createBroker(configURI); - brokers.add(broker); - - broker.start(); - } - - /** - * Wait for a shutdown invocation elsewhere - * @throws Exception - */ - protected void waitForShutdown() throws Exception { - final boolean[] shutdown = new boolean[] {false}; - Runtime.getRuntime().addShutdownHook(new Thread() { - public void run() { - synchronized(shutdown) { - shutdown[0]=true; - shutdown.notify(); - } - } - }); - - // Wait for any shutdown event - synchronized(shutdown) { - while( !shutdown[0] ) { - try { - shutdown.wait(); - } catch (InterruptedException e) { - } - } - } - - // Stop each broker - for (Iterator i=brokers.iterator(); i.hasNext();) { - BrokerService broker = (BrokerService)i.next(); - broker.stop(); - } - } - - /** - * Sets the current configuration URI used by the start task - * @param uri - */ - public void setConfigUri(URI uri) { - configURI = uri; - } - - /** - * Gets the current configuration URI used by the start task - * @return current configuration URI - */ - public URI getConfigUri() { - return configURI; - } - - /** - * Print the help messages for the browse command - */ - protected void printHelp() { - GlobalWriter.printHelp(helpFile); - } + public static final String DEFAULT_CONFIG_URI = "xbean:activemq.xml"; protected String[] helpFile = new String[] { "Task Usage: Main start [start-options] [uri]", @@ -146,7 +37,7 @@ public class StartCommand extends AbstractCommand { "", "Start Options:", " -D= Define a system property.", - " --version Display the version information.", + " --version Display the version information.", " -h,-?,--help Display the start broker help information.", "", "URI:", @@ -166,4 +57,121 @@ public class StartCommand extends AbstractCommand { " Configures the broker with 1 transport connector, and 1 network connector and persistence disabled", "" }; + + private URI configURI; + private List brokers = new ArrayList(5); + + /** + * The default task to start a broker or a group of brokers + * + * @param brokerURIs + */ + protected void runTask(List brokerURIs) throws Exception { + try { + // If no config uri, use default setting + if (brokerURIs.isEmpty()) { + setConfigUri(new URI(DEFAULT_CONFIG_URI)); + startBroker(getConfigUri()); + + // Set configuration data, if available, which in this case + // would be the config URI + } else { + String strConfigURI; + + while (!brokerURIs.isEmpty()) { + strConfigURI = (String)brokerURIs.remove(0); + + try { + setConfigUri(new URI(strConfigURI)); + } catch (URISyntaxException e) { + GlobalWriter.printException(e); + return; + } + + startBroker(getConfigUri()); + } + } + + // Prevent the main thread from exiting unless it is terminated + // elsewhere + waitForShutdown(); + } catch (Exception e) { + GlobalWriter.printException(new RuntimeException("Failed to execute start task. Reason: " + e, e)); + throw new Exception(e); + } + } + + /** + * Create and run a broker specified by the given configuration URI + * + * @param configURI + * @throws Exception + */ + public void startBroker(URI configURI) throws Exception { + System.out.println("Loading message broker from: " + configURI); + BrokerService broker = BrokerFactory.createBroker(configURI); + brokers.add(broker); + broker.start(); + } + + /** + * Wait for a shutdown invocation elsewhere + * + * @throws Exception + */ + protected void waitForShutdown() throws Exception { + final boolean[] shutdown = new boolean[] { + false + }; + Runtime.getRuntime().addShutdownHook(new Thread() { + public void run() { + synchronized (shutdown) { + shutdown[0] = true; + shutdown.notify(); + } + } + }); + + // Wait for any shutdown event + synchronized (shutdown) { + while (!shutdown[0]) { + try { + shutdown.wait(); + } catch (InterruptedException e) { + } + } + } + + // Stop each broker + for (Iterator i = brokers.iterator(); i.hasNext();) { + BrokerService broker = i.next(); + broker.stop(); + } + } + + /** + * Sets the current configuration URI used by the start task + * + * @param uri + */ + public void setConfigUri(URI uri) { + configURI = uri; + } + + /** + * Gets the current configuration URI used by the start task + * + * @return current configuration URI + */ + public URI getConfigUri() { + return configURI; + } + + /** + * Print the help messages for the browse command + */ + protected void printHelp() { + GlobalWriter.printHelp(helpFile); + } + } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/AbstractQueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/AbstractQueryFilter.java index 944b094134..cef654faf8 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/AbstractQueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/AbstractQueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,9 +16,9 @@ */ package org.apache.activemq.console.filter; +import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import java.util.Collections; public abstract class AbstractQueryFilter implements QueryFilter { protected QueryFilter next; diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/AmqMessagesQueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/AmqMessagesQueryFilter.java index 50e900dbe1..ebf3f4e7a5 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/AmqMessagesQueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/AmqMessagesQueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,19 +16,20 @@ */ package org.apache.activemq.console.filter; -import org.apache.activemq.command.ActiveMQTopic; -import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq.ActiveMQConnectionFactory; - -import javax.jms.Destination; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Session; -import javax.jms.QueueBrowser; import java.net.URI; import java.util.Collections; -import java.util.List; import java.util.Iterator; +import java.util.List; + +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.QueueBrowser; +import javax.jms.Session; + +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; public class AmqMessagesQueryFilter extends AbstractQueryFilter { @@ -38,17 +38,19 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Create a JMS message query filter + * * @param brokerUrl - broker url to connect to * @param destination - JMS destination to query */ public AmqMessagesQueryFilter(URI brokerUrl, Destination destination) { super(null); - this.brokerUrl = brokerUrl; + this.brokerUrl = brokerUrl; this.destination = destination; } /** * Queries the specified destination using the message selector format query + * * @param queries - message selector queries * @return list messages that matches the selector * @throws Exception @@ -57,12 +59,12 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { String selector = ""; // Convert to message selector - for (Iterator i=queries.iterator(); i.hasNext();) { + for (Iterator i = queries.iterator(); i.hasNext();) { selector = selector + "(" + i.next().toString() + ") AND "; } // Remove last AND - if (selector != "") { + if (!selector.equals("")) { selector = selector.substring(0, selector.length() - 5); } @@ -75,6 +77,7 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Query the messages of a queue destination using a queue browser + * * @param queue - queue destination * @param selector - message selector * @return list of messages that matches the selector @@ -95,19 +98,23 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Query the messages of a topic destination using a message consumer + * * @param topic - topic destination * @param selector - message selector * @return list of messages that matches the selector * @throws Exception */ protected List queryMessages(ActiveMQTopic topic, String selector) throws Exception { - // TODO: should we use a durable subscriber or a retroactive non-durable subscriber? - // TODO: if a durable subscriber is used, how do we manage it? subscribe/unsubscribe tasks? + // TODO: should we use a durable subscriber or a retroactive non-durable + // subscriber? + // TODO: if a durable subscriber is used, how do we manage it? + // subscribe/unsubscribe tasks? return null; } /** * Create and start a JMS connection + * * @param brokerUrl - broker url to connect to. * @return JMS connection * @throws JMSException @@ -120,6 +127,7 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Get the broker url being used. + * * @return broker url */ public URI getBrokerUrl() { @@ -128,6 +136,7 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Set the broker url to use. + * * @param brokerUrl - broker url */ public void setBrokerUrl(URI brokerUrl) { @@ -136,6 +145,7 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Get the destination being used. + * * @return - JMS destination */ public Destination getDestination() { @@ -144,6 +154,7 @@ public class AmqMessagesQueryFilter extends AbstractQueryFilter { /** * Set the destination to use. + * * @param destination - JMS destination */ public void setDestination(Destination destination) { diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/GroupPropertiesViewFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/GroupPropertiesViewFilter.java index 39425d3b41..adf8a895bc 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/GroupPropertiesViewFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/GroupPropertiesViewFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,15 +16,17 @@ */ package org.apache.activemq.console.filter; -import java.util.Set; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; +import java.util.Set; public class GroupPropertiesViewFilter extends PropertiesViewFilter { /** - * Creates a group properties filter that is able to filter the display result based on a group prefix + * Creates a group properties filter that is able to filter the display + * result based on a group prefix + * * @param next - the next query filter */ public GroupPropertiesViewFilter(QueryFilter next) { @@ -33,7 +34,9 @@ public class GroupPropertiesViewFilter extends PropertiesViewFilter { } /** - * Creates a group properties filter that is able to filter the display result based on a group prefix + * Creates a group properties filter that is able to filter the display + * result based on a group prefix + * * @param groupView - the group filter to use * @param next - the next query filter */ @@ -43,6 +46,7 @@ public class GroupPropertiesViewFilter extends PropertiesViewFilter { /** * Filter the properties that matches the group prefix only. + * * @param data - map data to filter * @return - filtered map data */ @@ -55,18 +59,18 @@ public class GroupPropertiesViewFilter extends PropertiesViewFilter { Map newData; try { // Lets try to use the same class as the original - newData = (Map)data.getClass().newInstance(); + newData = data.getClass().newInstance(); } catch (Exception e) { // Lets use a default HashMap newData = new HashMap(); } // Filter the keys to view - for (Iterator i=data.keySet().iterator(); i.hasNext();) { - String key = (String)i.next(); + for (Iterator i = data.keySet().iterator(); i.hasNext();) { + String key = i.next(); // Checks if key matches any of the group filter - for (Iterator j=viewFilter.iterator(); j.hasNext();) { + for (Iterator j = viewFilter.iterator(); j.hasNext();) { String group = (String)j.next(); if (key.startsWith(group)) { newData.put(key, data.get(key)); diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansAttributeQueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansAttributeQueryFilter.java index bc9dc19144..3d569a3591 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansAttributeQueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/MBeansAttributeQueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,33 +16,36 @@ */ package org.apache.activemq.console.filter; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXConnector; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.management.MBeanServerConnection; -import javax.management.ReflectionException; -import javax.management.InstanceNotFoundException; -import javax.management.AttributeList; -import javax.management.Attribute; -import javax.management.MBeanAttributeInfo; -import javax.management.IntrospectionException; -import java.util.Set; +import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.ArrayList; import java.util.List; -import java.io.IOException; +import java.util.Set; + +import javax.management.Attribute; +import javax.management.AttributeList; +import javax.management.InstanceNotFoundException; +import javax.management.IntrospectionException; +import javax.management.MBeanAttributeInfo; +import javax.management.MBeanServerConnection; +import javax.management.ObjectInstance; +import javax.management.ObjectName; +import javax.management.ReflectionException; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; public class MBeansAttributeQueryFilter extends AbstractQueryFilter { public static final String KEY_OBJECT_NAME_ATTRIBUTE = "Attribute:ObjectName:"; private JMXServiceURL jmxServiceUrl; - private Set attribView; + private Set attribView; /** - * Create an mbean attributes query filter that is able to select specific mbean attributes based on the object name to get. + * Create an mbean attributes query filter that is able to select specific + * mbean attributes based on the object name to get. + * * @param jmxServiceUrl - JMX service url to connect to. * @param attribView - the attributes to extract * @param next - the next query filter @@ -51,13 +53,16 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { public MBeansAttributeQueryFilter(JMXServiceURL jmxServiceUrl, Set attribView, MBeansObjectNameQueryFilter next) { super(next); this.jmxServiceUrl = jmxServiceUrl; - this.attribView = attribView; + this.attribView = attribView; } /** - * Filter the query by retrieving the attributes specified, this will modify the collection to a list of AttributeList + * Filter the query by retrieving the attributes specified, this will modify + * the collection to a list of AttributeList + * * @param queries - query list - * @return List of AttributeList, which includes the ObjectName, which has a key of MBeansAttributeQueryFilter.KEY_OBJECT_NAME_ATTRIBUTE + * @return List of AttributeList, which includes the ObjectName, which has a + * key of MBeansAttributeQueryFilter.KEY_OBJECT_NAME_ATTRIBUTE * @throws Exception */ public List query(List queries) throws Exception { @@ -66,6 +71,7 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { /** * Retrieve the specified attributes of the mbean + * * @param result - collection of ObjectInstances and/or ObjectNames * @return List of AttributeList * @throws IOException @@ -76,7 +82,7 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { protected List getMBeanAttributesCollection(Collection result) throws IOException, ReflectionException, InstanceNotFoundException, NoSuchMethodException, IntrospectionException { List mbeansCollection = new ArrayList(); - for (Iterator i=result.iterator(); i.hasNext();) { + for (Iterator i = result.iterator(); i.hasNext();) { Object mbean = i.next(); if (mbean instanceof ObjectInstance) { mbeansCollection.add(getMBeanAttributes(((ObjectInstance)mbean).getObjectName(), attribView)); @@ -92,6 +98,7 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { /** * Retrieve the specified attributes of the mbean + * * @param obj - mbean ObjectInstance * @param attrView - list of attributes to retrieve * @return AttributeList for the mbean @@ -105,6 +112,7 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { /** * Retrieve the specified attributes of the mbean + * * @param objName - mbean ObjectName * @param attrView - list of attributes to retrieve * @return AttributeList for the mbean @@ -113,7 +121,7 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { * @throws InstanceNotFoundException */ protected AttributeList getMBeanAttributes(ObjectName objName, Set attrView) throws IOException, ReflectionException, InstanceNotFoundException, IntrospectionException { - JMXConnector jmxConnector = JMXConnectorFactory.connect(jmxServiceUrl); + JMXConnector jmxConnector = JMXConnectorFactory.connect(jmxServiceUrl); MBeanServerConnection server = jmxConnector.getMBeanServerConnection(); // If no attribute view specified, get all attributes @@ -122,18 +130,18 @@ public class MBeansAttributeQueryFilter extends AbstractQueryFilter { MBeanAttributeInfo[] infos = server.getMBeanInfo(objName).getAttributes(); attribs = new String[infos.length]; - for (int i=0; i transformToMap(ActiveMQMessage msg) throws JMSException { + Map props = new HashMap(); // Get JMS properties if (msg.getJMSCorrelationID() != null) { - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSCorrelationID", msg.getJMSCorrelationID()); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSCorrelationID", msg.getJMSCorrelationID()); } - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDeliveryMode", (msg.getJMSDeliveryMode()==DeliveryMode.PERSISTENT) ? "persistent" : "non-persistent"); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDeliveryMode", (msg.getJMSDeliveryMode() == DeliveryMode.PERSISTENT) ? "persistent" : "non-persistent"); if (msg.getJMSDestination() != null) { - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDestination", ((ActiveMQDestination)msg.getJMSDestination()).getPhysicalName()); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDestination", ((ActiveMQDestination)msg.getJMSDestination()).getPhysicalName()); } - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSExpiration", Long.toString(msg.getJMSExpiration())); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSMessageID", msg.getJMSMessageID()); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSPriority", Integer.toString(msg.getJMSPriority())); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSRedelivered", Boolean.toString(msg.getJMSRedelivered())); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSExpiration", Long.toString(msg.getJMSExpiration())); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSMessageID", msg.getJMSMessageID()); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSPriority", Integer.toString(msg.getJMSPriority())); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSRedelivered", Boolean.toString(msg.getJMSRedelivered())); if (msg.getJMSReplyTo() != null) { - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSReplyTo", ((ActiveMQDestination)msg.getJMSReplyTo()).getPhysicalName()); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSReplyTo", ((ActiveMQDestination)msg.getJMSReplyTo()).getPhysicalName()); } - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSTimestamp", Long.toString(msg.getJMSTimestamp())); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSTimestamp", Long.toString(msg.getJMSTimestamp())); if (msg.getJMSType() != null) { - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSType", msg.getJMSType()); + props.put(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSType", msg.getJMSType()); } // Get custom properties @@ -252,7 +270,7 @@ public class MapTransformFilter extends ResultTransformFilter { while (e.hasMoreElements()) { String name = (String)e.nextElement(); if (msg.getObjectProperty(name) != null) { - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + name, msg.getObjectProperty(name).toString()); + props.put(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + name, msg.getObjectProperty(name).toString()); } } @@ -261,6 +279,7 @@ public class MapTransformFilter extends ResultTransformFilter { /** * Transform an openMBean composite data to a Map + * * @param data - composite data to transform * @return map object */ @@ -273,40 +292,38 @@ public class MapTransformFilter extends ResultTransformFilter { if (typeName.equals(ActiveMQTextMessage.class.getName())) { props.setProperty(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + "Text", data.get("Text").toString()); - // Retrieve byte preview + // Retrieve byte preview } else if (typeName.equals(ActiveMQBytesMessage.class.getName())) { props.setProperty(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + "BodyLength", data.get("BodyLength").toString()); props.setProperty(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + "BodyPreview", new String((byte[])data.get("BodyPreview"))); - // Expand content map + // Expand content map } else if (typeName.equals(ActiveMQMapMessage.class.getName())) { Map contentMap = (Map)data.get("ContentMap"); - for (Iterator i=contentMap.keySet().iterator(); i.hasNext();) { + for (Iterator i = contentMap.keySet().iterator(); i.hasNext();) { String key = (String)i.next(); props.setProperty(AmqMessagesUtil.JMS_MESSAGE_BODY_PREFIX + key, contentMap.get(key).toString()); } - // Do nothing - } else if (typeName.equals(ActiveMQObjectMessage.class.getName()) || - typeName.equals(ActiveMQStreamMessage.class.getName()) || - typeName.equals(ActiveMQMessage.class.getName())) { + // Do nothing + } else if (typeName.equals(ActiveMQObjectMessage.class.getName()) || typeName.equals(ActiveMQStreamMessage.class.getName()) || typeName.equals(ActiveMQMessage.class.getName())) { - // Unrecognized composite data. Throw exception. + // Unrecognized composite data. Throw exception. } else { throw new IllegalArgumentException("Unrecognized composite data to transform. composite type: " + typeName); } // Process the JMS message header values props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSCorrelationID", "" + data.get("JMSCorrelationID")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDestination", "" + data.get("JMSDestination")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSMessageID", "" + data.get("JMSMessageID")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSReplyTo", "" + data.get("JMSReplyTo")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSType", "" + data.get("JMSType")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDeliveryMode", "" + data.get("JMSDeliveryMode")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSExpiration", "" + data.get("JMSExpiration")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSPriority", "" + data.get("JMSPriority")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSRedelivered", "" + data.get("JMSRedelivered")); - props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSTimestamp", "" + data.get("JMSTimestamp")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDestination", "" + data.get("JMSDestination")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSMessageID", "" + data.get("JMSMessageID")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSReplyTo", "" + data.get("JMSReplyTo")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSType", "" + data.get("JMSType")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSDeliveryMode", "" + data.get("JMSDeliveryMode")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSExpiration", "" + data.get("JMSExpiration")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSPriority", "" + data.get("JMSPriority")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSRedelivered", "" + data.get("JMSRedelivered")); + props.setProperty(AmqMessagesUtil.JMS_MESSAGE_HEADER_PREFIX + "JMSTimestamp", "" + data.get("JMSTimestamp")); // Process the JMS custom message properties props.setProperty(AmqMessagesUtil.JMS_MESSAGE_CUSTOM_PREFIX + "Properties", "" + data.get("Properties")); diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/MessagesQueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/MessagesQueryFilter.java index 8f2e46278e..0773d61ca2 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/MessagesQueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/MessagesQueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,36 +16,39 @@ */ package org.apache.activemq.console.filter; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.JMXConnectorFactory; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; -import java.net.MalformedURLException; -import java.util.List; -import java.util.Iterator; -import java.util.Arrays; -import java.io.IOException; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; public class MessagesQueryFilter extends AbstractQueryFilter { private JMXServiceURL jmxServiceUrl; - private ObjectName destName; + private ObjectName destName; /** * Create a JMS message query filter + * * @param jmxServiceUrl - JMX service URL to connect to * @param destName - object name query to retrieve the destination */ public MessagesQueryFilter(JMXServiceURL jmxServiceUrl, ObjectName destName) { super(null); this.jmxServiceUrl = jmxServiceUrl; - this.destName = destName; + this.destName = destName; } /** * Queries the specified destination using the message selector format query + * * @param queries - message selector queries * @return list messages that matches the selector * @throws Exception @@ -55,12 +57,12 @@ public class MessagesQueryFilter extends AbstractQueryFilter { String selector = ""; // Convert to message selector - for (Iterator i=queries.iterator(); i.hasNext();) { + for (Iterator i = queries.iterator(); i.hasNext();) { selector = selector + "(" + i.next().toString() + ") AND "; } // Remove last AND - if (selector != "") { + if (!selector.equals("")) { selector = selector.substring(0, selector.length() - 5); } @@ -69,6 +71,7 @@ public class MessagesQueryFilter extends AbstractQueryFilter { /** * Query the messages of a queue destination using JMX + * * @param selector - message selector * @return list of messages that matches the selector * @throws Exception @@ -84,6 +87,7 @@ public class MessagesQueryFilter extends AbstractQueryFilter { /** * Get the JMX service URL the query is connecting to. + * * @return JMX service URL */ public JMXServiceURL getJmxServiceUrl() { @@ -92,6 +96,7 @@ public class MessagesQueryFilter extends AbstractQueryFilter { /** * Sets the JMX service URL the query is going to connect to. + * * @param jmxServiceUrl - new JMX service URL */ public void setJmxServiceUrl(JMXServiceURL jmxServiceUrl) { @@ -100,6 +105,7 @@ public class MessagesQueryFilter extends AbstractQueryFilter { /** * Sets the JMX service URL the query is going to connect to. + * * @param jmxServiceUrl - new JMX service URL */ public void setJmxServiceUrl(String jmxServiceUrl) throws MalformedURLException { @@ -108,6 +114,7 @@ public class MessagesQueryFilter extends AbstractQueryFilter { /** * Creates a JMX connector + * * @return JMX connector * @throws java.io.IOException */ diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/PropertiesViewFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/PropertiesViewFilter.java index be88a10318..c2bedd21fa 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/PropertiesViewFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/PropertiesViewFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,13 +16,13 @@ */ package org.apache.activemq.console.filter; -import java.util.Set; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.Collection; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; +import java.util.Set; public class PropertiesViewFilter implements QueryFilter { protected QueryFilter next; @@ -31,6 +30,7 @@ public class PropertiesViewFilter implements QueryFilter { /** * Creates a filter that will select the properties of a map object to view + * * @param next - the next query filter that will return a collection of maps */ public PropertiesViewFilter(QueryFilter next) { @@ -39,6 +39,7 @@ public class PropertiesViewFilter implements QueryFilter { /** * Creates a filter that will select the properties of a map object to view + * * @param viewFilter - the properties to view * @param next - the next query filter that will return a collection of maps */ @@ -49,35 +50,38 @@ public class PropertiesViewFilter implements QueryFilter { /** * Filter the properties to view of the query result + * * @param query - the query string * @return list of objects that has been view filtered */ - public List query(String query) throws Exception { + public List> query(String query) throws Exception { return filterViewCollection(next.query(query), viewFilter); } /** * Filter the properties to view of the query result + * * @param queries - the query map * @return list of objects that has been view filtered * @throws Exception */ - public List query(List queries) throws Exception { + public List> query(List queries) throws Exception { return filterViewCollection(next.query(queries), viewFilter); } /** * Filter the view of each element in the collection + * * @param result - the lists to filter the view from * @param viewFilter - the views to select - * @return lsit of objects whose view has been filtered + * @return list of objects whose view has been filtered */ - protected List filterViewCollection(Collection result, Set viewFilter) { + protected List> filterViewCollection(Collection> result, Set viewFilter) { // Use a list to allow duplicate entries - List newCollection = new ArrayList(); + List> newCollection = new ArrayList>(); - for (Iterator i=result.iterator(); i.hasNext();) { - newCollection.add(filterView((Map)i.next())); + for (Iterator> i = result.iterator(); i.hasNext();) { + newCollection.add(filterView(i.next())); } return newCollection; @@ -85,26 +89,27 @@ public class PropertiesViewFilter implements QueryFilter { /** * Select only the attributes to view from the map data + * * @param data - data to filter the view from * @return - data with the view filtered */ - protected Map filterView(Map data) { + protected Map filterView(Map data) { // If no view specified, display all attributes if (viewFilter == null || viewFilter.isEmpty()) { return data; } - Map newData; + Map newData; try { // Lets try to use the same class as the original - newData = (Map)data.getClass().newInstance(); + newData = data.getClass().newInstance(); } catch (Exception e) { // Lets use a default HashMap - newData = new HashMap(); + newData = new HashMap(); } // Filter the keys to view - for (Iterator i=viewFilter.iterator(); i.hasNext();) { + for (Iterator i = viewFilter.iterator(); i.hasNext();) { Object key = i.next(); Object val = data.get(key); diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/QueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/QueryFilter.java index 1633fb83ba..11437cfc43 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/QueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/QueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -18,9 +17,11 @@ package org.apache.activemq.console.filter; import java.util.List; +import java.util.Map; public interface QueryFilter { - public static final String QUERY_DELIMETER = ","; + + String QUERY_DELIMETER = ","; /** * Interface for querying @@ -28,7 +29,7 @@ public interface QueryFilter { * @return collection of objects that satisfies the query * @throws Exception */ - public List query(String queryStr) throws Exception; + List query(String queryStr) throws Exception; /** * Interface for querying @@ -36,5 +37,5 @@ public interface QueryFilter { * @return collection of objects that satisfies the query * @throws Exception */ - public List query(List queries) throws Exception; + List query(List queries) throws Exception; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/RegExQueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/RegExQueryFilter.java index f0e47b8cae..f43c36fb78 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/RegExQueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/RegExQueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,18 +16,20 @@ */ package org.apache.activemq.console.filter; -import java.util.regex.Pattern; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.HashMap; -import java.util.ArrayList; -import java.util.Iterator; +import java.util.regex.Pattern; public abstract class RegExQueryFilter extends AbstractQueryFilter { public static final String REGEX_PREFIX = "REGEX:QUERY:"; /** - * Creates a regular expression query that is able to match an object using key-value pattern regex filtering + * Creates a regular expression query that is able to match an object using + * key-value pattern regex filtering + * * @param next */ protected RegExQueryFilter(QueryFilter next) { @@ -36,8 +37,10 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { } /** - * Separates the regular expressions queries from the usual queries. A query is a regex query, if it is key-value pair - * with the format =, and value is a pattern that satisfies the isRegularExpression method. + * Separates the regular expressions queries from the usual queries. A query + * is a regex query, if it is key-value pair with the format =, + * and value is a pattern that satisfies the isRegularExpression method. + * * @param queries - list of queries * @return filtered objects that matches the regex query * @throws Exception @@ -47,7 +50,7 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { List newQueries = new ArrayList(); // Lets parse for regular expression queries - for (Iterator i=queries.iterator(); i.hasNext();) { + for (Iterator i = queries.iterator(); i.hasNext();) { // Get key-value pair String token = (String)i.next(); String key = ""; @@ -58,11 +61,12 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { key = token.substring(0, pos); } - // Add the regex query to list and make it a non-factor in the succeeding queries + // Add the regex query to list and make it a non-factor in the + // succeeding queries if (isRegularExpression(val)) { regex.put(key, compileQuery(val)); - // Add the normal query to the query list + // Add the normal query to the query list } else { newQueries.add(token); } @@ -73,8 +77,10 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { } /** - * Checks if a given string is a regular expression query. Currently, a pattern is a regex query, if it starts with - * the RegExQueryFilter.REGEX_PREFIX. + * Checks if a given string is a regular expression query. Currently, a + * pattern is a regex query, if it starts with the + * RegExQueryFilter.REGEX_PREFIX. + * * @param query * @return */ @@ -84,6 +90,7 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { /** * Compiles the regex query to a pattern. + * * @param query - query string to compile * @return regex pattern */ @@ -93,6 +100,7 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { /** * Filter the specified colleciton using the regex patterns extracted. + * * @param regex - regex map * @param data - list of objects to filter * @return filtered list of objects that matches the regex map @@ -100,14 +108,14 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { */ protected List filterCollectionUsingRegEx(Map regex, List data) throws Exception { // No regular expressions filtering needed - if (regex==null || regex.isEmpty()) { + if (regex == null || regex.isEmpty()) { return data; } List filteredElems = new ArrayList(); // Get each data object to filter - for (Iterator i=data.iterator(); i.hasNext();) { + for (Iterator i = data.iterator(); i.hasNext();) { Object dataElem = i.next(); // If properties of data matches all the regex pattern, add it if (matches(dataElem, regex)) { @@ -120,6 +128,7 @@ public abstract class RegExQueryFilter extends AbstractQueryFilter { /** * Determines how the object is to be matched to the regex map. + * * @param data - object to match * @param regex - regex map * @return true, if the object matches the regex map, false otherwise diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/ResultTransformFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/ResultTransformFilter.java index 7e5c0dcaca..fcb479aa76 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/ResultTransformFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/ResultTransformFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -25,7 +24,8 @@ public abstract class ResultTransformFilter implements QueryFilter { private QueryFilter next; /** - * Contructs a query filter that transform the format of the query result + * Constructs a query filter that transform the format of the query result + * * @param next - the query filter to retrieve the results from */ protected ResultTransformFilter(QueryFilter next) { @@ -34,6 +34,7 @@ public abstract class ResultTransformFilter implements QueryFilter { /** * Transforms the queried results to a collection of different objects + * * @param query - the query string * @return collections of transformed objects * @throws Exception @@ -44,23 +45,25 @@ public abstract class ResultTransformFilter implements QueryFilter { /** * Transforms the queried results to a collection of different objects + * * @param queries - the query map * @return collections of transformed objects * @throws Exception */ - public List query(List queries) throws Exception { + public List query(List queries) throws Exception { return transformList(next.query(queries)); } /** * Transforms a collection to a collection of different objects. + * * @param result - the collection to transform * @return collection of properties objects */ - protected List transformList(List result) throws Exception { - List props = new ArrayList(); + protected List transformList(List result) throws Exception { + List props = new ArrayList(); - for (Iterator i=result.iterator(); i.hasNext();) { + for (Iterator i = result.iterator(); i.hasNext();) { props.add(transformElement(i.next())); } @@ -69,6 +72,7 @@ public abstract class ResultTransformFilter implements QueryFilter { /** * Transform a result object + * * @param obj - the object instance to transform * @return the transformed object */ diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/StubQueryFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/StubQueryFilter.java index 86a8ecc21b..aa7081b8e6 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/StubQueryFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/StubQueryFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -19,11 +18,13 @@ package org.apache.activemq.console.filter; import java.util.List; -public class StubQueryFilter implements QueryFilter{ +public class StubQueryFilter implements QueryFilter { private List data; /** - * Creates a stub query that returns the given collections as the query result + * Creates a stub query that returns the given collections as the query + * result + * * @param data - the stub query result */ public StubQueryFilter(List data) { @@ -32,6 +33,7 @@ public class StubQueryFilter implements QueryFilter{ /** * Returns the provided stub data as a stub query result + * * @param queryStr - not use * @return the stub query result * @throws Exception @@ -42,6 +44,7 @@ public class StubQueryFilter implements QueryFilter{ /** * Returns the provided stub data as a stub query result + * * @param queries - not use * @return the stub query result * @throws Exception diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java index abe0d29c33..465e25dca9 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToMsgSelectorTransformFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,9 +16,11 @@ */ package org.apache.activemq.console.filter; -public class WildcardToMsgSelectorTransformFilter extends WildcardTransformFilter{ +public class WildcardToMsgSelectorTransformFilter extends WildcardTransformFilter { /** - * Creates a filter that is able to transform a wildcard query to a message selector format + * Creates a filter that is able to transform a wildcard query to a message + * selector format + * * @param next - next query filter */ public WildcardToMsgSelectorTransformFilter(QueryFilter next) { @@ -27,8 +28,10 @@ public class WildcardToMsgSelectorTransformFilter extends WildcardTransformFilte } /** - * Use to determine if a query string is a wildcard query. A query string is a wildcard query if it is a key-value - * pair with the format = and the value is enclosed in '' and contains '*' and '?'. + * Use to determine if a query string is a wildcard query. A query string is + * a wildcard query if it is a key-value pair with the format = + * and the value is enclosed in '' and contains '*' and '?'. + * * @param query - query string * @return true, if the query string is a wildcard query, false otherwise */ @@ -47,6 +50,7 @@ public class WildcardToMsgSelectorTransformFilter extends WildcardTransformFilte /** * Transform a wildcard query to message selector format + * * @param query - query string to transform * @return message selector format string */ diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java index f2b2938d22..8840103330 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardToRegExTransformFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -19,7 +18,9 @@ package org.apache.activemq.console.filter; public class WildcardToRegExTransformFilter extends WildcardTransformFilter { /** - * Creates a filter that is able to transform a wildcard query to a regular expression query string + * Creates a filter that is able to transform a wildcard query to a regular + * expression query string + * * @param next - next query filter */ public WildcardToRegExTransformFilter(RegExQueryFilter next) { @@ -27,8 +28,10 @@ public class WildcardToRegExTransformFilter extends WildcardTransformFilter { } /** - * Use to determine if a query string is a wildcard query. A query string is a wildcard query if it is a key-value - * pair with the format = and the value contains '*' and '?'. + * Use to determine if a query string is a wildcard query. A query string is + * a wildcard query if it is a key-value pair with the format = + * and the value contains '*' and '?'. + * * @param query - query string * @return true, if the query string is a wildcard query, false otherwise */ @@ -42,11 +45,12 @@ public class WildcardToRegExTransformFilter extends WildcardTransformFilter { } // If the value contains wildcards - return ((val.indexOf("*") >= 0) || (val.indexOf("?") >= 0)); + return (val.indexOf("*") >= 0) || (val.indexOf("?") >= 0); } /** * Transform a wildcard query to regular expression format + * * @param query - query string to transform * @return regex query string */ @@ -60,11 +64,14 @@ public class WildcardToRegExTransformFilter extends WildcardTransformFilter { key = key.substring(0, pos); } - val = val.replaceAll("[.]", "\\\\."); // Escape all dot characters. From (.) to (\.) - val = val.replaceAll("[?]", "."); // Match single characters - val = val.replaceAll("[*]", ".*?"); // Match all characters, use reluctant quantifier - val = "(" + val +")"; // Let's group the query for clarity - val = RegExQueryFilter.REGEX_PREFIX + val; // Flag as a regular expression query + val = val.replaceAll("[.]", "\\\\."); // Escape all dot characters. + // From (.) to (\.) + val = val.replaceAll("[?]", "."); // Match single characters + val = val.replaceAll("[*]", ".*?"); // Match all characters, use + // reluctant quantifier + val = "(" + val + ")"; // Let's group the query for clarity + val = RegExQueryFilter.REGEX_PREFIX + val; // Flag as a regular + // expression query return key + "=" + val; } diff --git a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardTransformFilter.java b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardTransformFilter.java index 0f968c017d..da8f3fb790 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardTransformFilter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/filter/WildcardTransformFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,15 +16,17 @@ */ package org.apache.activemq.console.filter; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public abstract class WildcardTransformFilter extends AbstractQueryFilter { /** - * Creates a wildcard transform filter that is able to convert a wildcard expression (determined by isWildcardQuery) - * to a another query type (use transformWildcardQuery). + * Creates a wildcard transform filter that is able to convert a wildcard + * expression (determined by isWildcardQuery) to a another query type (use + * transformWildcardQuery). + * * @param next - the next query filter */ protected WildcardTransformFilter(QueryFilter next) { @@ -34,6 +35,7 @@ public abstract class WildcardTransformFilter extends AbstractQueryFilter { /** * Converts the query list to set of different queries + * * @param queries - query list to transform * @return - result of the query * @throws Exception @@ -41,7 +43,7 @@ public abstract class WildcardTransformFilter extends AbstractQueryFilter { public List query(List queries) throws Exception { List newQueries = new ArrayList(); - for (Iterator i=queries.iterator(); i.hasNext();) { + for (Iterator i = queries.iterator(); i.hasNext();) { String queryToken = (String)i.next(); // Transform the wildcard query @@ -49,7 +51,7 @@ public abstract class WildcardTransformFilter extends AbstractQueryFilter { // Transform the value part only newQueries.add(transformWildcardQuery(queryToken)); - // Maintain the query as is + // Maintain the query as is } else { newQueries.add(queryToken); } @@ -60,6 +62,7 @@ public abstract class WildcardTransformFilter extends AbstractQueryFilter { /** * Use to determine is a query string is a wildcard query + * * @param query - query string * @return true, if the query string is a wildcard query, false otherwise */ @@ -67,6 +70,7 @@ public abstract class WildcardTransformFilter extends AbstractQueryFilter { /** * Use to transform a wildcard query string to another query format + * * @param query - query string to transform * @return transformed query */ diff --git a/activemq-console/src/main/java/org/apache/activemq/console/formatter/CommandShellOutputFormatter.java b/activemq-console/src/main/java/org/apache/activemq/console/formatter/CommandShellOutputFormatter.java index 107099c41a..f6fcb02dc0 100644 --- a/activemq-console/src/main/java/org/apache/activemq/console/formatter/CommandShellOutputFormatter.java +++ b/activemq-console/src/main/java/org/apache/activemq/console/formatter/CommandShellOutputFormatter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,16 +16,17 @@ */ package org.apache.activemq.console.formatter; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.management.AttributeList; -import javax.management.Attribute; -import javax.jms.Message; -import java.util.Map; +import java.io.OutputStream; +import java.io.PrintStream; import java.util.Collection; import java.util.Iterator; -import java.io.PrintStream; -import java.io.OutputStream; +import java.util.Map; + +import javax.jms.Message; +import javax.management.Attribute; +import javax.management.AttributeList; +import javax.management.ObjectInstance; +import javax.management.ObjectName; public class CommandShellOutputFormatter implements OutputFormatter { private OutputStream outputStream; @@ -44,6 +44,7 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Retrieve the output stream being used by the formatter + * * @return */ public OutputStream getOutputStream() { @@ -52,6 +53,7 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print an ObjectInstance format of an mbean + * * @param mbean - mbean to print */ public void printMBean(ObjectInstance mbean) { @@ -60,6 +62,7 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print an ObjectName format of an mbean + * * @param mbean - mbean to print */ public void printMBean(ObjectName mbean) { @@ -68,10 +71,11 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print an AttributeList format of an mbean + * * @param mbean - mbean to print */ public void printMBean(AttributeList mbean) { - for (Iterator i=mbean.iterator(); i.hasNext();) { + for (Iterator i = mbean.iterator(); i.hasNext();) { Attribute attrib = (Attribute)i.next(); if (attrib.getValue() instanceof ObjectName) { printMBean((ObjectName)attrib.getValue()); @@ -86,10 +90,11 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print a Map format of an mbean + * * @param mbean - mbean to print */ public void printMBean(Map mbean) { - for (Iterator i=mbean.keySet().iterator(); i.hasNext();) { + for (Iterator i = mbean.keySet().iterator(); i.hasNext();) { String key = (String)i.next(); String val = mbean.get(key).toString(); out.println(key + " = " + val); @@ -99,10 +104,11 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print a collection of mbean + * * @param mbean - collection of mbeans */ public void printMBean(Collection mbean) { - for (Iterator i=mbean.iterator(); i.hasNext();) { + for (Iterator i = mbean.iterator(); i.hasNext();) { Object obj = i.next(); if (obj instanceof ObjectInstance) { printMBean((ObjectInstance)obj); @@ -122,10 +128,11 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print a Map format of a JMS message + * * @param msg */ public void printMessage(Map msg) { - for (Iterator i=msg.keySet().iterator(); i.hasNext();) { + for (Iterator i = msg.keySet().iterator(); i.hasNext();) { String key = (String)i.next(); String val = msg.get(key).toString(); out.println(key + " = " + val); @@ -135,6 +142,7 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print a Message format of a JMS message + * * @param msg - JMS message to print */ public void printMessage(Message msg) { @@ -143,10 +151,11 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print a collection of JMS messages + * * @param msg - collection of JMS messages */ public void printMessage(Collection msg) { - for (Iterator i=msg.iterator(); i.hasNext();) { + for (Iterator i = msg.iterator(); i.hasNext();) { Object obj = i.next(); if (obj instanceof Message) { printMessage((Message)obj); @@ -162,10 +171,11 @@ public class CommandShellOutputFormatter implements OutputFormatter { /** * Print help messages + * * @param helpMsgs - help messages to print */ public void printHelp(String[] helpMsgs) { - for (int i=0; i0 ) { + if (args.length > 0) { url = args[0]; } - + ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(url); Destination destination = new ActiveMQQueue("TEST.QUEUE"); Connection connection = connectionFactory.createConnection(); connection.start(); - + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = session.createConsumer(destination); - - for( ;; ) { + + for (;;) { System.out.println("Waiting for message."); Message message = consumer.receive(); - if( message == null ) { + if (message == null) { break; } System.out.println("Got message: " + message); - } - - connection.close(); + } + + connection.close(); } } diff --git a/activemq-console/src/test/java/org/apache/activemq/simple/Producer.java b/activemq-console/src/test/java/org/apache/activemq/simple/Producer.java index d3ffe764c0..2f75d9f962 100644 --- a/activemq-console/src/test/java/org/apache/activemq/simple/Producer.java +++ b/activemq-console/src/test/java/org/apache/activemq/simple/Producer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -36,16 +35,20 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; -public class Producer { +public final class Producer { + + private static final Log LOG = LogFactory.getLog(Producer.class); + + private Producer() { + } - private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory - .getLog(Producer.class); - public static void main(String[] args) throws JMSException, InterruptedException { String url = "peer://localhost1/groupA?persistent=false"; - if( args.length>0 ) { + if (args.length > 0) { url = args[0]; } @@ -58,12 +61,12 @@ public class Producer { TextMessage message = session.createTextMessage(); for (int i = 0; i < 1000; i++) { message.setText("This is message " + (i + 1)); - log.info("Sending message: " + message.getText()); + LOG.info("Sending message: " + message.getText()); producer.send(message); Thread.sleep(1000); } connection.close(); - + } } diff --git a/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java b/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java index 2abf0385ab..9705c65973 100644 --- a/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java @@ -17,7 +17,6 @@ package org.apache.activemq; /** - * * 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. @@ -25,7 +24,7 @@ package org.apache.activemq; * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateCallback.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateCallback.java index 93661eff4b..0a523dee64 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateCallback.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateCallback.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java index bacaa9b95f..4ddbae1af0 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/CertificateLoginModule.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java index c1dfd6019d..399f5f7b60 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/JaasCertificateCallbackHandler.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/JaasCertificateCallbackHandler.java index c4314100d7..4ddfc4ad6d 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/JaasCertificateCallbackHandler.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/JaasCertificateCallbackHandler.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java index d3035d284d..3af851cd2c 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/JassCredentialCallbackHandler.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java index 093beca17b..9f0456dea0 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java index 811e292a11..01c7f1b899 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/TextFileCertificateLoginModule.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/TextFileCertificateLoginModule.java index 7f9c3c1d13..5aae0299f8 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/TextFileCertificateLoginModule.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/TextFileCertificateLoginModule.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java index 504d1466cc..b2ae7e686b 100644 --- a/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/CertificateLoginModuleTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/CertificateLoginModuleTest.java index e75b10cf6e..f3a84dc1db 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/CertificateLoginModuleTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/CertificateLoginModuleTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java index 5ce7e243a3..8eff0e54d9 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java index 8ac63f2ff0..e0c5869383 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java index dbc1e83efc..07b96c95cf 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/StubCertificateLoginModule.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/StubCertificateLoginModule.java index 38401a6410..258e9aa6d0 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/StubCertificateLoginModule.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/StubCertificateLoginModule.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java index 1468c8e854..c0d1c57956 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java index e1d99c3069..263af11508 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java index 379fca6f29..22e05deb72 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java index 5e2ac0c18d..2e296408bc 100644 --- a/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java index e679f5dbf9..9921d43e03 100644 --- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java +++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java index 18080081a5..54ae59d741 100755 --- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java +++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java index a97792aeab..d9eef9406d 100644 --- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java +++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java index 241f617c38..24f66a369b 100644 --- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java +++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicMessageStore.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicMessageStore.java index 72d65a20e9..271f30a36e 100644 --- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicMessageStore.java +++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicMessageStore.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicReferenceStore.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicReferenceStore.java index 6bd8e607d8..f67ff8474a 100644 --- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicReferenceStore.java +++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicReferenceStore.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPARecoveryBrokerTest.java b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPARecoveryBrokerTest.java index 69c3190b23..50acd0ed50 100644 --- a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPARecoveryBrokerTest.java +++ b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPARecoveryBrokerTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java index 668d183eb8..94e42210ee 100644 --- a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java +++ b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java index 7e6c6a6d32..619b93233f 100644 --- a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java +++ b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java index ce540724ca..720df6d977 100644 --- a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java +++ b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java index e4d0195701..bc9904a82c 100644 --- a/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java +++ b/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CGeneratorTask.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CGeneratorTask.java index a73a7d9477..fa5e036d7c 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CGeneratorTask.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CGeneratorTask.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java index 7996bc920d..9af60d7fad 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpClassesGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpClassesGenerator.java index 0a8e0d9518..3a71b1f0ef 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpClassesGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpClassesGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpGeneratorTask.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpGeneratorTask.java index 4c92b9fa28..980b660d7d 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpGeneratorTask.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpGeneratorTask.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpMarshallingGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpMarshallingGenerator.java index a58e800aec..60f2f5db48 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpMarshallingGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpMarshallingGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSourcesGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSourcesGenerator.java index bde8811711..b2f66a0e6b 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSourcesGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSourcesGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppGeneratorTask.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppGeneratorTask.java index 5eff845b31..691b878868 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppGeneratorTask.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppGeneratorTask.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppHeadersGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppHeadersGenerator.java index 1f297ae898..7e256401a5 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppHeadersGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppHeadersGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingClassesGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingClassesGenerator.java index 68d6683640..46c78efd53 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingClassesGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingClassesGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingHeadersGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingHeadersGenerator.java index e091bf5f34..6181f4007a 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingHeadersGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingHeadersGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaGeneratorTask.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaGeneratorTask.java index 96e1a3ea10..02324b6210 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaGeneratorTask.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaGeneratorTask.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaMarshallingGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaMarshallingGenerator.java index 0a10d8c437..07c5578fc4 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaMarshallingGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaMarshallingGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java index a32afa5d5f..fb8d57fa4f 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java index abe2dc057a..9b8f7cc29d 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java index d6d69436a6..07e6498fb5 100755 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java index ad6431ae24..a923a63c52 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java index d70e9a02fa..c9998801a6 100644 --- a/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java +++ b/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java b/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java index ba38efcbb7..cdb0dc58d4 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java +++ b/activemq-optional/src/main/java/org/apache/activemq/axis/ActiveMQVendorAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java index fae1842911..ede79d362f 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java index 417a248bc9..8b3ebb54f7 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Consumer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java index 1a4e5ee18c..ae68257a20 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/Producer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java b/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java index b57fed7411..ba0f0665bd 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/benchmark/ProducerConsumer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java b/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java index 5627fe00dc..e836b51bc2 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java +++ b/activemq-optional/src/main/java/org/apache/activemq/filter/JAXPXPathEvaluator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java b/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java index fa23036daf..772aff4c66 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java +++ b/activemq-optional/src/main/java/org/apache/activemq/filter/XMLBeansXPathEvaluator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java b/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java index 56f5376315..32f57f274d 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java +++ b/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java b/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java index f07ad91110..bb7b156842 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java +++ b/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/tool/JndiProducerTool.java b/activemq-optional/src/main/java/org/apache/activemq/tool/JndiProducerTool.java index 8b8412965c..1672a7cb23 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/tool/JndiProducerTool.java +++ b/activemq-optional/src/main/java/org/apache/activemq/tool/JndiProducerTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java b/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java index b5bf917092..d8eefe59d5 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java +++ b/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java b/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java index cdeb8c66af..696a6f309c 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java b/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java index 6b4fe11435..e363f6b083 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/tool/WebServer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java index 7c73b5a31f..f131bad65f 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java index 43cfbb4db3..51963694db 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java index 8195cad58d..0b99318b54 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java index 6f5c9f1d72..c0904d7416 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java index a6625360d8..3ad009cd28 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java index 00cd161919..ee3181d4da 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java index 642eaceea7..5c1e56e2cf 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java index 0639b90495..096eb9f504 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java index 5c7fa80a61..1ffc9238b2 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java b/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java index 19f1d45a95..a4646b34d8 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java b/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java index 6567a6891d..8c6bc133e8 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java b/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java index 623e5f3c01..821faeaeb3 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportServer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java b/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java index 253e0cd75e..6d02563ca3 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java b/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java index e4fe56359b..5d9c73f9a9 100755 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java b/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java index 63e049f2e3..e1d1b48bf1 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java +++ b/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java b/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java index cfe80eb215..a4e3216141 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java +++ b/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppender.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java b/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java index 20679a3878..420f73de0b 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java +++ b/activemq-optional/src/main/java/org/apache/activemq/util/JmsLogAppenderSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java b/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java index c3b87cade8..958c6c3261 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java +++ b/activemq-optional/src/main/java/org/apache/activemq/util/JndiJmsLogAppender.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java b/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java index fa19e9cc0a..1740a9f51b 100644 --- a/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java +++ b/activemq-optional/src/main/java/org/apache/activemq/util/xstream/XStreamMessageTransformer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java index 5860260dad..8eed33e77d 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java index 5bb40829b4..66d6116c00 100755 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java index 20c7472344..bc4f54cf06 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java index c0ea107636..46f30cf3fc 100755 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpTransportBrokerTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java index 44ed0ca48a..ff49491b96 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java index 3a16e74c7a..b0e9a67c6f 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java b/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java index bbab92bb42..1c9fbbfa7f 100755 --- a/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java b/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java index 692dcadd99..4cee39af47 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/util/xstream/SamplePojo.java b/activemq-optional/src/test/java/org/apache/activemq/util/xstream/SamplePojo.java index 6b555d1000..51ddccc42b 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/util/xstream/SamplePojo.java +++ b/activemq-optional/src/test/java/org/apache/activemq/util/xstream/SamplePojo.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java b/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java index 09a29c6e4f..f9e77de436 100644 --- a/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java +++ b/activemq-optional/src/test/java/org/apache/activemq/util/xstream/XStreamTransformTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java index 1eeab40dd4..7222d10dce 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java index 85ecef7fe5..474feff412 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java index 017930423f..52ca51ef85 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionRequestInfo.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java index 24cda6e5ac..dc6c1eb616 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java index 0c93d5b017..45db912a66 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointWorker.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java index e0297e66e0..264ca0f79d 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnection.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java index 8cbad0050d..0c4080c9d2 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQManagedConnectionFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java index 04c76cefdd..f76dd7f36a 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java index 3bb27ac41e..ac225d8f24 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java index 1bda5c496b..d2ecd3b028 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContext.java index e191b9c3b1..4307058156 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContext.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContext.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContextSupport.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContextSupport.java index e4323ac183..325e961d30 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContextSupport.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundContextSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java index 10429df3af..6130baacda 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java index 39f58245f3..d24b8cacff 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InvalidMessageEndpointException.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InvalidMessageEndpointException.java index 6fc676649d..6bac7da86a 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InvalidMessageEndpointException.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InvalidMessageEndpointException.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java b/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java index c2480f92cc..d72868f9df 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java index 85b12bdf94..da674d8c7d 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java index e0abdf4273..61c000500c 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java index a711198d2b..a7aa2458e0 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java index 145e23fff4..e6a5f672f9 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/MessageEndpointProxy.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/MessageResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/MessageResourceAdapter.java index 4f6729bf1b..40bcbe69ca 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/MessageResourceAdapter.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/MessageResourceAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java index 6586e1ec9d..2d4e85ac29 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java index 4e56e1ceaf..df06339b7a 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java b/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java index 72d9495be8..add9fa5b3a 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/SimpleConnectionManager.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQActivationSpecTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQActivationSpecTest.java index 5a3ec0c058..18a08acd46 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQActivationSpecTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQActivationSpecTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQAsfEndpointWorkerTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQAsfEndpointWorkerTest.java index 64b52bc19c..2453091bb7 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQAsfEndpointWorkerTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQAsfEndpointWorkerTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java index 3ca632d49e..a5be7c631a 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionEventListenerAdapter.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionEventListenerAdapter.java index e0560d2d2f..b8fdf7bf0b 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionEventListenerAdapter.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionEventListenerAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java index 6cf8737a45..afb269fd8d 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ConnectionManagerAdapter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java index 7db46a599b..cb20013dbc 100644 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionFactoryTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionFactoryTest.java index 05fb2b87a5..03a01ecd0c 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionFactoryTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionFactoryTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionTest.java index c82643f444..2756f1558f 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ManagedConnectionTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java index 442c2cf599..580b2e1d4a 100755 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/MessageEndpointProxyTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ServerSessionImplTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ServerSessionImplTest.java index 4a1e73cff6..b8c4a648cc 100644 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/ServerSessionImplTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ServerSessionImplTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java b/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java index 9a9f999a16..da6bea0fe8 100644 --- a/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java +++ b/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java b/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java index fc9ae42eba..ca22f0e9ab 100644 --- a/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java +++ b/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java b/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java index 2c7165f5fc..deef30cc02 100644 --- a/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java +++ b/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java b/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java index c9d1945c5c..28e9bc9ac7 100644 --- a/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java +++ b/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java b/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java index d99a34035b..0ffd06b050 100644 --- a/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java +++ b/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java index ae545f46af..e0b837f705 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/Agent.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java index 85b92f0b32..852b63aec4 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentStopper.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java index 749659ab8f..475b0961e6 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/AgentSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java index 6f1766a3a6..99dedd03f7 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/BrokerAgent.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java index 6b98055f22..10a6582a49 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java index 5cfb6a034b..59b3e466df 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ConsumerAgent.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java b/activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java index 640e2aebeb..2539c70c9d 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/DestinationFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java b/activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java index 3df8eba6db..93ea6cc7bd 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/MessageList.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java index f62cec8ad8..38acbaeaf3 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ProducerAgent.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java index be50fcef1d..575873d1e8 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/QueueOnlyScenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java index c3d24930ef..00f5a73790 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java index 1ab061b2e5..a2a07dc193 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java index c13c6a0034..2d52b11f88 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestCase.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java index c0f8d9c37c..b2dba018a8 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/ScenarioTestSuite.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java index 886c1002ad..77a5cfa422 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/TopicOnlyScenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java index 93d926dfdb..19536b13b7 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java index 839256be3a..f80f829fc6 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/BrokerAgentImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java index 0a1472b26e..3de13b2876 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ConsumerAgentImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java index 3653a58f00..f60fc27dba 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DestinationFactoryImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java index c652d2d193..62879232be 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/DiscoveryBrokerAgentImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java index e16c7a121a..a405b9be74 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/JmsClientSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java index 63986d73cf..fc8c96b7f5 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/MessageListImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java index ba120f9c6e..b232a25f9b 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/ProducerAgentImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java index aaf7b47070..aeb9cd607d 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/RandomMessageListImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java index 30763c3af2..01d0fa8399 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateBrokerProcessAgentImpl.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java index a6843ee006..727db2b69c 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/impl/SeparateProcessAgent.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java b/activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java index 1d01cbecd4..0caba269d9 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/task/ScenarioJClassStub.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java index 8916ace22b..9d0db72ea8 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java index a2b1c1c2d6..00a8776ce0 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/task/SystemTestTask.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java index 8bcec1bef8..4a0b9ae0db 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/ProducerConsumerScenarioSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java index 7973742108..bd9adb0eef 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/SingleBrokerScenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java index c984580413..df094f1c4c 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerFailoverScenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java index 2651254a8f..d937c34126 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkConnectedBeforeStartScenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java index 9ee58ab6bc..e68896616a 100644 --- a/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java +++ b/activemq-systest/src/main/java/org/apache/activemq/systest/usecase/network/TwoBrokerNetworkScenario.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-systest/src/main/resources/org/apache/activemq/systest/task/LICENSE_HEADER.txt b/activemq-systest/src/main/resources/org/apache/activemq/systest/task/LICENSE_HEADER.txt index ccb52158c8..24abd3a849 100644 --- a/activemq-systest/src/main/resources/org/apache/activemq/systest/task/LICENSE_HEADER.txt +++ b/activemq-systest/src/main/resources/org/apache/activemq/systest/task/LICENSE_HEADER.txt @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-test-atomikos/src/test/java/org/apache/activemq/atomikos/XATest.java b/activemq-test-atomikos/src/test/java/org/apache/activemq/atomikos/XATest.java index b0fd5dcace..9b276b8a8c 100644 --- a/activemq-test-atomikos/src/test/java/org/apache/activemq/atomikos/XATest.java +++ b/activemq-test-atomikos/src/test/java/org/apache/activemq/atomikos/XATest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java index e89dc7ea56..57f2c416b1 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java @@ -1,6 +1,6 @@ package org.apache.activemq.maven; -/* +/** * 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. diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java index 7aebd0dd32..398b1000aa 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/JMSMemtest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java index e03a815197..8efbd6fb57 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java index 85260d3643..5872f14b69 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemMessageIdList.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java index 3bb42827ab..a4bee1568f 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java index e70b74bad3..511e4eb07d 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java index 740b4d64a8..ef9c46b604 100644 --- a/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java +++ b/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/ReportGenerator.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java index d7f6398548..e3d300ccd6 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java index 542ac0d49c..d986f57cbf 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java index 51f9a0193c..2f5267bdb6 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java index a8df54fb36..081b15372c 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java index de7531f647..c0fbfa0d7d 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClientSystem.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java index 9cc640a268..923b7740d1 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java index a37784ad29..5b0f80c9ec 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java index 316ea437b7..b54e4775e9 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java index 4689771e0a..51bf92243c 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerClient.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java index b9f4282996..6015fc672c 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/AbstractObjectProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/AbstractObjectProperties.java index bfa5729a6d..b5d32656c0 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/AbstractObjectProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/AbstractObjectProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientProperties.java index e2fdaef690..1c7ef084a2 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientSystemProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientSystemProperties.java index b124580e6e..a427caa6f6 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientSystemProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsClientSystemProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerProperties.java index d8a0176c33..981e12819e 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerSystemProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerSystemProperties.java index 34a39cb175..74a2dbcbb0 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerSystemProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsConsumerSystemProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsFactoryProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsFactoryProperties.java index f4d52b4945..bc820e6d5d 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsFactoryProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsFactoryProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerProperties.java index 3b69faf5cc..f89197f68e 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerSystemProperties.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerSystemProperties.java index ba240a40a0..58843a334f 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerSystemProperties.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/JmsProducerSystemProperties.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionConfigurable.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionConfigurable.java index 18a30081ad..2358988187 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionConfigurable.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionConfigurable.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java index 997dc11961..92a0d36696 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/properties/ReflectionUtil.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java index c2dd941840..16576aaea3 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceReportWriter.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceReportWriter.java index a7ec9a96ee..9bb93a2458 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceReportWriter.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceReportWriter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceStatisticsUtil.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceStatisticsUtil.java index 0197575041..2559a41c1b 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceStatisticsUtil.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/PerformanceStatisticsUtil.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java index 2973e49a16..c3369b78e4 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java index 0ce5b865e1..6ea2ce3b4d 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java index 65748b04da..c324b0d602 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/CpuReportPlugin.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ReportPlugin.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ReportPlugin.java index 346c202d23..1f222fc68d 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ReportPlugin.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ReportPlugin.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ThroughputReportPlugin.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ThroughputReportPlugin.java index a1c455a99d..d7bca3befd 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ThroughputReportPlugin.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/plugins/ThroughputReportPlugin.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/MeasurableClient.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/MeasurableClient.java index f2b38f0fb9..7c6baa29d5 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/MeasurableClient.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/MeasurableClient.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java index fecd163a78..3c33ddf1bc 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQPojoSPI.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQReflectionSPI.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQReflectionSPI.java index 45ac77d6ac..e33e9801d3 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQReflectionSPI.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ActiveMQReflectionSPI.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java index 1874c79344..292a55a504 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ClassLoaderSPIConnectionFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java index 367c5863e4..b2f46eb6eb 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/ReflectionSPIConnectionFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java index cf63d4973e..1c000c2078 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/spi/SPIConnectionFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-perf-plugin/src/test/java/org/apache/activemq/tool/ReflectionUtilTest.java b/activemq-tooling/maven-activemq-perf-plugin/src/test/java/org/apache/activemq/tool/ReflectionUtilTest.java index 0c805ce949..bc69c46f75 100644 --- a/activemq-tooling/maven-activemq-perf-plugin/src/test/java/org/apache/activemq/tool/ReflectionUtilTest.java +++ b/activemq-tooling/maven-activemq-perf-plugin/src/test/java/org/apache/activemq/tool/ReflectionUtilTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java b/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java index 553097286c..ca095c78b9 100644 --- a/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java +++ b/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java @@ -1,6 +1,6 @@ package org.apache.activemq.maven; -/* +/** * 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. diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java b/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java index 6ad3675dee..7be561f8ff 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java b/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java index aca4262fb5..fae14024b7 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/DestinationFacade.java b/activemq-web-console/src/main/java/org/apache/activemq/web/DestinationFacade.java index 2b3be6dc19..4a05227cfa 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/DestinationFacade.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/DestinationFacade.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java b/activemq-web-console/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java index 59485c471e..f460e166d2 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/DurableSubscriberFacade.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/LocalBrokerFacade.java b/activemq-web-console/src/main/java/org/apache/activemq/web/LocalBrokerFacade.java index 77c0e4d2d8..f669398281 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/LocalBrokerFacade.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/LocalBrokerFacade.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/MessageQuery.java b/activemq-web-console/src/main/java/org/apache/activemq/web/MessageQuery.java index 8caebfcf22..c0b5086dc4 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/MessageQuery.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/MessageQuery.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java b/activemq-web-console/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java index 59a1f4b6d6..0465b71f65 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java b/activemq-web-console/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java index 0afa708fab..8a37a2a90e 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/RemoteJMXBrokerFacade.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/SessionPool.java b/activemq-web-console/src/main/java/org/apache/activemq/web/SessionPool.java index 6527bcd3a2..94dbb4766b 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/SessionPool.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/SessionPool.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/SingletonBrokerFacade.java b/activemq-web-console/src/main/java/org/apache/activemq/web/SingletonBrokerFacade.java index f7b637cfdb..b281259846 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/SingletonBrokerFacade.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/SingletonBrokerFacade.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java b/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java index a9cc2d4699..66bd201e72 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java index 0fa83e883b..2959458c50 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java index 44a748c2ca..88cf98f029 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java index b6875eeba1..c5d9fe30be 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java index 19f879ca67..c6a6554047 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java index 59ff65d65e..0356602f87 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java index a90ee521c2..ecef942753 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java index 67863c9c19..4d660b6cae 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java b/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java index 1ec0ac4932..e4f64920b8 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java b/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java index 6afe24c76e..82d603af80 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/webapp/styles/site.css b/activemq-web-console/src/main/webapp/styles/site.css index 0c20eb6425..13cfc545fd 100644 --- a/activemq-web-console/src/main/webapp/styles/site.css +++ b/activemq-web-console/src/main/webapp/styles/site.css @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/webapp/styles/sorttable.css b/activemq-web-console/src/main/webapp/styles/sorttable.css index 7037247c5f..98cd35a15e 100644 --- a/activemq-web-console/src/main/webapp/styles/sorttable.css +++ b/activemq-web-console/src/main/webapp/styles/sorttable.css @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/main/webapp/styles/type-settings.css b/activemq-web-console/src/main/webapp/styles/type-settings.css index 200eff88e2..9fd616853f 100644 --- a/activemq-web-console/src/main/webapp/styles/type-settings.css +++ b/activemq-web-console/src/main/webapp/styles/type-settings.css @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java b/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java index 1441696ae9..a29071868d 100644 --- a/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java +++ b/activemq-web-console/src/test/java/org/apache/activemq/web/tool/Main.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/chat.css b/activemq-web-demo/src/main/webapp/chat.css index 5edb8a7526..1aa42511da 100644 --- a/activemq-web-demo/src/main/webapp/chat.css +++ b/activemq-web-demo/src/main/webapp/chat.css @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/chat.js b/activemq-web-demo/src/main/webapp/chat.js index 099c3972c5..e6646af3a6 100755 --- a/activemq-web-demo/src/main/webapp/chat.js +++ b/activemq-web-demo/src/main/webapp/chat.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/portfolio/portfolio.js b/activemq-web-demo/src/main/webapp/portfolio/portfolio.js index 43dd9e887f..8abe6f4036 100644 --- a/activemq-web-demo/src/main/webapp/portfolio/portfolio.js +++ b/activemq-web-demo/src/main/webapp/portfolio/portfolio.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/sandbox/portfolio.js b/activemq-web-demo/src/main/webapp/sandbox/portfolio.js index 98335a0684..5a74f8fc9c 100755 --- a/activemq-web-demo/src/main/webapp/sandbox/portfolio.js +++ b/activemq-web-demo/src/main/webapp/sandbox/portfolio.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/sandbox/util.js b/activemq-web-demo/src/main/webapp/sandbox/util.js index 0cada8fb6c..2d051e0658 100755 --- a/activemq-web-demo/src/main/webapp/sandbox/util.js +++ b/activemq-web-demo/src/main/webapp/sandbox/util.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/sandbox/webmq.js b/activemq-web-demo/src/main/webapp/sandbox/webmq.js index 0aa5eb0de8..6b0bc3d3ae 100755 --- a/activemq-web-demo/src/main/webapp/sandbox/webmq.js +++ b/activemq-web-demo/src/main/webapp/sandbox/webmq.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web-demo/src/main/webapp/style.css b/activemq-web-demo/src/main/webapp/style.css index ae9f8f3b40..5d4f632c49 100755 --- a/activemq-web-demo/src/main/webapp/style.css +++ b/activemq-web-demo/src/main/webapp/style.css @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java index 8de38b0760..07ecaeb8ee 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java index 4f4b0daf4f..6e5766e2eb 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java index 482f7de5ac..c345b18478 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java b/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java index 98769eb5a3..eba4c9c6b6 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java b/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java index b2a9a9ceaa..02e3cec7c5 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java index 152ca65413..7a4aaef39a 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java index 68de2bda31..0857d40f36 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java b/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java index fc3e88286a..3fdf67c7b6 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java b/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java index 2f55fae0b4..4810120472 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java b/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java index 156e1ea47d..85fdf25928 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java index b5bf6a4dab..d703cd3891 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java index d7c081466d..e16e735154 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java index 8ab6f93e72..affad44f91 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java index 41d2fd6855..3d9aec8345 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java @@ -1,4 +1,4 @@ -/* +/** * 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. diff --git a/activemq-web/src/main/resources/org/apache/activemq/web/_amq.js b/activemq-web/src/main/resources/org/apache/activemq/web/_amq.js index 23cdaccc91..fee09bd55b 100644 --- a/activemq-web/src/main/resources/org/apache/activemq/web/_amq.js +++ b/activemq-web/src/main/resources/org/apache/activemq/web/_amq.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/main/resources/org/apache/activemq/web/amq.js b/activemq-web/src/main/resources/org/apache/activemq/web/amq.js index 52a7a01d86..05901aa832 100644 --- a/activemq-web/src/main/resources/org/apache/activemq/web/amq.js +++ b/activemq-web/src/main/resources/org/apache/activemq/web/amq.js @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java index a74fc230b4..ed79f0df1b 100644 --- a/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java +++ b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java index 82f7ee0764..4b28200e41 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/ProtocolConverter.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java index 02fb1eb483..33a3f6c2fb 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java index 54a1206338..eaf5aa8b8c 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java index f9883cbc85..584680b87d 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java index 885e8d849b..fa5cb65cff 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormatFactory.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormatFactory.java index 3becb11fed..02d0f2db6a 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormatFactory.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormatFactory.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/Handler.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/Handler.java index 837fe8d860..26232d1b4e 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/Handler.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/Handler.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/HandlerRegistry.java b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/HandlerRegistry.java index 4817f82eff..c26ccdb784 100644 --- a/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/HandlerRegistry.java +++ b/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/command/HandlerRegistry.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppBroker.java b/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppBroker.java index f1c4a5bcec..71c2be2028 100644 --- a/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppBroker.java +++ b/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppBroker.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppTest.java b/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppTest.java index d2616b87a8..237b5f4576 100644 --- a/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppTest.java +++ b/activemq-xmpp/src/test/java/org/apache/activemq/transport/xmpp/XmppTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/CommandLineSupport.java b/assembly/src/release/example/src/CommandLineSupport.java index 230697868a..8dce4c7b24 100644 --- a/assembly/src/release/example/src/CommandLineSupport.java +++ b/assembly/src/release/example/src/CommandLineSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/ConsumerTool.java b/assembly/src/release/example/src/ConsumerTool.java index 17f4441d81..899a17391f 100755 --- a/assembly/src/release/example/src/ConsumerTool.java +++ b/assembly/src/release/example/src/ConsumerTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/EmbeddedBroker.java b/assembly/src/release/example/src/EmbeddedBroker.java index a085f2d2ff..684d8eb350 100644 --- a/assembly/src/release/example/src/EmbeddedBroker.java +++ b/assembly/src/release/example/src/EmbeddedBroker.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/ProducerAndConsumerTool.java b/assembly/src/release/example/src/ProducerAndConsumerTool.java index daba45dd6d..cfbac80965 100644 --- a/assembly/src/release/example/src/ProducerAndConsumerTool.java +++ b/assembly/src/release/example/src/ProducerAndConsumerTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/ProducerTool.java b/assembly/src/release/example/src/ProducerTool.java index a7f713a16b..2ef0f9d1c5 100755 --- a/assembly/src/release/example/src/ProducerTool.java +++ b/assembly/src/release/example/src/ProducerTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/RequesterTool.java b/assembly/src/release/example/src/RequesterTool.java index 25de768137..c0382dd315 100644 --- a/assembly/src/release/example/src/RequesterTool.java +++ b/assembly/src/release/example/src/RequesterTool.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/TopicListener.java b/assembly/src/release/example/src/TopicListener.java index 428199d122..a015738125 100644 --- a/assembly/src/release/example/src/TopicListener.java +++ b/assembly/src/release/example/src/TopicListener.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/release/example/src/TopicPublisher.java b/assembly/src/release/example/src/TopicPublisher.java index 49381ca933..0f0b90d51f 100644 --- a/assembly/src/release/example/src/TopicPublisher.java +++ b/assembly/src/release/example/src/TopicPublisher.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java b/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java index d32c43f593..54d64dfb60 100755 --- a/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java +++ b/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java b/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java index 417a248bc9..8b3ebb54f7 100755 --- a/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java +++ b/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java b/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java index 02f8f3f48c..24430f4a63 100755 --- a/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java +++ b/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java b/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java index b57fed7411..ba0f0665bd 100755 --- a/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java +++ b/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, diff --git a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java index e5f2f900c7..0fb18db41a 100755 --- a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java +++ b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java @@ -1,5 +1,4 @@ /** - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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,