geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r783460 - in /geronimo/sandbox/djencks/tomcat-archetype/trunk: fixup.sh mydos2unix.sh run.sh svn-actions.sh
Date Wed, 10 Jun 2009 19:26:29 GMT
Author: djencks
Date: Wed Jun 10 19:26:28 2009
New Revision: 783460

URL: http://svn.apache.org/viewvc?rev=783460&view=rev
Log:
now works to produce project in svn tree

Added:
    geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh   (with props)
    geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh   (with props)
    geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh   (with props)
Modified:
    geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh

Added: geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh?rev=783460&view=auto
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh (added)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh Wed Jun 10 19:26:28 2009
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+
+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

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/fixup.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Added: geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh?rev=783460&view=auto
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh (added)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh Wed Jun 10 19:26:28 2009
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo processing $1
+tr -d \\r <$1 > $1bak
+mv $1bak $1
+echo processed $1
\ No newline at end of file

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/mydos2unix.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Added: geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh?rev=783460&view=auto
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh (added)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh Wed Jun 10 19:26:28 2009
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# 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/
+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\
+ -Dpackage=org.apache
+
+mv tomcat-parent tomcat-parent-6.0.18
+
+cd tomcat-parent-6.0.18
+chmod u+x fixup.sh
+./fixup.sh
+cd ..
+svn add tomcat-parent-6.0.18
+cd tomcat-parent-6.0.18
+
+svn status
+
+#cd tomcat-parent-6.0.18
+./svn-actions.sh
+
+mvn clean install
+

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/run.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh?rev=783460&r1=783459&r2=783460&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh Wed Jun 10 19:26:28 2009
@@ -3,7 +3,7 @@
 # Script to copy the tomcat source to the appropriate places in the mavenized project
 if [ -d .svn ]
 then
-  SVN_CMD="svn co"
+  SVN_CMD="svn cp"
   RM="svn rm"
 else
   SVN_CMD="svn export"
@@ -17,8 +17,8 @@
 TOMCAT=$TOMCAT_BASE/$TOMCAT_VERSION
 
 #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
+$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
@@ -29,39 +29,45 @@
 $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
+$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
+$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
+#$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
+$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
+$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
+$SVN_CMD $TOMCAT/java/org/apache/juli/ juli/src/main/java/org/apache/juli
 
 
 
 #shared
-$SVN_CMD -N $TOMCAT/java/org/apache/ shared/src/main/java/org/apache/
+if [ -d .svn ]
+then
+  $SVN_CMD $TOMCAT/java/org/apache/AnnotationProcessor.java shared/src/main/java/org/apache
+  $SVN_CMD $TOMCAT/java/org/apache/PeriodicEventListener.java shared/src/main/java/org/apache
+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
+$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
+$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



Mime
View raw message