You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2011/12/14 17:34:19 UTC
svn commit: r1214327 - in
/geronimo/external/branches/tomcat-archetype-6.0.x: README.txt fixup.sh
pom.xml rm-archetype-goo.sh run.sh svn-actions.sh
Author: xiaming
Date: Wed Dec 14 16:34:19 2011
New Revision: 1214327
URL: http://svn.apache.org/viewvc?rev=1214327&view=rev
Log:
Online fork is a little bit slow, so update the scripts to use offline fork
Modified:
geronimo/external/branches/tomcat-archetype-6.0.x/README.txt
geronimo/external/branches/tomcat-archetype-6.0.x/fixup.sh
geronimo/external/branches/tomcat-archetype-6.0.x/pom.xml
geronimo/external/branches/tomcat-archetype-6.0.x/rm-archetype-goo.sh
geronimo/external/branches/tomcat-archetype-6.0.x/run.sh
geronimo/external/branches/tomcat-archetype-6.0.x/svn-actions.sh
Modified: geronimo/external/branches/tomcat-archetype-6.0.x/README.txt
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-6.0.x/README.txt?rev=1214327&r1=1214326&r2=1214327&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-6.0.x/README.txt (original)
+++ geronimo/external/branches/tomcat-archetype-6.0.x/README.txt Wed Dec 14 16:34:19 2011
@@ -15,19 +15,20 @@
# limitations under the License.
Use tomcat-archetype to build a new level of Tomcat
+1. Check out the target tomcat tag to local file system, for example,
+ /home/forrestxm/src/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_35
-1. Update run.sh with the new Tomcat version number:
+2. Update run.sh with the new Tomcat version number:
# Update TVER and TTAGVER with the Tomcat version number in appropriate format
- TVER=6.0.20
- TTAGVER=6_0_20
+ TVER=6.0.35
+ TTAGVER=6_0_35
-2. From parent directory of tomcat-archetype, execute run.sh (assumes that subversion 1.5 or greater)
+3. Run build-archetype.sh to install the tomcat-parent-archetype into local maven repository
- cd geronimo/external/trunk
- ./parent-archetype/run.sh
+4. From parent directory of tomcat-archetype, execute run.sh (assumes that subversion 1.5 or greater)
-3. Run ./rm-archetype-goo.sh after you've run all the other scripts and are happy with the results.
- This removes the archetype scripts that aren't needed in the maven project.
+ cd geronimo/external/trunk
+ ./parent-archetype/run.sh /home/forrestxm/src/asf/tomcat/tc6.0.x/tags
-4. Apply patches to tomcat-parent-6.0.20/
+5. Apply patches to tomcat-parent-6.0.35/
Modified: geronimo/external/branches/tomcat-archetype-6.0.x/fixup.sh
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-6.0.x/fixup.sh?rev=1214327&r1=1214326&r2=1214327&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-6.0.x/fixup.sh (original)
+++ geronimo/external/branches/tomcat-archetype-6.0.x/fixup.sh Wed Dec 14 16:34:19 2011
@@ -17,8 +17,7 @@
-chmod u+x mydos2unix.sh
-chmod u+x svn-actions.sh
+chmod u+x *.sh
# fix line endings and add empty directories
Modified: geronimo/external/branches/tomcat-archetype-6.0.x/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-6.0.x/pom.xml?rev=1214327&r1=1214326&r2=1214327&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-6.0.x/pom.xml (original)
+++ geronimo/external/branches/tomcat-archetype-6.0.x/pom.xml Wed Dec 14 16:34:19 2011
@@ -34,7 +34,7 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Geronimo Tomcat fork</name>
+ <name>Apache Geronimo Tomcat 6.0.x fork</name>
<description>Mavenized tomcat build</description>
<!-- instructions:
@@ -46,9 +46,9 @@ mvn archetype:generate -DarchetypeCatalo
-->
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/external/trunk/tomcat-archetype/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/external/branches/tomcat-archetype-6.0.x/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/branches/tomcat-archetype-6.0.x/</developerConnection>
+ <url>http://svn.apache.org/viewcvs/geronimo/external/branches/tomcat-archetype-6.0.x/</url>
</scm>
<modules>
Modified: geronimo/external/branches/tomcat-archetype-6.0.x/rm-archetype-goo.sh
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-6.0.x/rm-archetype-goo.sh?rev=1214327&r1=1214326&r2=1214327&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-6.0.x/rm-archetype-goo.sh (original)
+++ geronimo/external/branches/tomcat-archetype-6.0.x/rm-archetype-goo.sh Wed Dec 14 16:34:19 2011
@@ -18,4 +18,4 @@
# 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
+rm -rf build-archetype.sh fixup.sh mv-resource.sh mydos2unix.sh README.txt run.sh svn-actions.sh rm-archetype-goo.sh
Modified: geronimo/external/branches/tomcat-archetype-6.0.x/run.sh
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-6.0.x/run.sh?rev=1214327&r1=1214326&r2=1214327&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-6.0.x/run.sh (original)
+++ geronimo/external/branches/tomcat-archetype-6.0.x/run.sh Wed Dec 14 16:34:19 2011
@@ -18,11 +18,12 @@
# 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.20
-export TTAGVER=6_0_20
+TVER=6.0.35
+export TTAGVER=6_0_35
-GVER=${TVER}-SNAPSHOT
+GVER=${TVER}.1-SNAPSHOT
+echo ">>>>>>>>>>>>Create a new directory hierarchy..."
svn rm --force tomcat-parent-${TVER}
rm -rf tomcat-parent-${TVER}/
mvn archetype:generate\
@@ -35,6 +36,7 @@ mvn archetype:generate\
-DartifactId=tomcat-parent-${TVER}\
-Dversion=${GVER}\
-Dpackage=org.apache
+echo ">>>>>>>>>>>>>Directory hierarchy done!"
#mv tomcat-parent tomcat-parent-${TVER}
@@ -42,13 +44,16 @@ cd tomcat-parent-${TVER}
chmod u+x fixup.sh
./fixup.sh
cd ..
-svn add tomcat-parent-${TVER}
+#svn add tomcat-parent-${TVER}
cd tomcat-parent-${TVER}
-svn status
-
-./svn-actions.sh
+#svn status
chmod u+x mv-resource.sh
+# online copy too slow
+#./svn-actions.sh
+./svn-actions.sh $1
+
+./rm-archetype-goo.sh
-mvn clean install
+#mvn clean install
Modified: geronimo/external/branches/tomcat-archetype-6.0.x/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-6.0.x/svn-actions.sh?rev=1214327&r1=1214326&r2=1214327&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-6.0.x/svn-actions.sh (original)
+++ geronimo/external/branches/tomcat-archetype-6.0.x/svn-actions.sh Wed Dec 14 16:34:19 2011
@@ -34,11 +34,15 @@ fi
TOMCAT_TAG=TOMCAT_${TTAGVER}
-TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags"
+# online copy too slow
+#TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags"
+TOMCAT_BASE=$1
TOMCAT=$TOMCAT_BASE/$TOMCAT_TAG
#catalina
+echo ">>>>>>>>>>>>>>>>>>Build catalina project code"
+mkdir -p catalina/src/main/java/org/apache
$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
@@ -57,6 +61,8 @@ $SVN_CMD $TOMCAT/java/org/apache/jk/ cat
$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ catalina/src/main/java/org/apache/tomcat/util/net
#catalina-ha
+echo ">>>>>>>>>>>>>>>>>>Build catalina-ha project code"
+mkdir -p catalina-ha/src/main/java/org/apache/catalina
$SVN_CMD $TOMCAT/java/org/apache/catalina/ha/ catalina-ha/src/main/java/org/apache/catalina/ha
#coyote
@@ -66,19 +72,26 @@ $SVN_CMD $TOMCAT/java/org/apache/catalin
#$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ coyote/src/main/java/org/apache/tomcat/util/net
#jasper
+echo ">>>>>>>>>>>>>>>>>>Build jasper project code"
+mkdir -p jasper/src/main/java/org/apache
$SVN_CMD $TOMCAT/java/org/apache/jasper/ jasper/src/main/java/org/apache/jasper
#jasper-el
+echo ">>>>>>>>>>>>>>>>>>Build jasper-el project code"
+mkdir -p jasper-el/src/main/java/org/apache
$SVN_CMD $TOMCAT/java/org/apache/el/ jasper-el/src/main/java/org/apache/el
#jasper-jdt appears to be a shade
#juli
+echo ">>>>>>>>>>>>>>>>>>Build juli project code"
+mkdir -p juli/src/main/java/org/apache
$SVN_CMD $TOMCAT/java/org/apache/juli/ juli/src/main/java/org/apache/juli
#shared
+echo ">>>>>>>>>>>>>>>>>>Build shared project code"
if [ -d .svn ]
then
$SVN_CMD $TOMCAT/java/org/apache/AnnotationProcessor.java shared/src/main/java/org/apache
@@ -88,9 +101,13 @@ else
fi
#tribes
+echo ">>>>>>>>>>>>>>>>>>Build tribes project code"
+mkdir -p tribes/src/main/java/org/apache/catalina
$SVN_CMD $TOMCAT/java/org/apache/catalina/tribes/ tribes/src/main/java/org/apache/catalina/tribes
#util
+echo ">>>>>>>>>>>>>>>>>>Build util project code"
+mkdir -p util/src/main/java/org/apache/tomcat
$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