Np. I didn't fully understand it, so I had to add a new patch, and run it by legal again, and that's what they came up with.
--Allen > -----Original Message----- > From: Gary Tully [mailto:[email protected]] > Sent: Thursday, April 14, 2011 2:32 AM > To: [email protected] > Subject: Re: svn commit: r1079638 - in /activemq/trunk: > NOTICE activemq-console/pom.xml > activemq-console/src/main/java/org/apache/activemq/console/Act > iveMQLauncher.java pom.xml > > ok, makes sense now. Thanks for the clarification. > > http://www.apache.org/legal/src-headers.html#headers has the > full explanation. > > On 13 April 2011 21:57, Allen Reese <[email protected]> wrote: > > That was from legal for this class: > >> > +public class ActiveMQLauncher implements Daemon { > > > > I was pretty sure that the license was removed from the > .java file per this thread: > > > > Message is here: > > > > On Mon, Mar 7, 2011 at 12:31 PM, Bruce Snyder > <[email protected]> wrote: > >> On Mon, Mar 7, 2011 at 11:50 AM, Allen Reese > <[email protected]> wrote: > >>> At Yahoo!, we use jsvc to run activemq: > >>> http://commons.apache.org/daemon/jsvc.html > >>> > >>> This JIRA has the java patches required to use jsvc: > >>> https://issues.apache.org/jira/browse/AMQ-2968 > >>> > >>> However there are no start/stop scripts. Our environment is a > >>> little different with respect to start/stop > > scripts, so the scripts we use are not usable by others. > >> > >> Thanks for the contribution, Allen! > >> > >> While preparing your patch to be committed to the trunk, I > realized > >> that commons-daemon-1.0.4.jar is not published to Maven > Central. But > >> commons-daemon-1.0.3.jar is published and your patch > builds fine with > >> this version. So I'm going to commit it using 1.0.3, is > that OK with > >> you? > > > > Allen, a couple things I just noticed in examining the patch closer: > > > > 1) You did check the box to allow your patch to be included in ASF > > works > > 2) But there is a copyright notice in the Java source file > > > > Per the ASF policies, a copyright in a project's NOTICE > file is fine, > > but we don't place copyrights in the source files. For more > details, please see the following, specifically 1.1 and 1.2: > > > > http://www.apache.org/legal/src-headers.html#headers > > > > Furthermore, item 2 on that same page shows the appropriate Apache > > License blurb that should be included in source files. > > > > It would be great if you could attach a new patch to the issue that: > > a) removes the copyright from the Java source file, and, b) > includes the proper license header. > > > > Bruce > > -- > > perl -e 'print > > unpack("u30","D0G)U8V4\@4VYY9&5R\"F)R=6-E+G-N>61E<D\!G;6%I;\"YC;VT*" > > );' > > > > ActiveMQ in Action: http://bit.ly/2je6cQ > > Blog: http://bruceblog.org/ > > Twitter: http://twitter.com/brucesnyder > > > > > >> -----Original Message----- > >> From: Gary Tully [mailto:[email protected]] > >> Sent: Wednesday, April 13, 2011 5:49 AM > >> To: [email protected] > >> Subject: Re: svn commit: r1079638 - in /activemq/trunk: > >> NOTICE activemq-console/pom.xml > >> activemq-console/src/main/java/org/apache/activemq/console/Act > >> iveMQLauncher.java pom.xml > >> > >> where does the need for the yahoo attribution derive from? > >> If it is needed we need to included the license text also. > >> > >> On 9 March 2011 01:42, <[email protected]> wrote: > >> > Author: bsnyder > >> > Date: Wed Mar 9 01:42:36 2011 > >> > New Revision: 1079638 > >> > > >> > URL: http://svn.apache.org/viewvc?rev=1079638&view=rev > >> > Log: > >> > AMQ-2968 - Add Apache commons daemon (jsvc/procrun) > >> start/stop support. > >> > > >> > Added: > >> > > >> > > >> > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/con > >> s > >> > ole/ActiveMQLauncher.java > >> > Modified: > >> > activemq/trunk/NOTICE > >> > activemq/trunk/activemq-console/pom.xml > >> > activemq/trunk/pom.xml > >> > > >> > Modified: activemq/trunk/NOTICE > >> > URL: > >> > > >> > http://svn.apache.org/viewvc/activemq/trunk/NOTICE?rev=1079638&r1=107 > >> 9 > >> > 637&r2=1079638&view=diff > >> > > >> > ===================================================================== > >> = > >> > ======== > >> > --- activemq/trunk/NOTICE (original) > >> > +++ activemq/trunk/NOTICE Wed Mar 9 01:42:36 2011 > >> > @@ -42,3 +42,8 @@ Some portions of the code are Copyright: > >> > 1999 Jason Gilbert. > >> > > >> > The jboss integration module contains some LGPL code. > >> > + > >> > +This product includes software developed by > >> > + Yahoo! Inc. (www.yahoo.com) > >> > + Copyright (c) 2010 Yahoo! Inc. All rights reserved. > >> > + > >> > > >> > Modified: activemq/trunk/activemq-console/pom.xml > >> > URL: > >> > > >> > http://svn.apache.org/viewvc/activemq/trunk/activemq-console/pom.xml? > >> r > >> > ev=1079638&r1=1079637&r2=1079638&view=diff > >> > > >> > ===================================================================== > >> = > >> > ======== > >> > --- activemq/trunk/activemq-console/pom.xml (original) > >> > +++ activemq/trunk/activemq-console/pom.xml Wed Mar 9 01:42:36 > >> > +++ 2011 > >> > @@ -125,7 +125,13 @@ > >> > <dependency> > >> > <groupId>com.ibm.icu</groupId> > >> > <artifactId>icu4j</artifactId> > >> > - </dependency> > >> > + </dependency> > >> > + > >> > + <dependency> > >> > + <groupId>commons-daemon</groupId> > >> > + <artifactId>commons-daemon</artifactId> > >> > + </dependency> > >> > + > >> > </dependencies> > >> > > >> > <build> > >> > > >> > Added: > >> > > >> > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/con > >> s > >> > ole/ActiveMQLauncher.java > >> > URL: > >> > > >> > http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main > >> / > >> > > >> > java/org/apache/activemq/console/ActiveMQLauncher.java?rev=1079638&vi > >> e > >> > w=auto > >> > > >> > ===================================================================== > >> = > >> > ======== > >> > --- > >> > > >> > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/con > >> s > >> > ole/ActiveMQLauncher.java (added) > >> > +++ > >> activemq/trunk/activemq-console/src/main/java/org/apache/activemq/ > >> > +++ console/ActiveMQLauncher.java Wed Mar 9 01:42:36 2011 > >> > @@ -0,0 +1,103 @@ > >> > +/** > >> > + * Licensed to the Apache Software Foundation (ASF) under one > >> > + * or more contributor license agreements. See the NOTICE file > >> > + * distributed with this work for additional information > >> > + * regarding copyright ownership. The ASF licenses this file > >> > + * to you under the Apache License, Version 2.0 (the > >> > + * "License"); you may not use this file except in compliance > >> > + * with the License. You may obtain a copy of the License at > >> > + * > >> > + * http://www.apache.org/licenses/LICENSE-2.0 > >> > + * > >> > + * Unless required by applicable law or agreed to in writing, > >> > + * software distributed under the License is distributed on an > >> > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > >> > + * KIND, either express or implied. See the License for the > >> > + * specific language governing permissions and limitations > >> > + * under the License. > >> > + */ > >> > + > >> > +package org.apache.activemq.console; > >> > + > >> > +import java.util.ArrayList; > >> > +import java.util.Arrays; > >> > +import java.util.List; > >> > + > >> > +import org.apache.activemq.console.command.Command; > >> > +import org.apache.activemq.console.command.ShutdownCommand; > >> > +import org.apache.activemq.console.command.StartCommand; > >> > +import org.apache.activemq.console.CommandContext; > >> > +import org.apache.activemq.console.Main; import > >> > > +org.apache.activemq.console.formatter.CommandShellOutputFormatter; > >> > +import org.apache.commons.daemon.Daemon; import > >> > +org.apache.commons.daemon.DaemonContext; > >> > + > >> > +/** > >> > + * This class launches activemq under Apache JSVC {@link > >> > +http://commons.apache.org/daemon/jsvc.html} > >> > + * > >> > + * @author areese > >> > + * > >> > + */ > >> > +public class ActiveMQLauncher implements Daemon { > >> > + private List<String> args; > >> > + > >> > + /** > >> > + * > >> > + */ > >> > + public ActiveMQLauncher() { > >> > + } > >> > + > >> > + /* > >> > + * (non-Javadoc) > >> > + * > >> > + * @see org.apache.commons.daemon.Daemon#destroy() > >> > + */ > >> > + public void destroy() { > >> > + } > >> > + > >> > + /* > >> > + * (non-Javadoc) > >> > + * > >> > + * @see > >> > + * > >> > + > >> > org.apache.commons.daemon.Daemon#init(org.apache.commons.daemon.Daem > >> > + onContext > >> > + * ) > >> > + */ > >> > + public void init(DaemonContext arg0) throws Exception { > >> > + // we need to save the args we started with. > >> > + args = Arrays.asList(arg0.getArguments()); > >> > + } > >> > + > >> > + /* > >> > + * (non-Javadoc) > >> > + * > >> > + * @see org.apache.commons.daemon.Daemon#start() > >> > + */ > >> > + public void start() throws Exception { > >> > + CommandContext context = new CommandContext(); > >> > + context.setFormatter(new > >> > + CommandShellOutputFormatter(System.out)); > >> > + > >> > + Command command = new StartCommand(); > >> > + command.setCommandContext(context); > >> > + > >> > + command.execute(args); > >> > + } > >> > + > >> > + /* > >> > + * (non-Javadoc) > >> > + * > >> > + * @see org.apache.commons.daemon.Daemon#stop() > >> > + */ > >> > + public void stop() throws Exception { > >> > + CommandContext context = new CommandContext(); > >> > + context.setFormatter(new > >> > + CommandShellOutputFormatter(System.out)); > >> > + > >> > + Command command = new ShutdownCommand(); > >> > + command.setCommandContext(context); > >> > + > >> > + List<String> tokens = new > >> ArrayList<String>(Arrays.asList(new > >> > + String[] { > >> > + "--jmxlocal", "--all", })); > >> > + > >> > + command.execute(tokens); > >> > + } > >> > + > >> > +} > >> > > >> > Modified: activemq/trunk/pom.xml > >> > URL: > >> > > >> > http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1079638&r1=10 > >> 7 > >> > 9637&r2=1079638&view=diff > >> > > >> > ===================================================================== > >> = > >> > ======== > >> > --- activemq/trunk/pom.xml (original) > >> > +++ activemq/trunk/pom.xml Wed Mar 9 01:42:36 2011 > >> > @@ -449,6 +449,13 @@ > >> > <version>3.0.0</version> > >> > <optional>true</optional> > >> > </dependency> > >> > + > >> > + <!-- For jsvc support --> > >> > + <dependency> > >> > + <groupId>commons-daemon</groupId> > >> > + <artifactId>commons-daemon</artifactId> > >> > + <version>1.0.3</version> > >> > + </dependency> > >> > > >> > <!-- for the XML parsing --> > >> > <dependency> > >> > @@ -941,11 +948,11 @@ > >> > </dependency> > >> > > >> > <!-- FTP support for BlobMessages --> > >> > - <dependency> > >> > - <groupId>commons-net</groupId> > >> > - <artifactId>commons-net</artifactId> > >> > - <version>${commons-net-version}</version> > >> > - </dependency> > >> > + <dependency> > >> > + <groupId>commons-net</groupId> > >> > + <artifactId>commons-net</artifactId> > >> > + <version>${commons-net-version}</version> > >> > + </dependency> > >> > > >> > <dependency> > >> > <groupId>org.apache.velocity</groupId> > >> > > >> > > >> > > >> > >> > >> > >> -- > >> http://blog.garytully.com > >> http://fusesource.com > >> > > > > -- > http://blog.garytully.com > http://fusesource.com >
