Return-Path: Delivered-To: apmail-geronimo-activemq-dev-archive@www.apache.org Received: (qmail 65876 invoked from network); 21 Dec 2005 15:23:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Dec 2005 15:23:31 -0000 Received: (qmail 2498 invoked by uid 500); 21 Dec 2005 15:23:17 -0000 Delivered-To: apmail-geronimo-activemq-dev-archive@geronimo.apache.org Received: (qmail 2419 invoked by uid 500); 21 Dec 2005 15:23:17 -0000 Mailing-List: contact activemq-dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-dev@geronimo.apache.org Received: (qmail 2270 invoked by uid 99); 21 Dec 2005 15:23:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2005 07:23:16 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [66.116.97.229] (HELO mail.dudney.net) (66.116.97.229) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2005 07:23:14 -0800 Received: from localhost (localhost [127.0.0.1]) by mail.dudney.net (Postfix) with ESMTP id 397B011CC07 for ; Wed, 21 Dec 2005 08:22:53 -0700 (MST) Received: from mail.dudney.net ([127.0.0.1]) by localhost (mini.dudney.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21317-06 for ; Wed, 21 Dec 2005 08:22:46 -0700 (MST) Received: from [192.168.2.214] (71-211-141-201.hlrn.qwest.net [71.211.141.201]) by mail.dudney.net (Postfix) with ESMTP id 7606111CBE9 for ; Wed, 21 Dec 2005 08:22:43 -0700 (MST) Mime-Version: 1.0 (Apple Message framework v746.2) In-Reply-To: <613F843D-B6C0-409D-AB29-99962470B7F9@gmail.com> References: <7CA89B57-1EFC-4EF0-8A24-E96A58003FDE@apache.org> <613F843D-B6C0-409D-AB29-99962470B7F9@gmail.com> Content-Type: multipart/mixed; boundary=Apple-Mail-14-105053041 Message-Id: <001023D7-2D25-4E86-A785-12EAE0E876E8@apache.org> From: Bill Dudney Subject: Re: root patch Date: Wed, 21 Dec 2005 08:22:39 -0700 To: activemq-dev@geronimo.apache.org X-Mailer: Apple Mail (2.746.2) X-Virus-Scanned: by amavisd-new at dudney.net X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --Apple-Mail-14-105053041 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Thanks James! Here is (hopefully :-) the last patch to get the m2 build to work... --Apple-Mail-14-105053041 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Its to the activemq-jaas/pom.xml file. TTFN, -bd- Bill Dudney MyFaces - myfaces.apache.org Wadi - incubator.apache.org/wadi On Dec 20, 2005, at 8:09 AM, James Strachan wrote: > Have applied all of Bills patches to the M2 POMs now - many thanks > Bill. > > James > > On 20 Dec 2005, at 05:05, Bill Dudney wrote: > >> Finally the patch for the root pom. >> >> The RAR bug in the rar plugin for m2 is finally fixed and released >> so you should be able to apply these patches and work with m2 and >> stop using m1. I did not try to generate a site and I ignored >> tests as well just get through the build (except for activecluster >> which had a couple of files that meet the default filter but are >> not tests, I excluded them, please take a quick look at that patch >> and make sure I did not exclude something by mistake). >> >> I noticed that I mistakenly marked everything with 4.0M2 instead >> of 4.0M4 - I'd be glad to repatch but I'd guess that would be more >> irritating than helpful. >> >> Sorry the patches were not in a more palatable form. There are >> lots of files that are not ignored (via svn:ignore) that would >> have made for ugly patches from the root. >> >> Here is the output from svn status with the list of files that are >> not ignored. the target dirs are particularly ugly for patches :-) >> >> $ svn status >> ? activemq-jaas/surefire.properties >> ? activemq-jaas/.wtpmodules >> ? activemq-jaas/surefire-classloader.properties >> ? activemq-jaas/.settings >> M activemq-jaas/pom.xml >> M pom.xml >> ? activemq-core/.wtpmodules >> ? activemq-core/.settings >> M activemq-core/pom.xml >> ? activeio/pom.xml >> ? activeio/activeio-core/.classpath >> ? activeio/activeio-core/.wtpmodules >> ? activeio/activeio-core/.project >> ? activeio/activeio-core/target >> ? activeio/activeio-core/.settings >> M activeio/activeio-core/pom.xml >> ? activeio/activeio-aio/.classpath >> ? activeio/activeio-aio/.wtpmodules >> ? activeio/activeio-aio/.project >> ? activeio/activeio-aio/target >> ? activeio/activeio-aio/.settings >> M activeio/activeio-aio/pom.xml >> ? activemq-ra/.wtpmodules >> ? activemq-ra/.settings >> M activemq-ra/pom.xml >> ? activecluster/.wtpmodules >> ? activecluster/target >> M activecluster/.classpath >> M activecluster/.project >> A activecluster/pom.xml >> >> Hope this helps, >> >> Bill Dudney >> MyFaces - myfaces.apache.org >> Wadi - incubator.apache.org/wadi >> >> >> Index: pom.xml >> =================================================================== >> --- pom.xml (revision 357904) >> +++ pom.xml (working copy) >> @@ -1,15 +1,24 @@ >> >> - >> 4.0.0 >> - activemq >> + org.apache.activemq >> activemq >> - 4.0-SNAPSHOT >> + 4.0M2 >> + pom >> ActiveMQ JMS Broker Project >> + >> + >> + Development List >> + activemq-dev@geronimo.apache.org >> + activemq-dev@geronimo.apache.org >> + activemq-dev@geronimo.apache.org >> + >> + >> + >> >> >> >> - >> + true >> >> codehaus >> Codehaus Repository >> @@ -80,6 +89,8 @@ >> activemq-core >> activemq-ra >> activemq-jaas >> + activeio >> + activecluster >> >> >> @@ -130,21 +141,25 @@ >> geronimo-spec-jms >> 1.1-rc4 >> >> + >> >> geronimo-spec >> geronimo-spec-jta >> 1.0.1B-rc4 >> >> + >> >> geronimo-spec >> geronimo-spec-j2ee-management >> 1.0-rc4 >> >> + >> >> geronimo-spec >> geronimo-spec-j2ee-jacc >> 1.0-rc4 >> >> + >> >> geronimo-spec >> geronimo-spec-j2ee-connector >> @@ -158,7 +173,7 @@ >> >> xbean >> xbean-spring >> - 2.0-SNAPSHOT >> + 2.0 >> >> >> >> @@ -186,7 +201,7 @@ >> >> >> >> - springframework >> + org.springframework >> spring >> 1.2.4 >> >> @@ -211,11 +226,13 @@ >> axion >> 1.0-M3-dev >> >> + >> >> commons-primitives >> commons-primitives >> 1.0 >> >> + >> >> regexp >> regexp >> @@ -257,6 +274,7 @@ >> smack >> 1.5.0 >> >> + >> >> activemq >> smackx >> @@ -341,7 +359,7 @@ >> >> >> - activemq >> + org.apache.activemq >> activemq-jaas >> ${project.version} >> >> > > > James > ------- > http://radio.weblogs.com/0112098/ > --Apple-Mail-14-105053041--