Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 43495 invoked from network); 5 Feb 2010 04:39:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Feb 2010 04:39:30 -0000 Received: (qmail 67581 invoked by uid 500); 5 Feb 2010 04:39:30 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 67523 invoked by uid 500); 5 Feb 2010 04:39:30 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 67488 invoked by uid 99); 5 Feb 2010 04:39:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Feb 2010 04:39:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Feb 2010 04:39:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BBAE923889FA; Fri, 5 Feb 2010 04:38:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r906810 [2/2] - in /geronimo/external/trunk/tomcat-parent-6.0.24: ./ catalina-ha/ catalina-ha/src/ catalina-ha/src/main/ catalina-ha/src/main/java/ catalina-ha/src/main/java/org/ catalina-ha/src/main/java/org/apache/ catalina-ha/src/main/ja... Date: Fri, 05 Feb 2010 04:38:58 -0000 To: scm@geronimo.apache.org From: delos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100205043858.BBAE923889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina-ha/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina-ha/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina-ha/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina-ha/src/main/java/org/apache/catalina/ha/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/catalina/ha:883362 +/tomcat/trunk/java/org/apache/catalina/ha:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,76 8335,769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,8893 63,889606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Added: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,111 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + catalina + bundle + + Apache Geronimo Tomcat fork: Catalina + + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + + + org.apache.geronimo.specs + geronimo-jpa_3.0_spec + + + org.apache.geronimo.javamail + geronimo-javamail_1.4_mail + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + org.apache.geronimo.ext.tomcat + juli + + + org.apache.geronimo.ext.tomcat + shared + + + org.apache.geronimo.ext.tomcat + util + + + + + + org.apache.felix + maven-bundle-plugin + + + javax.servlet.resources,javax.servlet.jsp.resources,* + {maven-resources}, + org/apache/catalina/util/ServerInfo.properties=target/classes/org/apache/catalina/util/ServerInfo.properties + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-resources + + run + + + + + + + + + + + + + + + + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/src/main/java/org/apache/catalina/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/catalina:883362 +/tomcat/trunk/java/org/apache/catalina:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,76833 5,769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363, 889606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/src/main/java/org/apache/coyote/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/coyote:883362 +/tomcat/trunk/java/org/apache/coyote:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335, 769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,88 9606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/src/main/java/org/apache/jk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/jk:883362 +/tomcat/trunk/java/org/apache/jk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,7699 79,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606 ,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/src/main/java/org/apache/naming/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/naming:883362 +/tomcat/trunk/java/org/apache/naming:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335, 769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,88 9606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/src/main/java/org/apache/tomcat/jni/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/tomcat/jni:883362 +/tomcat/trunk/java/org/apache/tomcat/jni:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768 335,769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,88936 3,889606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/catalina/src/main/java/org/apache/tomcat/util/net/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/tomcat/util/net:883362 +/tomcat/trunk/java/org/apache/tomcat/util/net:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,76566 2,768335,769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072, 889363,889606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Added: geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh Fri Feb 5 04:38:49 2010 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + + +chmod u+x mydos2unix.sh +chmod u+x svn-actions.sh +chmod u+x mv-resource.sh + +# fix line endings and add empty directories + +find . -name pom.xml |xargs -n1 ./mydos2unix.sh +#sed -i bak 's/\\r//g' + +mkdir -p shared/src/main/java/org/apache/ Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/fixup.sh ------------------------------------------------------------------------------ svn:keywords = Date Revision Added: geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + jasper-el + bundle + + Apache Geronimo Tomcat fork: Jasper-el + + + + org.apache.geronimo.specs + geronimo-el_1.0_spec + + + + + + org.apache.felix + maven-bundle-plugin + + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper-el/src/main/java/org/apache/el/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/el:883362 +/tomcat/trunk/java/org/apache/el:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,7699 79,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606 ,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Added: geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,91 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + jasper + bundle + + Apache Geronimo Tomcat fork: Jasper + + + + org.apache.geronimo.specs + geronimo-el_1.0_spec + + + org.apache.geronimo.specs + geronimo-jsp_2.1_spec + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + + + org.apache.geronimo.ext.tomcat + juli + + + org.apache.geronimo.ext.tomcat + shared + + + org.apache.ant + ant + + + org.eclipse.jdt + core + + + + + + + + + + + org.apache.geronimo.ext.tomcat + jasper-el + + + org.apache.geronimo.ext.tomcat + util + + + + + + org.apache.felix + maven-bundle-plugin + + + javax.servlet.resources,javax.servlet.jsp.resources,* + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/jasper/src/main/java/org/apache/jasper/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/jasper:883362 +/tomcat/trunk/java/org/apache/jasper:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335, 769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,88 9606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Added: geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,42 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + juli + bundle + + Apache Geronimo Tomcat fork: Juli + + + + org.apache.felix + maven-bundle-plugin + + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/juli/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/juli/src/main/java/org/apache/juli/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/juli:883362 +/tomcat/trunk/java/org/apache/juli:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,76 9979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,8896 06,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Added: geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh Fri Feb 5 04:38:49 2010 @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# script to svn mv properties files from src/main/java to src/main/resources + +SRC=$1 +TARGET=`echo $SRC | sed s/java/resources/` + +svn mv --parents $SRC $TARGET + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/mv-resource.sh ------------------------------------------------------------------------------ svn:keywords = Date Revision Added: geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh Fri Feb 5 04:38:49 2010 @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +echo processing $1 +tr -d \\r <$1 > $1bak +mv $1bak $1 +echo processed $1 \ No newline at end of file Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/mydos2unix.sh ------------------------------------------------------------------------------ svn:keywords = Date Revision Added: geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,192 @@ + + + + 4.0.0 + + org.apache.geronimo.genesis + genesis-java5-flava + 2.0 + + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + pom + + Apache Geronimo Tomcat fork + Mavenized tomcat build + + + + + scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/ + scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/ + http://svn.apache.org/viewcvs.cgi/geronimo/external/trunk/tomcat-archetype/ + + + + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + 1.1.1 + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + 1.0.1 + + + org.apache.geronimo.specs + geronimo-el_1.0_spec + 1.0.2-SNAPSHOT + + + org.apache.geronimo.javamail + geronimo-javamail_1.4_mail + 1.7 + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + 1.0 + + + org.apache.geronimo.specs + geronimo-jpa_3.0_spec + 1.1.1 + + + org.apache.geronimo.specs + geronimo-jsp_2.1_spec + 1.0.1 + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + 1.2 + + + + org.apache.ant + ant + 1.7.1 + + + org.eclipse.jdt + core + 3.3.0-v_771 + + + org.eclipse.core + resources + + + org.eclipse.core + runtime + + + org.eclipse.core + filesystem + + + org.eclipse + text + + + org.eclipse.team + core + + + + + + + + + org.apache.geronimo.ext.tomcat + catalina + 6.0.24.0-SNAPSHOT + + + org.apache.geronimo.ext.tomcat + catalina-ha + 6.0.24.0-SNAPSHOT + + + org.apache.geronimo.ext.tomcat + jasper + 6.0.24.0-SNAPSHOT + + + org.apache.geronimo.ext.tomcat + jasper-el + 6.0.24.0-SNAPSHOT + + + org.apache.geronimo.ext.tomcat + juli + 6.0.24.0-SNAPSHOT + + + + + + + + + + + + + org.apache.geronimo.ext.tomcat + shared + 6.0.24.0-SNAPSHOT + + + org.apache.geronimo.ext.tomcat + tribes + 6.0.24.0-SNAPSHOT + + + org.apache.geronimo.ext.tomcat + util + 6.0.24.0-SNAPSHOT + + + + + + shared + juli + catalina + tribes + util + catalina-ha + jasper + jasper-el + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh Fri Feb 5 04:38:49 2010 @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# run after you have got all the other steps to work, to remove the scripts that did the work. +# please don't run this in the archetype project itself + +svn rm build-archetype.sh fixup.sh mv-resource.sh mydos2unix.sh README.txt run.sh svn-actions.sh rm-archetype-goo.sh \ No newline at end of file Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/rm-archetype-goo.sh ------------------------------------------------------------------------------ svn:keywords = Date Revision Added: geronimo/external/trunk/tomcat-parent-6.0.24/run.sh URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/run.sh?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/run.sh (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/run.sh Fri Feb 5 04:38:49 2010 @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# Included as an example of how to set up a project. Works in *nix environments +# Update TVER and TTAGVER with the Tomcat version number in appropriate format +TVER=6.0.24 +#export TTAGVER=6_0_20 + +GVER=${TVER}.0-SNAPSHOT + +svn rm --force tomcat-parent-${TVER} +rm -rf tomcat-parent-${TVER}/ +mvn archetype:generate\ + -DarchetypeCatalog=local\ + -DinteractiveMode=false\ + -DarchetypeGroupId=org.apache.geronimo.ext.tomcat\ + -DarchetypeArtifactId=tomcat-parent-archetype\ + -DarchetypeVersion=1.0-SNAPSHOT\ + -DgroupId=org.apache.geronimo.ext.tomcat\ + -DartifactId=tomcat-parent-${TVER}\ + -Dversion=${GVER}\ + -Dpackage=org.apache + +cd tomcat-parent-${TVER} +chmod u+x fixup.sh +./fixup.sh +cd .. +svn add tomcat-parent-${TVER} +cd tomcat-parent-${TVER} + +svn status + +./svn-actions.sh + +mvn clean install + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/run.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/run.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/run.sh ------------------------------------------------------------------------------ svn:keywords = Date Revision Added: geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + shared + bundle + + Apache Geronimo Tomcat fork: Shared + + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + + + + + + org.apache.felix + maven-bundle-plugin + + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java Fri Feb 5 04:38:49 2010 @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache 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; + +import java.lang.reflect.InvocationTargetException; + +import javax.naming.NamingException; + +/** + * Comment + * + * @author Bill Burke + * @version $Revision$ + */ +public interface AnnotationProcessor { + public void postConstruct(Object instance) + throws IllegalAccessException, InvocationTargetException; + public void preDestroy(Object instance) + throws IllegalAccessException, InvocationTargetException; + public void processAnnotations(Object instance) + throws IllegalAccessException, InvocationTargetException, NamingException; +} Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/AnnotationProcessor.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java Fri Feb 5 04:38:49 2010 @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache 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; + +public interface PeriodicEventListener { + /** + * Execute a periodic task, such as reloading, etc. + */ + public void periodicEvent(); +} Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/shared/src/main/java/org/apache/PeriodicEventListener.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh Fri Feb 5 04:38:49 2010 @@ -0,0 +1,101 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# Script to copy the tomcat source to the appropriate places in the mavenized project +# Run after running the tomcat archetype. +# Typically run from run.sh + +# Figure out if the framework is already in svn +if [ -d .svn ] +then + #yes, use svn copy to preserve history + SVN_CMD="svn cp --parents" + RM="svn rm" +else + #no, use svn export to avoid polluting with svn crud + SVN_CMD="svn export" + RM="rm -rf" +fi + +TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_24/" + +TOMCAT=$TOMCAT_BASE + +#catalina +$SVN_CMD $TOMCAT/java/org/apache/catalina/ catalina/src/main/java/org/apache/catalina +$SVN_CMD $TOMCAT/java/org/apache/naming/ catalina/src/main/java/org/apache/naming +$RM catalina/src/main/java/org/apache/catalina/ant +$RM catalina/src/main/java/org/apache/catalina/cluster +$RM catalina/src/main/java/org/apache/catalina/ha +$RM catalina/src/main/java/org/apache/catalina/tribes +# does not exist? +$RM catalina/src/main/java/org/apache/catalina/launcher +# does not exist? +$RM catalina/src/main/java/org/apache/catalina/storeconfig +$RM catalina/src/main/java/org/apache/naming/factory/webservices +#formerly coyote jar +$SVN_CMD $TOMCAT/java/org/apache/coyote/ catalina/src/main/java/org/apache/coyote +$SVN_CMD $TOMCAT/java/org/apache/tomcat/jni/ catalina/src/main/java/org/apache/tomcat/jni +$SVN_CMD $TOMCAT/java/org/apache/jk/ catalina/src/main/java/org/apache/jk +$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ catalina/src/main/java/org/apache/tomcat/util/net + +#catalina-ha +$SVN_CMD $TOMCAT/java/org/apache/catalina/ha/ catalina-ha/src/main/java/org/apache/catalina/ha + +#coyote +#$SVN_CMD $TOMCAT/java/org/apache/coyote/ coyote/src/main/java/org/apache/coyote +#$SVN_CMD $TOMCAT/java/org/apache/tomcat/jni/ coyote/src/main/java/org/apache/tomcat/jni +#$SVN_CMD $TOMCAT/java/org/apache/jk/ coyote/src/main/java/org/apache/jk +#$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ coyote/src/main/java/org/apache/tomcat/util/net + +#jasper +$SVN_CMD $TOMCAT/java/org/apache/jasper/ jasper/src/main/java/org/apache/jasper + +#jasper-el +$SVN_CMD $TOMCAT/java/org/apache/el/ jasper-el/src/main/java/org/apache/el + +#jasper-jdt appears to be a shade + +#juli +$SVN_CMD $TOMCAT/java/org/apache/juli/ juli/src/main/java/org/apache/juli + + + +#shared +if [ -d .svn ] +then + $SVN_CMD $TOMCAT/java/org/apache/tomcat/InstanceManager.java shared/src/main/java/org/apache/tomcat/InstanceManager.java + $SVN_CMD $TOMCAT/java/org/apache/tomcat/JarScanner.java shared/src/main/java/org/apache/tomcat + $SVN_CMD $TOMCAT/java/org/apache/tomcat/JarScannerCallback.java shared/src/main/java/org/apache/tomcat + $SVN_CMD $TOMCAT/java/org/apache/tomcat/PeriodicEventListener.java shared/src/main/java/org/apache/tomcat +else + $SVN_CMD -N $TOMCAT/java/org/apache/ shared/src/main/java/org/apache +fi + +#tribes +$SVN_CMD $TOMCAT/java/org/apache/catalina/tribes/ tribes/src/main/java/org/apache/catalina/tribes + +#util +$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/ util/src/main/java/org/apache/tomcat/util +$RM util/src/main/java/org/apache/tomcat/util/net + +# move the properties files to src/main/resourcs +find . -name *.properties |xargs -n1 ./mv-resource.sh + +# move the mbean descriptor xml files to src/main/resourcs +find . -name mbeans-descriptors.??? |xargs -n1 ./mv-resource.sh Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/svn-actions.sh ------------------------------------------------------------------------------ svn:keywords = Date Revision Added: geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + tribes + bundle + + Apache Geronimo Tomcat fork: Tribes + + + + org.apache.geronimo.ext.tomcat + juli + + + + + + org.apache.felix + maven-bundle-plugin + + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/tribes/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/tribes/src/main/java/org/apache/catalina/tribes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/catalina/tribes:883362 +/tomcat/trunk/java/org/apache/catalina/tribes:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,76566 2,768335,769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072, 889363,889606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420 Added: geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml?rev=906810&view=auto ============================================================================== --- geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml (added) +++ geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml Fri Feb 5 04:38:49 2010 @@ -0,0 +1,58 @@ + + + + 4.0.0 + + org.apache.geronimo.ext.tomcat + tomcat-parent-6.0.24 + 6.0.24.0-SNAPSHOT + + util + bundle + + Apache Geronimo Tomcat fork: Util + + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + + + org.apache.geronimo.ext.tomcat + juli + + + org.apache.geronimo.ext.tomcat + shared + + + + + + + org.apache.felix + maven-bundle-plugin + + + + + + + Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/util/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: geronimo/external/trunk/tomcat-parent-6.0.24/util/src/main/java/org/apache/tomcat/util/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 5 04:38:49 2010 @@ -0,0 +1,2 @@ +/tomcat/java/org/apache/tomcat/util:883362 +/tomcat/trunk/java/org/apache/tomcat/util:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,76 8335,769979,770716,770809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,8893 63,889606,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,899284,899348,899420