Permalink
Browse files

Bring blank archetype naming in line

  • Loading branch information...
1 parent 40d48e8 commit d24ef10f98f4c75b3407bf1c824e8750f96392a7 @pmuir pmuir committed Dec 7, 2011
Showing with 9 additions and 9 deletions.
  1. +6 −6 generate-blank.sh
  2. +1 −1 {jboss-javaee6-webapp-archetype-blank → jboss-javaee6-webapp-blank-archetype}/pom.xml
  3. 0 {jboss-javaee6-webapp-archetype-blank → jboss-javaee6-webapp-blank-archetype}/release-procedure.txt
  4. 0 ... → jboss-javaee6-webapp-blank-archetype}/src/main/resources/META-INF/maven/archetype-metadata.xml
  5. 0 ...blank → jboss-javaee6-webapp-blank-archetype}/src/main/resources/archetype-resources/.factorypath
  6. 0 ...e-blank → jboss-javaee6-webapp-blank-archetype}/src/main/resources/archetype-resources/.gitignore
  7. 0 ...type-blank → jboss-javaee6-webapp-blank-archetype}/src/main/resources/archetype-resources/pom.xml
  8. 0 ...pe-blank → jboss-javaee6-webapp-blank-archetype}/src/main/resources/archetype-resources/readme.md
  9. 0 ...rchetype}/src/main/resources/archetype-resources/src/main/java/controller/MemberRegistration.java
  10. 0 ...lank-archetype}/src/main/resources/archetype-resources/src/main/java/data/MemberListProducer.java
  11. 0 ...e6-webapp-blank-archetype}/src/main/resources/archetype-resources/src/main/java/model/Member.java
  12. 0 ...pp-blank-archetype}/src/main/resources/archetype-resources/src/main/java/rest/JaxRsActivator.java
  13. 0 ...chetype}/src/main/resources/archetype-resources/src/main/java/rest/MemberResourceRESTService.java
  14. 0 ...-webapp-blank-archetype}/src/main/resources/archetype-resources/src/main/java/util/Resources.java
  15. 0 ...ank-archetype/src/main/resources/archetype-resources}/src/main/resources/META-INF/persistence.xml
  16. 0 ...aee6-webapp-blank-archetype}/src/main/resources/archetype-resources/src/main/resources/import.sql
  17. 0 ...-webapp-blank-archetype/src/main/resources/archetype-resources}/src/main/webapp/WEB-INF/beans.xml
  18. 0 ...-blank-archetype/src/main/resources/archetype-resources}/src/main/webapp/WEB-INF/faces-config.xml
  19. 0 ...archetype/src/main/resources/archetype-resources}/src/main/webapp/WEB-INF/templates/default.xhtml
  20. 0 ...javaee6-webapp-blank-archetype}/src/main/resources/archetype-resources/src/main/webapp/index.html
  21. 0 ...avaee6-webapp-blank-archetype}/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
  22. 0 ...-blank-archetype/src/main/resources/archetype-resources}/src/main/webapp/resources/css/screen.css
  23. BIN ...-blank-archetype/src/main/resources/archetype-resources}/src/main/webapp/resources/gfx/banner.png
  24. BIN ...pp-blank-archetype/src/main/resources/archetype-resources}/src/main/webapp/resources/gfx/logo.png
  25. 0 ...-archetype}/src/main/resources/archetype-resources/src/test/java/test/MemberRegistrationTest.java
  26. 0 ...-webapp-blank-archetype/src/main/resources/archetype-resources}/src/test/resources/arquillian.xml
  27. 0 ...nk → jboss-javaee6-webapp-blank-archetype}/src/test/resources/projects/basic/archetype.properties
  28. 0 ...rchetype-blank → jboss-javaee6-webapp-blank-archetype}/src/test/resources/projects/basic/goal.txt
  29. 0 {jboss-javaee6-webapp-ear-archetype-blank → jboss-javaee6-webapp-ear-blank-archetype}/.gitignore
  30. 0 ...ss-javaee6-webapp-ear-archetype-blank → jboss-javaee6-webapp-ear-blank-archetype}/build-readme.sh
  31. +1 −1 {jboss-javaee6-webapp-ear-archetype-blank → jboss-javaee6-webapp-ear-blank-archetype}/pom.xml
  32. 0 ...aee6-webapp-ear-archetype-blank → jboss-javaee6-webapp-ear-blank-archetype}/release-procedure.txt
  33. 0 ...boss-javaee6-webapp-ear-blank-archetype}/src/main/resources/META-INF/maven/archetype-metadata.xml
  34. 0 ...ank → jboss-javaee6-webapp-ear-blank-archetype}/src/main/resources/archetype-resources/.gitignore
  35. 0 ...lank → jboss-javaee6-webapp-ear-blank-archetype}/src/main/resources/archetype-resources/README.md
  36. 0 ...webapp-ear-blank-archetype}/src/main/resources/archetype-resources/__rootArtifactId__-ear/pom.xml
  37. 0 ...webapp-ear-blank-archetype}/src/main/resources/archetype-resources/__rootArtifactId__-ejb/pom.xml
  38. 0 ...urces/archetype-resources/__rootArtifactId__-ejb/src/main/java/controller/MemberRegistration.java
  39. 0 ...n/resources/archetype-resources/__rootArtifactId__-ejb/src/main/java/data/MemberListProducer.java
  40. 0 ...pe}/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/java/model/Member.java
  41. 0 ...}/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/java/util/Resources.java
  42. 0 ...c/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/resources/META-INF/beans.xml
  43. 0 ...resources/archetype-resources/__rootArtifactId__-ejb}/src/main/resources/META-INF/persistence.xml
  44. 0 ...type}/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/resources/import.sql
  45. 0 ...sources/archetype-resources/__rootArtifactId__-ejb/src/test/java/test/MemberRegistrationTest.java
  46. 0 .../src/main/resources/archetype-resources/__rootArtifactId__-ejb}/src/test/resources/arquillian.xml
  47. 0 ...webapp-ear-blank-archetype}/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
  48. 0 .../main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/rest/JaxRsActivator.java
  49. 0 ...rces/archetype-resources/__rootArtifactId__-web/src/main/java/rest/MemberResourceRESTService.java
  50. 0 .../src/main/resources/archetype-resources/__rootArtifactId__-web}/src/main/webapp/WEB-INF/beans.xml
  51. 0 ...in/resources/archetype-resources/__rootArtifactId__-web}/src/main/webapp/WEB-INF/faces-config.xml
  52. 0 ...urces/archetype-resources/__rootArtifactId__-web}/src/main/webapp/WEB-INF/templates/default.xhtml
  53. 0 ...chetype}/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/index.html
  54. 0 ...hetype}/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/index.xhtml
  55. 0 ...in/resources/archetype-resources/__rootArtifactId__-web}/src/main/webapp/resources/css/screen.css
  56. BIN ...in/resources/archetype-resources/__rootArtifactId__-web}/src/main/webapp/resources/gfx/banner.png
  57. BIN ...main/resources/archetype-resources/__rootArtifactId__-web}/src/main/webapp/resources/gfx/logo.png
  58. 0 ...-blank → jboss-javaee6-webapp-ear-blank-archetype}/src/main/resources/archetype-resources/pom.xml
  59. 0 ... jboss-javaee6-webapp-ear-blank-archetype}/src/test/resources/projects/multi/archetype.properties
  60. 0 ...type-blank → jboss-javaee6-webapp-ear-blank-archetype}/src/test/resources/projects/multi/goal.txt
  61. +1 −1 release-utils.sh
