1:41 a.m.
Author: ilya_shaikovsky
Date: 2010-09-14 02:41:29 -0400 (Tue, 14 Sep 2010)
New Revision: 19184
Modified:
sandbox/trunk/archetypes/rf-gae-sample/
sandbox/trunk/archetypes/rf-gae-sample/pom.xml
sandbox/trunk/archetypes/rf-gae-sample/readme.txt
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
Log:
https://jira.jboss.org/browse/RF-9344
Property changes on: sandbox/trunk/archetypes/rf-gae-sample
___________________________________________________________________
Name: svn:ignore
+ target
Modified: sandbox/trunk/archetypes/rf-gae-sample/pom.xml
===================================================================
--- sandbox/trunk/archetypes/rf-gae-sample/pom.xml 2010-09-14 06:27:07 UTC (rev 19183)
+++ sandbox/trunk/archetypes/rf-gae-sample/pom.xml 2010-09-14 06:41:29 UTC (rev 19184)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.archetypes</groupId>
- <artifactId>richfaces-archetype-gae-sample</artifactId>
+ <artifactId>richfaces-archetype-gae</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>RichFaces Archetypes: GAE Application</name>
@@ -76,7 +76,7 @@
</build>
</profile>
</profiles>
-
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch...
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
Modified: sandbox/trunk/archetypes/rf-gae-sample/readme.txt
===================================================================
--- sandbox/trunk/archetypes/rf-gae-sample/readme.txt 2010-09-14 06:27:07 UTC (rev 19183)
+++ sandbox/trunk/archetypes/rf-gae-sample/readme.txt 2010-09-14 06:41:29 UTC (rev 19184)
@@ -10,8 +10,8 @@
1) To generate a project from the archetype, run
- mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes
-DarchetypeArtifactId=richfaces-archetype-gae-sample
- -DarchetypeVersion=<version> -DgroupId=<yourGroupId>
-DartifactId=<yourArtifactId> -Dversion=1.0-SNAPSHOT
+ mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes
-DarchetypeArtifactId=richfaces-archetype-gae -DarchetypeVersion=<version>
+ -DgroupId=<yourGroupId> -DartifactId=<yourArtifactId>
-Dversion=1.0-SNAPSHOT
2) To build the project for deploy to GAE cloud, run
mvn clean install -Pgae
Modified:
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml
===================================================================
---
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-09-14
06:27:07 UTC (rev 19183)
+++
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-09-14
06:41:29 UTC (rev 19184)
@@ -5,7 +5,7 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
- <name>RichFaces 4 Application</name>
+ <name>${artifactId}</name>
<version>${version}</version>
<packaging>war</packaging>
@@ -30,9 +30,28 @@
</properties>
<build>
- <finalName>rf-gae-sample</finalName>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/java-gae-jsf-ri</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
@@ -44,12 +63,68 @@
<configuration>
<webResources>
<resource>
+ <directory>src/main/webapp-gae</directory>
+ </resource>
+ <resource>
+ <directory>src/main/webapp</directory>
+ </resource>
+ <resource>
+
<directory>${project.build.directory}/generated-resources</directory>
+ <targetPath>static-resources</targetPath>
+ </resource>
+ <resource>
<directory>${basedir}/src/main/java</directory>
<targetPath>/WEB-INF/src</targetPath>
</resource>
</webResources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${org.richfaces.bom.version}</version>
+ <configuration></configuration>
+ <executions>
+ <execution>
+ <id>process</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <outputDir>generated-resources</outputDir>
+ <skins>
+ <skin>blueSky</skin>
+ <skin>classic</skin>
+ <skin>deepMarine</skin>
+ <skin>emeraldTown</skin>
+ <skin>japanCherry</skin>
+ <skin>ruby</skin>
+ <skin>wine</skin>
+ </skins>
+ <includedContentTypes>
+ <include>application/javascript</include>
+ <include>text/css</include>
+ <include>image/.+</include>
+ </includedContentTypes>
+ <fileNameMappings>
+ <property>
+
<name>^\Qorg.richfaces.renderkit.html\E</name>
+ <value>org.richfaces/images</value>
+ </property>
+ <property>
+
<name>^\Qorg.richfaces.renderkit.html.images\E</name>
+ <value>org.richfaces/images</value>
+ </property>
+ <property>
+ <name>^css/</name>
+ <value>org.richfaces/css/</value>
+ </property>
+ </fileNameMappings>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -118,138 +193,6 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
- <id>gae</id>
- <dependencies>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>src/main/java-gae-jsf-ri</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
-
<directory>src/main/webapp-gae</directory>
- </resource>
- <resource>
- <directory>src/main/webapp</directory>
- </resource>
- <resource>
-
<directory>${project.build.directory}/generated-resources</directory>
-
<targetPath>static-resources</targetPath>
- </resource>
- <resource>
-
<directory>${basedir}/src/main/java</directory>
- <targetPath>/WEB-INF/src</targetPath>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${org.richfaces.bom.version}</version>
- <configuration></configuration>
- <executions>
- <execution>
- <id>process</id>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
-
<outputDir>generated-resources</outputDir>
- <skins>
- <skin>blueSky</skin>
- <skin>classic</skin>
- <skin>deepMarine</skin>
- <skin>emeraldTown</skin>
- <skin>japanCherry</skin>
- <skin>ruby</skin>
- <skin>wine</skin>
- </skins>
- <includedContentTypes>
-
<include>application/javascript</include>
- <include>text/css</include>
- <include>image/.+</include>
- </includedContentTypes>
- <fileNameMappings>
- <property>
-
<name>^\Qorg.richfaces.renderkit.html\E</name>
-
<value>org.richfaces/images</value>
- </property>
- <property>
-
<name>^\Qorg.richfaces.renderkit.html.images\E</name>
-
<value>org.richfaces/images</value>
- </property>
- <property>
- <name>^css/</name>
-
<value>org.richfaces/css/</value>
- </property>
- </fileNameMappings>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
@@ -290,11 +233,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
@@ -308,9 +246,9 @@
<artifactId>ehcache</artifactId>
</dependency>
- <!--
- simple logger binding: only messages of level INFO and
- higher are printed
+ <!--
+ simple logger binding: only messages of level INFO and
+ higher are printed
-->
<dependency>
<groupId>org.slf4j</groupId>
@@ -333,5 +271,42 @@
<classifier>jdk15</classifier>
<scope>test</scope>
</dependency>
+ <!-- GAE PROFILE DEPENDENCIES -->
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</project>
Modified:
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt
===================================================================
---
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2010-09-14
06:27:07 UTC (rev 19183)
+++
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2010-09-14
06:41:29 UTC (rev 19184)
@@ -1,12 +1,12 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-Project generated with richfaces-archetype-simpleapp
+Project generated with richfaces-archetype-gae
-To build this project for Tomcat 6 run
+1.1) To build this project for GAE deploy
- mvn clean package
+ mvn clean install
+1.2) to deploy application to GAE use appcfg from GAE SDK. follow instructions from
appspot.com
-If you wan to create a binaries for both Tomcat 6 and JBoss 6 run
- mvn clean package -P release
\ No newline at end of file
+2) If you wan to create a binaries for Tomcat 6 and JBoss 6 run
+
+ mvn clean package -P release
+
Modified:
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
===================================================================
---
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-09-14
06:27:07 UTC (rev 19183)
+++
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-09-14
06:41:29 UTC (rev 19184)
@@ -4,7 +4,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <display-name>Sample RichFaces 4 Application</display-name>
+ <display-name>RichFaces 4 GAE Application</display-name>
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
Modified:
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
===================================================================
---
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2010-09-14
06:27:07 UTC (rev 19183)
+++
sandbox/trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2010-09-14
06:41:29 UTC (rev 19184)
@@ -8,7 +8,7 @@
<body>
<ui:composition template="/templates/template.xhtml">
- <ui:define name="title">RichFaces Sample</ui:define>
+ <ui:define name="title">RichFaces GAE Sample</ui:define>
<ui:define name="body">
<h:form prependId="false">