Author: dan.j.allen Date: 2009-12-24 03:15:27 -0500 (Thu, 24 Dec 2009) New Revision: 5365 Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/readme.txt archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/readme.txt Log: clean up embedded-glassfish plugin configuration and notes Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-23 22:49:35 UTC (rev 5364) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-24 08:15:27 UTC (rev 5365) @@ -19,6 +19,10 @@ --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- + Timestamp format for the maven.build.timestamp property; you can reference property in pom.xml or filtered resources (must enable third-party plugin if using Maven < 2.1) + --> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> + <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file --> @@ -38,6 +42,15 @@ </repository> </repositories> + <pluginRepositories> + <!-- GlassFish repository required for embedded-glassfish plugin --> + <pluginRepository> + <id>glassfish</id> + <name>GlassFish Maven 2 Repository</name> + <url>http://download.java.net/maven/glassfish</url> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> <!-- Import scope will provide versions for dependencies below. --> @@ -50,6 +63,7 @@ </dependency> </dependencies> </dependencyManagement> + <dependencies> <!-- CDI (JSR-299) --> <dependency> @@ -78,7 +92,7 @@ </dependency> <!-- Bean Validation Implementation --> <!-- Provides portable constraints such as @NotEmpty, @Email and @Url --> - <!-- Hibernate Validator is only the JSR-303 implementation at the moment, so we can assume it's provided --> + <!-- Hibernate Validator is the only JSR-303 implementation at the moment, so we can assume it's provided --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> @@ -121,11 +135,12 @@ </exclusion> </exclusions> </dependency> + </dependencies> <build> <finalName>${expr_start}artifactId${expr_end}</finalName> <plugins> - <!-- Compiler plugin enforces Java 1.6 compatiblity --> + <!-- Compiler plugin enforces Java 1.6 compatibility --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -160,6 +175,7 @@ </fileNames> </configuration> </plugin> + </plugins> </build> </project> Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/readme.txt =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/readme.txt 2009-12-23 22:49:35 UTC (rev 5364) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/readme.txt 2009-12-24 08:15:27 UTC (rev 5365) @@ -85,17 +85,10 @@ You can now deploy the target/${artifactId}.war archive and launch the application the through GlassFish administration console. - Alternatively, you can deploy the application without moving any files around - using the embedded GlassFish application server. + 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). - To run the application using embedded GlassFish, execute this command: - - mvn package embedded-glassfish:run - - The application will be running at the following URL: - - http://localhost:7070/${artifactId} - Importing the project into an IDE ================================= Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-23 22:49:35 UTC (rev 5364) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-24 08:15:27 UTC (rev 5365) @@ -1,5 +1,5 @@ ## Custom Velocity declaration to allow us to escape Maven variable placeholders -## Prevents archetype warnings about unrecognized variables. +## Prevents archetype warnings about unrecognized variables #set( $expr_start = '${' ) #set( $expr_end = '}' ) <?xml version="1.0" encoding="UTF-8"?> @@ -11,14 +11,21 @@ <packaging>war</packaging> <name>${artifactId}</name> <version>${version}</version> - + <properties> <!-- Explicitly declaring the source encoding eliminates the following message: [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file --> + <!-- + Timestamp format for the maven.build.timestamp property; you can reference property in pom.xml or filtered resources (must enable third-party plugin if using Maven < 2.1) + --> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> + <!-- + To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in + the Maven 2 settings.xml file + --> <jboss.home>${expr_start}env.JBOSS_HOME${expr_end}</jboss.home> <jboss.domain>default</jboss.domain> <!-- The version of Weld extensions in use --> @@ -142,7 +149,7 @@ --> </configuration> </plugin> - + <!-- Configure the JBoss AS Maven deploy plugin --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -155,6 +162,7 @@ </fileNames> </configuration> </plugin> + <!-- Configure the Embedded GlassFish Maven plugin --> <plugin> <groupId>org.glassfish</groupId> @@ -164,8 +172,26 @@ <app>${expr_start}project.build.directory${expr_end}/${expr_start}build.finalName${expr_end}.war</app> <port>7070</port> <containerType>web</containerType> + <instanceRoot>${expr_start}project.build.directory${expr_end}/gfembed${expr_start}maven.build.timestamp${expr_end}</instanceRoot> + <autoDelete>true</autoDelete> </configuration> </plugin> + + <!-- Uncomment if using Maven < 2.1 to set maven.build.timestamp property --> + <!-- + <plugin> + <groupId>com.keyboardsamurais.maven</groupId> + <artifactId>maven-timestamp-plugin</artifactId> + <version>1.0</version> + <configuration> + <propertyName>maven.build.timestamp</propertyName> + <timestampPattern>yyyyMMdd'T'HHmmss</timestampPattern> + </configuration> + <executions> + <execution><goals><goal>create</goal></goals></execution> + </executions> + </plugin> + --> </plugins> </build> </project> Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/readme.txt =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/readme.txt 2009-12-23 22:49:35 UTC (rev 5364) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/readme.txt 2009-12-24 08:15:27 UTC (rev 5365) @@ -43,6 +43,9 @@ http://localhost:7070/${artifactId} + To redeploy the application, hit ENTER in the same window. To shutdown + GlassFish, type the letter 'x' then hit ENTER. + To deploy the application to JBoss AS (standalone), first make sure that the JBOSS_HOME environment variable points to a JBoss AS 6.0 installation. Alternatively, you can set the location of JBoss AS using the following