View
@@ -45,21 +45,21 @@ EOF
clean()
{
- echo "**** Cleaning $DIR/*-blank"
- rm -rf $DIR/*-blank
+ echo "**** Cleaning $DIR/*-blank-archetype"
+ rm -rf $DIR/*-blank-archetype
}
blank()
{
ARCHETYPE_NAME=$1
+ ARCHETYPE_BLANK_NAME=${ARCHETYPE_NAME//archetype/blank-archetype}
ARCHETYPE_DIR=${DIR}/${ARCHETYPE_NAME}
- ARCHETYPE_TMP_DIR="${DIR}/${ARCHETYPE_NAME}-blank"
- ARCHETYPE_TMP_NAME="${ARCHETYPE_NAME}-blank"
+ ARCHETYPE_TMP_DIR="${DIR}/${ARCHETYPE_BLANK_NAME}"
cat << EOF
**** Generating blank version of ${ARCHETYPE_NAME} into ${ARCHETYPE_TMP_DIR}
-**** Blank artifactId is ${ARCHETYPE_TMP_NAME}
+**** Blank artifactId is ${ARCHETYPE_BLANK_NAME}
EOF
@@ -71,7 +71,7 @@ EOF
mv src/main/resources/META-INF/maven/archetype-metadata-blank.xml src/main/resources/META-INF/maven/archetype-metadata.xml
- perl -pi -e "s/${ARCHETYPE_NAME}/${ARCHETYPE_TMP_NAME}/g" `find . -name pom.xml`
+ perl -pi -e "s/${ARCHETYPE_NAME}/${ARCHETYPE_BLANK_NAME}/g" `find . -name pom.xml`
}
@@ -10,7 +10,7 @@
</parent>
<groupId>org.jboss.spec.archetypes</groupId>
- <artifactId>jboss-javaee6-webapp-archetype-blank</artifactId>
+ <artifactId>jboss-javaee6-webapp-blank-archetype</artifactId>
<version>7.0.2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
@@ -18,7 +18,7 @@
</parent>
<groupId>org.jboss.spec.archetypes</groupId>
- <artifactId>jboss-javaee6-webapp-ear-archetype-blank</artifactId>
+ <artifactId>jboss-javaee6-webapp-ear-blank-archetype</artifactId>
<version>7.0.2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
View
@@ -6,7 +6,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
# DEFINE
-ARCHETYPES="jboss-javaee6-webapp-archetype jboss-javaee6-webapp-archetype-blank jboss-javaee6-webapp-ear-archetype jboss-javaee6-webapp-ear-archetype-blank jboss-html5-mobile-archetype"
+ARCHETYPES="jboss-javaee6-webapp-archetype jboss-javaee6-webapp-blank-archetype jboss-javaee6-webapp-ear-archetype jboss-javaee6-webapp-ear-blank-archetype jboss-html5-mobile-archetype"
SNAPSHOT_REPO_URL="https://repository.jboss.org/nexus/content/repositories/snapshots/"
SNAPSHOT_REPO_ID="jboss-snapshots-repository"

0 comments on commit d24ef10

Please sign in to comment.