Update to JBoss AS 7

jboss-eap · Jun 14, 2011 · 8333874 · 8333874
1 parent dbb607d
commit 8333874
Show file tree

Hide file tree

Showing 33 changed files with 411 additions and 910 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+.classpath
+.project
+target
+.settings
+.DS_Store
+.faces-config.xml.jsfdia
+MANIFEST.MF
diff --git a/archetype-pom.xml b/archetype-pom.xml
@@ -4,46 +4,36 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.jboss.weld</groupId>
-        <artifactId>weld-parent</artifactId>
-        <version>17</version>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-parent</artifactId>
+        <version>6-beta-2</version>
     </parent>
 
-    <groupId>org.jboss.weld.archetypes</groupId>
+    <groupId>org.jboss.spec.archetypes</groupId>
     <artifactId>jboss-javaee6-webapp</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <packaging>maven-archetype</packaging>
 
-    <name>JBoss Java EE 6 Webapp</name>
+    <name>JBoss AS 7 / Java EE 6 Webapp</name>
 
-    <description>An archetype that generates a starter Java EE 6 webapp project</description>
+    <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7</description>
 
-    <url>http://tinyurl.com/gojavaee</url>
+    <url>http://jboss.org/jbossas</url>
 
     <developers>
         <developer>
             <name>Steven Boscarine</name>
-            <roles>
-                <role>Weld archetypes co-lead</role>
-            </roles>
             <email>[email protected]</email>
-            <organization>Community Volunteer</organization>
         </developer>
         <developer>
             <name>Dan Allen</name>
-            <roles>
-                <role>Weld archetypes co-lead</role>
-            </roles>
             <email>[email protected]</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>[email protected]</email>
             <organization>Red Hat Inc.</organization>
             <organizationUrl>http://redhat.com/jboss</organizationUrl>
@@ -58,10 +48,10 @@
             <url>http://repository.jboss.org/nexus/content/groups/public</url>
             <!-- These optional flags are designed to speed up your builds by reducing remote server calls -->
             <releases>
-                <updatePolicy>never</updatePolicy>
+                <enabled>true</enabled>
             </releases>
             <snapshots>
-                <updatePolicy>daily</updatePolicy>
+                <enabled>false</enabled>
             </snapshots>
         </repository>
     </repositories>
@@ -82,35 +72,8 @@
                     <version>2.0-alpha-5</version>
                     <extensions>true</extensions>
                 </plugin>
-                <!-- Uncomment to deploy to central -->
-                <!--
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-maven-plugin</artifactId>
-                    <configuration>
-                        <nexusUrl>https://oss.sonatype.org</nexusUrl>
-                        <serverAuthId>central-releases-repository</serverAuthId>
-                    </configuration>
-                </plugin>
-                -->
             </plugins>
         </pluginManagement>
     </build>
 
-    <scm>
-        <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</connection>
-        <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/javaee6-webapp/trunk</developerConnection>
-        <url>http://fisheye.jboss.org/browse/weld/archetypes/javaee6-webapp/trunk</url>
-    </scm>
-
-    <!-- Uncomment to deploy to central -->
-    <!--
-    <distributionManagement>
-        <repository>
-            <id>central-releases-repository</id>
-            <name>Sonatype Nexus Maven Repository</name> 
-            <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-        </repository>
-    </distributionManagement>
-    -->
 </project>
diff --git a/archetype.properties b/archetype.properties
@@ -1,6 +1,6 @@
-archetype.groupId=org.jboss.weld.archetypes
+archetype.groupId=org.jboss.spec.archetypes
 archetype.artifactId=jboss-javaee6-webapp
-archetype.version=1.0.1-SNAPSHOT
+archetype.version=7.0.0-SNAPSHOT
 # Java package of the source files; will be replaced with the ${package} expression
 archetype.package=com.mycompany
 archetype.languages=java

diff --git a/create-archetype.sh b/create-archetype.sh
@@ -13,10 +13,10 @@ ARCHETYPE_DIR=target/archetype
 ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
 
 echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
-if [ ! -z `which txt2html` ]; then
-    txt2html -pb 1 -p 2 readme.txt > readme.html
+if [ ! -z `which markdown` ]; then
+    markdown readme.md -f readme.html
 else
-    echo txt2html cannot be found, skipping generation of readme.html
+    echo markdown cannot be found, skipping generation of readme.html
 fi
 mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
 echo Relocating generated archetype project to $ARCHETYPE_DIR...
@@ -26,7 +26,7 @@ mvn -f $ARCHETYPE_DIR/pom.xml clean
 echo Patching generated archetype...
 # could also use col -b
 sed -i 's;;;' $ARCHETYPE_RESOURCES_DIR/pom.xml
-sed -i 's;;;' $ARCHETYPE_RESOURCES_DIR/readme.txt
+sed -i 's;;;' $ARCHETYPE_RESOURCES_DIR/readme.md
 sed -i 's;<name>jboss-javaee6-webapp-src</name>;<name>${name}</name>;' $ARCHETYPE_RESOURCES_DIR/pom.xml
 sed -i 's;eclipse-dot-files/\?;;' $ARCHETYPE_DIR/src/main/resources/META-INF/maven/archetype-metadata.xml
 #sed -i 's;\(<jndi-name>\)[^<]\+\(</jndi-name>\);\1jdbc/${artifactId}\2;' $ARCHETYPE_RESOURCES_DIR/src/main/resources-jbossas/default-ds.xml
@@ -49,6 +49,6 @@ if [ ! -z $1 ] && [ "$1" = "generate" ]; then
     echo Generating project from archetype...
     cd target
     mvn archetype:generate -B -DarchetypeCatalog=local \
-        -DarchetypeArtifactId=jboss-javaee6-webapp -DarchetypeGroupId=org.jboss.weld.archetypes -DarchetypeVersion=1.0.1-SNAPSHOT \
+        -DarchetypeArtifactId=jboss-javaee6-webapp -DarchetypeGroupId=org.jboss.spec.archetypes -DarchetypeVersion=7.0.0-SNAPSHOT \
         -DartifactId=example-project -DgroupId=com.acme -Dpackage=com.acme.example -Dversion=1.0.0-SNAPSHOT -Dname="Java EE 6 webapp project"
 fi