geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1230664 - in /geronimo/external/branches/tomcat-archetype-7.0.x: mv-resource.sh svn-actions.sh
Date Thu, 12 Jan 2012 17:45:45 GMT
Author: xiaming
Date: Thu Jan 12 17:45:45 2012
New Revision: 1230664

URL: http://svn.apache.org/viewvc?rev=1230664&view=rev
Log:
GERONIMO-6262 Correct resource movement scripts, add special for 7.0.23 release

Modified:
    geronimo/external/branches/tomcat-archetype-7.0.x/mv-resource.sh
    geronimo/external/branches/tomcat-archetype-7.0.x/svn-actions.sh

Modified: geronimo/external/branches/tomcat-archetype-7.0.x/mv-resource.sh
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-7.0.x/mv-resource.sh?rev=1230664&r1=1230663&r2=1230664&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-7.0.x/mv-resource.sh (original)
+++ geronimo/external/branches/tomcat-archetype-7.0.x/mv-resource.sh Thu Jan 12 17:45:45 2012
@@ -23,5 +23,8 @@ TARGET=`echo $SRC | sed s/java/resources
 
 #svn mv --parents $SRC $TARGET
 # Do non-svn move
-mv $SRC $TARGET
+echo "Move $SRC -> $TARGET"
+TARGETDIR=`dirname $TARGET`
+mkdir -p $TARGETDIR
+mv $SRC $TARGETDIR/
 

Modified: geronimo/external/branches/tomcat-archetype-7.0.x/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/branches/tomcat-archetype-7.0.x/svn-actions.sh?rev=1230664&r1=1230663&r2=1230664&view=diff
==============================================================================
--- geronimo/external/branches/tomcat-archetype-7.0.x/svn-actions.sh (original)
+++ geronimo/external/branches/tomcat-archetype-7.0.x/svn-actions.sh Thu Jan 12 17:45:45 2012
@@ -89,7 +89,7 @@ $SVN_CMD $TOMCAT/java/org/apache/juli/ j
 
 #shared
 echo ">>>>>>>>>>>>>>>>>>Build shared
project code"
-mkdir -p shared/src/main/java/org
+mkdir -p shared/src/main/java/org/apache
 if [ -d .svn ]
 then
   $SVN_CMD $TOMCAT/java/org/apache/tomcat/InstanceManager.java shared/src/main/java/org/apache/tomcat/InstanceManager.java
@@ -97,7 +97,7 @@ then
   $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
+  $SVN_CMD -N $TOMCAT/java/org/apache/tomcat/ shared/src/main/java/org/apache/tomcat
 fi
 
 #tribes
@@ -111,6 +111,10 @@ mkdir -p util/src/main/java/org/apache/t
 $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 ClusterRuleSet.java to catalina module since 7.0.23 release, because org.apache.catalina.startup.Catalina.java
imports it
+mkdir -p catalina/src/main/java/org/apache/catalina/ha
+mv catalina-ha/src/main/java/org/apache/catalina/ha/ClusterRuleSet.java catalina/src/main/java/org/apache/catalina/ha
+
 # move the properties files to src/main/resourcs
 find . -name *.properties |xargs -n1 ./mv-resource.sh
 



Mime
View raw message