geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r784287 - in /geronimo/external/trunk/tomcat-archetype: build-archetype.sh build.sh fixup.sh mv-resource.sh pom.xml run.sh svn-actions.sh
Date Fri, 12 Jun 2009 21:56:50 GMT
Author: djencks
Date: Fri Jun 12 21:56:40 2009
New Revision: 784287

URL: http://svn.apache.org/viewvc?rev=784287&view=rev
Log:
GERONIMO-4685 get resources in right places, couple other tweaks

Added:
    geronimo/external/trunk/tomcat-archetype/build-archetype.sh   (props changed)
      - copied unchanged from r784225, geronimo/external/trunk/tomcat-archetype/build.sh
    geronimo/external/trunk/tomcat-archetype/mv-resource.sh   (with props)
Removed:
    geronimo/external/trunk/tomcat-archetype/build.sh
Modified:
    geronimo/external/trunk/tomcat-archetype/fixup.sh
    geronimo/external/trunk/tomcat-archetype/pom.xml
    geronimo/external/trunk/tomcat-archetype/run.sh
    geronimo/external/trunk/tomcat-archetype/svn-actions.sh

Propchange: geronimo/external/trunk/tomcat-archetype/build-archetype.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-archetype/build-archetype.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/external/trunk/tomcat-archetype/build-archetype.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Modified: geronimo/external/trunk/tomcat-archetype/fixup.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/fixup.sh?rev=784287&r1=784286&r2=784287&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/fixup.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/fixup.sh Fri Jun 12 21:56:40 2009
@@ -3,28 +3,10 @@
 
 chmod u+x mydos2unix.sh
 chmod u+x svn-actions.sh
+
 # fix line endings and add empty directories
 
 find . -name pom.xml |xargs -n1 ./mydos2unix.sh
 #sed -i bak 's/\\r//g'
 
-mkdir -p catalina/src/main/java/org/apache
-mkdir -p catalina/src/main/java/org/apache
-mkdir -p catalina/src/main/java/org/apache
-mkdir -p catalina/src/main/java/org/apache/tomcat
-mkdir -p catalina/src/main/java/org/apache
-mkdir -p catalina/src/main/java/org/apache/tomcat/util
-
-mkdir -p catalina-ha/src/main/java/org/apache/catalina
-
-mkdir -p jasper/src/main/java/org/apache
-
-mkdir -p jasper-el/src/main/java/org/apache
-
-mkdir -p juli/src/main/java/org/apache
-
 mkdir -p shared/src/main/java/org/apache/
-
-mkdir -p tribes/src/main/java/org/apache/catalina
-
-mkdir -p util/src/main/java/org/apache/tomcat

Added: geronimo/external/trunk/tomcat-archetype/mv-resource.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/mv-resource.sh?rev=784287&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/mv-resource.sh (added)
+++ geronimo/external/trunk/tomcat-archetype/mv-resource.sh Fri Jun 12 21:56:40 2009
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# 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-archetype/mv-resource.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-archetype/mv-resource.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/external/trunk/tomcat-archetype/mv-resource.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Modified: geronimo/external/trunk/tomcat-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/pom.xml?rev=784287&r1=784286&r2=784287&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/pom.xml Fri Jun 12 21:56:40 2009
@@ -38,9 +38,7 @@
     <description>Mavenized tomcat build</description>
 
     <!-- instructions:
-    mvn archetype:create-from-project
-    cd target/generated-sources/archetype/
-    mvn install
+    ./build-archetype.sh
 
     To use archetype, if installed only locally,
 mvn archetype:generate -DarchetypeCatalog=local

Modified: geronimo/external/trunk/tomcat-archetype/run.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/run.sh?rev=784287&r1=784286&r2=784287&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/run.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/run.sh Fri Jun 12 21:56:40 2009
@@ -2,32 +2,35 @@
 
 # Included as an example of how to set up a project.  Needs to be copied to location you
want to build the maven project.
 
-svn rm --force tomcat-parent-6.0.18
-rm -rf tomcat-parent-6.0.18/
+TVER=6.0.18
+GVER=${TVER}-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.test.tomcat\
- -DartifactId=tomcat-parent\
- -Dversion=1.0-SNAPSHOT\
+ -DgroupId=org.apache.geronimo.ext.tomcat\
+ -DartifactId=tomcat-parent-${TVER}\
+ -Dversion=${GVER}\
  -Dpackage=org.apache
 
-mv tomcat-parent tomcat-parent-6.0.18
+#mv tomcat-parent tomcat-parent-${TVER}
 
-cd tomcat-parent-6.0.18
+cd tomcat-parent-${TVER}
 chmod u+x fixup.sh
 ./fixup.sh
 cd ..
-svn add tomcat-parent-6.0.18
-cd tomcat-parent-6.0.18
+svn add tomcat-parent-${TVER}
+cd tomcat-parent-${TVER}
 
 svn status
 
-#cd tomcat-parent-6.0.18
 ./svn-actions.sh
+chmod u+x mv-resource.sh
 
 mvn clean install
 

Modified: geronimo/external/trunk/tomcat-archetype/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/svn-actions.sh?rev=784287&r1=784286&r2=784287&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/svn-actions.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/svn-actions.sh Fri Jun 12 21:56:40 2009
@@ -1,20 +1,26 @@
 #!/bin/sh
 
 # 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
-  SVN_CMD="svn cp"
+  #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_VERSION=TOMCAT_6_0_18
+TOMCAT_TAG=TOMCAT_6_0_18
 
 TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags"
 
-TOMCAT=$TOMCAT_BASE/$TOMCAT_VERSION
+TOMCAT=$TOMCAT_BASE/$TOMCAT_TAG
 
 #catalina
 $SVN_CMD $TOMCAT/java/org/apache/catalina/ catalina/src/main/java/org/apache/catalina
@@ -71,3 +77,6 @@
 #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



Mime
View raw message