From dev-return-26259-apmail-activemq-dev-archive=activemq.apache.org@activemq.apache.org Wed Apr 13 20:58:13 2011 Return-Path: Delivered-To: apmail-activemq-dev-archive@www.apache.org Received: (qmail 7997 invoked from network); 13 Apr 2011 20:58:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Apr 2011 20:58:13 -0000 Received: (qmail 53704 invoked by uid 500); 13 Apr 2011 20:58:12 -0000 Delivered-To: apmail-activemq-dev-archive@activemq.apache.org Received: (qmail 53658 invoked by uid 500); 13 Apr 2011 20:58:12 -0000 Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list dev@activemq.apache.org Received: (qmail 53648 invoked by uid 99); 13 Apr 2011 20:58:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Apr 2011 20:58:12 +0000 X-ASF-Spam-Status: No, hits=1.1 required=5.0 tests=NO_RDNS_DOTCOM_HELO,RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [69.147.107.21] (HELO mrout2-b.corp.re1.yahoo.com) (69.147.107.21) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Apr 2011 20:58:07 +0000 Received: from SP2-EX07CAS03.ds.corp.yahoo.com (sp2-ex07cas03.corp.sp2.yahoo.com [98.137.59.35]) by mrout2-b.corp.re1.yahoo.com (8.14.4/8.14.4/y.out) with ESMTP id p3DKv6Xi066595 for ; Wed, 13 Apr 2011 13:57:06 -0700 (PDT) Received: from SP2-EX07VS01.ds.corp.yahoo.com ([98.137.59.29]) by SP2-EX07CAS03.ds.corp.yahoo.com ([98.137.59.35]) with mapi; Wed, 13 Apr 2011 13:57:06 -0700 From: Allen Reese To: "dev@activemq.apache.org" Date: Wed, 13 Apr 2011 13:57:04 -0700 Subject: RE: svn commit: r1079638 - in /activemq/trunk: NOTICE activemq-console/pom.xml activemq-console/src/main/java/org/apache/activemq/console/ActiveMQLauncher.java pom.xml Thread-Topic: svn commit: r1079638 - in /activemq/trunk: NOTICE activemq-console/pom.xml activemq-console/src/main/java/org/apache/activemq/console/ActiveMQLauncher.java pom.xml Thread-Index: Acv52WVIz3gQmyeYQXWvy1OBFsu5iwAQwxgA Message-ID: References: <20110309014237.6376323889B2@eris.apache.org> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 wrot= e: > On Mon, Mar 7, 2011 at 11:50 AM, Allen Reese wrote= : >> At Yahoo!, we use jsvc to run activemq:=20 >> 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 di= fferent 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=20 > that commons-daemon-1.0.4.jar is not published to Maven Central. But=20 > commons-daemon-1.0.3.jar is published and your patch builds fine with=20 > this version. So I'm going to commit it using 1.0.3, is that OK with=20 > 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 w= e 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 pr= oper license header. Bruce -- perl -e 'print unpack("u30","D0G)U8V4\@4VYY9&5R\"F)R=3D6-E+G-N>61E -----Original Message----- > From: Gary Tully [mailto:gary.tully@gmail.com]=20 > Sent: Wednesday, April 13, 2011 5:49 AM > To: dev@activemq.apache.org > Subject: Re: svn commit: r1079638 - in /activemq/trunk:=20 > NOTICE activemq-console/pom.xml=20 > activemq-console/src/main/java/org/apache/activemq/console/Act > iveMQLauncher.java pom.xml >=20 > where does the need for the yahoo attribution derive from? > If it is needed we need to included the license text also. >=20 > On 9 March 2011 01:42, wrote: > > Author: bsnyder > > Date: Wed Mar =A09 01:42:36 2011 > > New Revision: 1079638 > > > > URL: http://svn.apache.org/viewvc?rev=3D1079638&view=3Drev > > Log: > > AMQ-2968 - Add Apache commons daemon (jsvc/procrun)=20 > start/stop support. > > > > Added: > > =A0 =A0 > >=20 > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/cons > > ole/ActiveMQLauncher.java > > Modified: > > =A0 =A0activemq/trunk/NOTICE > > =A0 =A0activemq/trunk/activemq-console/pom.xml > > =A0 =A0activemq/trunk/pom.xml > > > > Modified: activemq/trunk/NOTICE > > URL:=20 > >=20 > http://svn.apache.org/viewvc/activemq/trunk/NOTICE?rev=3D1079638&r1=3D107= 9 > > 637&r2=3D1079638&view=3Ddiff=20 > >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > =3D=3D=3D=3D=3D=3D=3D=3D > > --- activemq/trunk/NOTICE (original) > > +++ activemq/trunk/NOTICE Wed Mar =A09 01:42:36 2011 > > @@ -42,3 +42,8 @@ Some portions of the code are Copyright: > > =A0 1999 Jason Gilbert. > > > > =A0The jboss integration module contains some LGPL code. > > + > > +This product includes software developed by > > + =A0 Yahoo! Inc. (www.yahoo.com) > > + =A0 Copyright (c) 2010 Yahoo! Inc. =A0All rights reserved. > > + > > > > Modified: activemq/trunk/activemq-console/pom.xml > > URL:=20 > >=20 > http://svn.apache.org/viewvc/activemq/trunk/activemq-console/pom.xml?r > > ev=3D1079638&r1=3D1079637&r2=3D1079638&view=3Ddiff > >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > =3D=3D=3D=3D=3D=3D=3D=3D > > --- activemq/trunk/activemq-console/pom.xml (original) > > +++ activemq/trunk/activemq-console/pom.xml Wed Mar =A09 01:42:36 2011 > > @@ -125,7 +125,13 @@ > > =A0 =A0 > > =A0 =A0 =A0 com.ibm.icu > > =A0 =A0 =A0 icu4j > > - =A0 =A0 > > + =A0 =A0 > > + > > + =A0 =A0 > > + =A0 =A0 =A0commons-daemon > > + =A0 =A0 =A0commons-daemon > > + =A0 =A0 > > + > > =A0 > > > > =A0 > > > > Added:=20 > >=20 > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/cons > > ole/ActiveMQLauncher.java > > URL:=20 > >=20 > http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/ > >=20 > java/org/apache/activemq/console/ActiveMQLauncher.java?rev=3D1079638&vie > > w=3Dauto=20 > >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > =3D=3D=3D=3D=3D=3D=3D=3D > > ---=20 > >=20 > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/cons > > ole/ActiveMQLauncher.java (added) > > +++=20 > activemq/trunk/activemq-console/src/main/java/org/apache/activemq/ > > +++ console/ActiveMQLauncher.java Wed Mar =A09 01:42:36 2011 > > @@ -0,0 +1,103 @@ > > +/** > > + * Licensed to the Apache Software Foundation (ASF) under one > > + * or more contributor license agreements. =A0See the NOTICE file > > + * distributed with this work for additional information > > + * regarding copyright ownership. =A0The 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. =A0You may obtain a copy of the License at > > + * > > + * =A0 =A0 =A0 http://www.apache.org/licenses/LICENSE-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. =A0See 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=20 > > +org.apache.activemq.console.formatter.CommandShellOutputFormatter; > > +import org.apache.commons.daemon.Daemon; import=20 > > +org.apache.commons.daemon.DaemonContext; > > + > > +/** > > + * This class launches activemq under Apache JSVC {@link=20 > > +http://commons.apache.org/daemon/jsvc.html} > > + * > > + * @author areese > > + * > > + */ > > +public class ActiveMQLauncher implements Daemon { > > + =A0 =A0private List args; > > + > > + =A0 =A0/** > > + =A0 =A0 * > > + =A0 =A0 */ > > + =A0 =A0public ActiveMQLauncher() { > > + =A0 =A0} > > + > > + =A0 =A0/* > > + =A0 =A0 * (non-Javadoc) > > + =A0 =A0 * > > + =A0 =A0 * @see org.apache.commons.daemon.Daemon#destroy() > > + =A0 =A0 */ > > + =A0 =A0public void destroy() { > > + =A0 =A0} > > + > > + =A0 =A0/* > > + =A0 =A0 * (non-Javadoc) > > + =A0 =A0 * > > + =A0 =A0 * @see > > + =A0 =A0 *=20 > > +=20 > org.apache.commons.daemon.Daemon#init(org.apache.commons.daemon.Daem > > + onContext > > + =A0 =A0 * ) > > + =A0 =A0 */ > > + =A0 =A0public void init(DaemonContext arg0) throws Exception { > > + =A0 =A0 =A0 =A0// we need to save the args we started with. > > + =A0 =A0 =A0 =A0args =3D Arrays.asList(arg0.getArguments()); > > + =A0 =A0} > > + > > + =A0 =A0/* > > + =A0 =A0 * (non-Javadoc) > > + =A0 =A0 * > > + =A0 =A0 * @see org.apache.commons.daemon.Daemon#start() > > + =A0 =A0 */ > > + =A0 =A0public void start() throws Exception { > > + =A0 =A0 =A0 =A0CommandContext context =3D new CommandContext(); > > + =A0 =A0 =A0 =A0context.setFormatter(new=20 > > + CommandShellOutputFormatter(System.out)); > > + > > + =A0 =A0 =A0 =A0Command command =3D new StartCommand(); > > + =A0 =A0 =A0 =A0command.setCommandContext(context); > > + > > + =A0 =A0 =A0 =A0command.execute(args); > > + =A0 =A0} > > + > > + =A0 =A0/* > > + =A0 =A0 * (non-Javadoc) > > + =A0 =A0 * > > + =A0 =A0 * @see org.apache.commons.daemon.Daemon#stop() > > + =A0 =A0 */ > > + =A0 =A0public void stop() throws Exception { > > + =A0 =A0 =A0 =A0CommandContext context =3D new CommandContext(); > > + =A0 =A0 =A0 =A0context.setFormatter(new=20 > > + CommandShellOutputFormatter(System.out)); > > + > > + =A0 =A0 =A0 =A0Command command =3D new ShutdownCommand(); > > + =A0 =A0 =A0 =A0command.setCommandContext(context); > > + > > + =A0 =A0 =A0 =A0List tokens =3D new=20 > ArrayList(Arrays.asList(new=20 > > + String[] { > > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"--jmxlocal", "--all", })); > > + > > + =A0 =A0 =A0 =A0command.execute(tokens); > > + =A0 =A0} > > + > > +} > > > > Modified: activemq/trunk/pom.xml > > URL:=20 > >=20 > http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=3D1079638&r1=3D10= 7 > > 9637&r2=3D1079638&view=3Ddiff=20 > >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > =3D=3D=3D=3D=3D=3D=3D=3D > > --- activemq/trunk/pom.xml (original) > > +++ activemq/trunk/pom.xml Wed Mar =A09 01:42:36 2011 > > @@ -449,6 +449,13 @@ > > =A0 =A0 =A0 =A0 3.0.0 > > =A0 =A0 =A0 =A0 true > > =A0 =A0 =A0 > > + > > + =A0 =A0 > > + =A0 =A0 > > + =A0 =A0 =A0commons-daemon > > + =A0 =A0 =A0commons-daemon > > + =A0 =A0 =A01.0.3 > > + =A0 =A0 > > > > =A0 =A0 =A0 > > =A0 =A0 =A0 > > @@ -941,11 +948,11 @@ > > =A0 =A0 =A0 > > > > =A0 =A0 =A0 > > - =A0 =A0 =A0 > > - =A0 =A0 =A0 =A0 =A0 commons-net > > - =A0 =A0 =A0 =A0 =A0 commons-net > > - =A0 =A0 =A0 =A0 =A0 ${commons-net-version} > > - =A0 =A0 =A0 > > + =A0 =A0 =A0 =A0 > > + =A0 =A0 =A0 =A0 =A0 =A0commons-net > > + =A0 =A0 =A0 =A0 =A0 =A0commons-net > > + =A0 =A0 =A0 =A0 =A0 =A0${commons-net-version} > > + =A0 =A0 =A0 =A0 > > > > =A0 =A0 =A0 > > =A0 =A0 =A0 =A0 org.apache.velocity > > > > > > >=20 >=20 >=20 > -- > http://blog.garytully.com > http://fusesource.com > =