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

Sat Jun 19 02:34:27 EDT 2010

Author: dan.j.allen
Date: 2010-06-19 02:34:26 -0400 (Sat, 19 Jun 2010)
New Revision: 6528

Added:
   archetypes/branches/prototype/archetype-pom.xml
Modified:
   archetypes/branches/prototype/build.sh
Log:
use archetype-pom and cleanup logic


Added: archetypes/branches/prototype/archetype-pom.xml
===================================================================

--- archetypes/branches/prototype/archetype-pom.xml	                        (rev 0)
+++ archetypes/branches/prototype/archetype-pom.xml	2010-06-19 06:34:26 UTC (rev 6528)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jboss.weld</groupId>
+    <artifactId>weld-parent</artifactId>
+    <version>11</version>
+  </parent>
+
+  <groupId>org.jboss.weld.archetypes</groupId>
+  <artifactId>weld-basic-javaee6-webapp</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>maven-archetype</packaging>
+
+  <name>Weld Basic Java EE 6 Webapp</name>
+
+  <description>An archetype that generates a basic Java EE 6 webapp project</description>
+
+  <url>http://seamframework.org/Documentation/WeldQuickstartForMavenUsers</url>
+
+  <developers>
+    <developer>
+      <name>Steven Boscarine</name>
+      <roles>
+        <role>Weld archetypes lead</role>
+      </roles>
+      <email>steven.boscarine at childrens.harvard.edu</email>
+      <organization>Children's Hospital Boston: Informatics Program</organization>
+      <organizationUrl>http://chip.org/</organizationUrl>
+      <url>http://info.rmatics.org/</url>
+    </developer>
+    <developer>
+      <name>Dan Allen</name>
+      <roles>
+        <role>Weld archetypes lead</role>
+      </roles>
+      <email>dan.j.allen at gmail.com</email>
+      <organization>JBoss, by Red Hat</organization>
+      <organizationUrl>http://redhat.com/jboss</organizationUrl>
+      <url>http://community.jboss.org/people/dan.j.allen</url>
+    </developer>
+    <developer>
+      <name>Pete Muir</name>
+      <roles>
+         <role>Weld project lead</role>
+      </roles>
+      <email>pete.muir at jboss.org</email>
+      <organization>Red Hat Inc.</organization>
+      <organizationUrl>http://redhat.com/jboss</organizationUrl>
+      <url>http://in.relation.to/Bloggers/Pete</url>
+    </developer>
+  </developers>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>2.0-alpha-5</version>
+      </extension>
+    </extensions>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>2.0-alpha-5</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <scm>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/branches/prototype/generated-archetype</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/branches/prototype/generated-archetype</developerConnection>
+    <url>http://fisheye.jboss.org/browse/weld/archetypes/branches/prototype/generated-archetype</url>
+  </scm>
+</project>

Modified: archetypes/branches/prototype/build.sh
===================================================================
--- archetypes/branches/prototype/build.sh	2010-06-19 06:33:58 UTC (rev 6527)
+++ archetypes/branches/prototype/build.sh	2010-06-19 06:34:26 UTC (rev 6528)
@@ -1,25 +1,26 @@
 #!/bin/sh
 
-ARCHETYPE_DIR=target/generated-sources/archetype
+ARCHETYPE_BUILD_DIR=target/generated-sources/archetype
+ARCHETYPE_DIR=generated-archetype
+ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
 
-echo Generating archetype from project into $ARCHETYPE_DIR...
-rm -Rf generated-archetype/src
+echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
+rm -Rf $ARCHETYPE_DIR/target
+svn rm $ARCHETYPE_DIR/src
 mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
-echo Relocating generated archetype project...
-mv $ARCHETYPE_DIR/src generated-archetype/
-mv -f $ARCHETYPE_DIR/pom.xml generated-archetype/
-ARCHETYPE_DIR=generated-archetype
-ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
-#mvn -f $ARCHETYPE_DIR/pom.xml clean
+echo Relocating generated archetype project to $ARCHETYPE_DIR...
+mv $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...
 rm -f $ARCHETYPE_RESOURCES_DIR/`basename $0`
+rm -f $ARCHETYPE_RESOURCES_DIR/archetype-pom.xml
 # could also use col -b
 sed -i 's;
 ;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-sed -i '/<parent>/,/^$/d' $ARCHETYPE_RESOURCES_DIR/pom.xml
 sed -i 's;
 ;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
-sed -i 's;<name>weld-basic-javaee6-webapp</name>;<name>Weld Basic Java EE 6 Webapp</name>;' $ARCHETYPE_DIR/pom.xml
+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...
@@ -34,3 +35,8 @@
       -DarchetypeArtifactId=weld-basic-javaee6-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.0-SNAPSHOT \
       -DartifactId=generated-project -DgroupId=com.acme -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 Webapp"
 fi
+
+#cd generated-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

