- Revision
- 70
- Author
- mauro
- Date
- 2007-05-23 04:00:21 -0500 (Wed, 23 May 2007)
Log Message
Fixed jruby example deployment issues.
Modified Paths
- trunk/examples/jruby-example/pom.xml
- trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml
- trunk/pom.xml
Diff
Modified: trunk/examples/jruby-example/pom.xml (69 => 70)
--- trunk/examples/jruby-example/pom.xml 2007-05-23 03:58:29 UTC (rev 69) +++ trunk/examples/jruby-example/pom.xml 2007-05-23 09:00:21 UTC (rev 70) @@ -1,77 +1,77 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.codehaus.waffle</groupId> - <artifactId>waffle-parent</artifactId> - <version>1.0-SNAPSHOT</version> - </parent> - <artifactId>waffle-jruby-example</artifactId> - <packaging>war</packaging> - <name>Waffle JRuby Example</name> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.codehaus.waffle</groupId> + <artifactId>waffle-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>waffle-jruby-example</artifactId> + <packaging>war</packaging> + <name>Waffle JRuby Example</name> - <dependencies> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>waffle</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.jruby</groupId> - <artifactId>jruby</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>waffle</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.jruby</groupId> + <artifactId>jruby</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <warName>${pom.artifactId}</warName> - <webResources> - <resource> - <directory>${basedir}/resources</directory> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>deploy-webapp</id> - <phase>install</phase> - <configuration> - <tasks> - <echo>Deploying webapp</echo> - <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" - overwrite="true"/> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0</version> + <configuration> + <warName>${pom.artifactId}</warName> + <webResources> + <resource> + <directory>${basedir}/resources</directory> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>deploy-webapp</id> + <phase>install</phase> + <configuration> + <tasks> + <echo>Deploying webapp</echo> + <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>
Modified: trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml (69 => 70)
--- trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml 2007-05-23 03:58:29 UTC (rev 69) +++ trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml 2007-05-23 09:00:21 UTC (rev 70) @@ -47,8 +47,14 @@ <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> + <servlet-mapping> <servlet-name>waffle</servlet-name> <url-pattern>*.waffle</url-pattern> </servlet-mapping> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + </web-app>
Modified: trunk/pom.xml (69 => 70)
--- trunk/pom.xml 2007-05-23 03:58:29 UTC (rev 69) +++ trunk/pom.xml 2007-05-23 09:00:21 UTC (rev 70) @@ -15,7 +15,7 @@ <modules> <module>skin</module> <module>core</module> - <!--<module>extensions/webcontainer</module>--> + <module>extensions/webcontainer</module> </modules> <dependencyManagement> @@ -211,8 +211,9 @@ <id>examples</id> <modules> <module>examples/simple-example</module> + <module>examples/jruby-example</module> <module>examples/freemarker-example</module> - <module>examples/paranamer-example</module> + <!-- module>examples/paranamer-example</module--> <module>examples/migration-example</module> </modules> </profile>
To unsubscribe from this list please visit:
