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

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-06-20 01:11:53 -0400 (Sun, 20 Jun 2010)
New Revision: 6559

Modified:
   archetypes/branches/prototype/build.sh
   archetypes/branches/prototype/pom.xml
   archetypes/branches/prototype/readme.txt
Log:
cleanups


Modified: archetypes/branches/prototype/build.sh
===================================================================
--- archetypes/branches/prototype/build.sh	2010-06-19 18:05:06 UTC (rev 6558)
+++ archetypes/branches/prototype/build.sh	2010-06-20 05:11:53 UTC (rev 6559)
@@ -6,17 +6,15 @@
 
 echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
 rm -Rf $ARCHETYPE_DIR/target
-svn rm --force $ARCHETYPE_DIR/src
+svn rm --force $ARCHETYPE_DIR/*
 rm -Rf target/generated-*
 mvn archetype:create-from-project -Darchetype.properties=archetype.properties
 echo Relocating generated archetype project to $ARCHETYPE_DIR...
 rsync -az --exclude `basename $0` --exclude archetype-pom.xml $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
-svn revert -R $ARCHETYPE_DIR/src
+svn revert -R $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

Modified: archetypes/branches/prototype/pom.xml
===================================================================
--- archetypes/branches/prototype/pom.xml	2010-06-19 18:05:06 UTC (rev 6558)
+++ archetypes/branches/prototype/pom.xml	2010-06-20 05:11:53 UTC (rev 6559)
@@ -4,12 +4,12 @@
    <modelVersion>4.0.0</modelVersion>
 
    <groupId>org.jboss.weld.archetypes</groupId>
-   <artifactId>weld-basic-javaee6-webapp-src</artifactId>
+   <artifactId>jboss-javaee6-webapp-src</artifactId>
    <version>1.0.0-SNAPSHOT</version>
    <packaging>war</packaging>
 
-   <name>weld-basic-javaee6-webapp-src</name>
-   <description>A basic Java EE 6 webapp project generated from the weld-basic-javaee6-webapp archetype</description>
+   <name>jboss-javaee6-webapp-src</name>
+   <description>A basic Java EE 6 webapp project generated from the jboss-javaee6-webapp archetype</description>
 
    <properties>
       <!--
@@ -29,9 +29,7 @@
       <jboss.home>${env.JBOSS_HOME}</jboss.home>
       <jboss.domain>default</jboss.domain>
       <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
-      <embedded-glassfish.version>3.0.1-b19</embedded-glassfish.version>
       <jboss-javaee6-spec.version>1.0.0.Beta5</jboss-javaee6-spec.version>
-      <jboss-as-client.version>6.0.0.20100429-M3</jboss-as-client.version>
    </properties>
 
    <repositories>
@@ -233,7 +231,7 @@
             <dependency>
                <groupId>org.jboss.jbossas</groupId>
                <artifactId>jboss-as-client</artifactId>
-               <version>${jboss-as-client.version}</version>
+               <version>6.0.0.20100429-M3</version>
                <type>pom</type>
                <scope>test</scope>
             </dependency>

Modified: archetypes/branches/prototype/readme.txt
===================================================================
--- archetypes/branches/prototype/readme.txt	2010-06-19 18:05:06 UTC (rev 6558)
+++ archetypes/branches/prototype/readme.txt	2010-06-20 05:11:53 UTC (rev 6559)
@@ -1,7 +1,7 @@
 
-                                 weld-basic-javaee6-webapp-src
+                                 jboss-javaee6-webapp-src
 
- Source archetype: weld-basic-javaee6-webapp
+ Source archetype: jboss-javaee6-webapp
 
  What is it?
  ===========
@@ -61,7 +61,7 @@
 
   mvn package jboss:hard-deploy
 
- This will deploy two artifacts, target/weld-basic-javaee6-webapp-src.war and
+ This will deploy two artifacts, target/jboss-javaee6-webapp-src.war and
  default-ds.xml. The latter installs a data source named jdbc/__default.
 
  You can also set jboss.home on the commandline:
@@ -70,7 +70,7 @@
 
  Start JBoss AS. The application will be running at the following URL:
 
-  http://localhost:8080/weld-basic-javaee6-webapp-src/home.jsf
+  http://localhost:8080/jboss-javaee6-webapp-src/home.jsf
 
  Note: If you are using JBoss AS 6.0.0.M3, you may encounter the exception
  described in https://jira.jboss.org/browse/WELD-448 if you attempt to access
@@ -95,15 +95,11 @@
   asadmin start-database
   asadmin start-domain domain1
 
- Now you can either deploy the target/weld-basic-javaee6-webapp-src.war through the web-based
+ Now you can either deploy the target/jboss-javaee6-webapp-src.war through the web-based
  GlassFish admininstration console, or you can again use asadmin:
 
-  asadmin /path/to/project/target/weld-basic-javaee6-webapp-src.war
+  asadmin /path/to/project/target/jboss-javaee6-webapp-src.war
 
- Unfortunately, the embedded GlassFish V3 application server does not bootstrap
- the persistence unit(s), so you won't be able to leverage the Maven plugin to
- run the application in place (like you can in a jee-minimal project).
-
  Importing the project into an IDE
  =================================
 
@@ -125,7 +121,7 @@
  your project directory. m2eclipse should take it from there.
 
  Once in the IDE, you can execute the Maven commands through the IDE controls
- to run the application on an embedded Servlet Container.
+ to deploy the application to a container.
 
  Downloading the sources and Javadocs
  ====================================