[weld-commits] Weld SVN: r6541 - archetypes/branches/prototype.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-06-19 03:05:34 -0400 (Sat, 19 Jun 2010)
New Revision: 6541

Modified:
   archetypes/branches/prototype/build.sh
Log:
reorg


Modified: archetypes/branches/prototype/build.sh
===================================================================
--- archetypes/branches/prototype/build.sh	2010-06-19 07:05:15 UTC (rev 6540)
+++ archetypes/branches/prototype/build.sh	2010-06-19 07:05:34 UTC (rev 6541)
@@ -1,15 +1,16 @@
 #!/bin/sh
 
 ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
-ARCHETYPE_DIR=generated-archetype
+ARCHETYPE_DIR=target/archetype
 ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
 
 echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
 rm -Rf $ARCHETYPE_DIR/target
 svn rm --force $ARCHETYPE_DIR/src
-mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
+rm -Rf target/generated-*
+mvn archetype:create-from-project -Darchetype.properties=archetype.properties
 echo Relocating generated archetype project to $ARCHETYPE_DIR...
-rsync -az --exclude generated-archetype --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
+rsync -az --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
 cp -f archetype-pom.xml $ARCHETYPE_DIR/pom.xml
 mvn -f $ARCHETYPE_DIR/pom.xml clean
 echo Patching generated archetype...
@@ -20,7 +21,6 @@
 ;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
 sed -i 's;
 ;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
-sed -i '/<parent>/,/^$/d' $ARCHETYPE_RESOURCES_DIR/pom.xml
 sed -i 's;<name>weld-basic-javaee6-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
 if [ ! -z $1 ] && [ "$1" = "install" ]; then
    echo Installing archetype...
@@ -36,7 +36,7 @@
       -DartifactId=generated-project -DgroupId=com.acme -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 Webapp"
 fi
 
-#cd generated-archetype
+#cd target/archetype
 #mvn release:prepare --batch-mode -Drelease -DdevelopmentVersion=1.0.0-SNAPSHOT -DreleaseVersion=1.0.0.Beta2 -Dtag=basic-javaee6-webapp-1.0.0.Beta2 -DdryRun=true
 #mvn release:prepare --batch-mode -Drelease -DdevelopmentVersion=1.0.0-SNAPSHOT -DreleaseVersion=1.0.0.Beta2 -Dtag=basic-javaee6-webapp-1.0.0.Beta2 -Dresume=false
 #mvn release:perform nexus:staging-close -Drelease