Author: pete.muir(a)jboss.org Date: 2009-10-14 10:28:48 -0400 (Wed, 14 Oct 2009) New Revision: 4042 Modified: examples/trunk/wicket/numberguess/pom.xml examples/trunk/wicket/numberguess/readme.txt Log: ws, move jetty deps to jetty profile, create jboss profile Modified: examples/trunk/wicket/numberguess/pom.xml =================================================================== --- examples/trunk/wicket/numberguess/pom.xml 2009-10-14 14:27:19 UTC (rev 4041) +++ examples/trunk/wicket/numberguess/pom.xml 2009-10-14 14:28:48 UTC (rev 4042) @@ -1,6 +1,7 @@ -<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"> +<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> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.weld.examples</groupId> @@ -8,107 +9,75 @@ <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - + <groupId>org.jboss.weld.examples</groupId> <artifactId>weld-wicket-numberguess</artifactId> <packaging>war</packaging> <name>Weld Examples: Numberguess with wicket</name> - + <dependencies> - + <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-wicket</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket</artifactId> - </dependency> - - <dependency> + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> + <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.weld.servlet</groupId> - <artifactId>weld-servlet</artifactId> - <scope>runtime</scope> - </dependency> - <!-- JETTY DEPENDENCIES FOR IN IDE TESTING --> - - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-wicket</artifactId> </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + </dependencies> - <build> - <finalName>weld-numberguess-wicket</finalName> - - <!-- Override the resource filtering to support storing html alongside classes --> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - </resource> - <resource> - <filtering>false</filtering> - <directory>src/main/java</directory> - <includes> - <include>**</include> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <filtering>false</filtering> - <directory>src/test/java</directory> - <includes> - <include>**</include> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - </plugin> + <build> + <finalName>weld-numberguess-wicket</finalName> + + <!-- + Override the resource filtering to support storing html + alongside classes + --> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/resources</directory> + </resource> + <resource> + <filtering>false</filtering> + <directory>src/main/java</directory> + <includes> + <include>**</include> + </includes> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**</include> + </includes> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + </testResources> + + <plugins> <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <configuration> @@ -124,21 +93,79 @@ </webResources> </configuration> </plugin> - </plugins> - </build> + </plugins> + </build> - <profiles> - <profile> - <id>jetty</id> - <dependencies> - <dependency> - <groupId>org.jboss.weld.servlet</groupId> - <artifactId>weld-servlet</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - + <profiles> + <profile> + <id>jetty</id> + <dependencies> + <dependency> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket</artifactId> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.2</version> + </dependency> + + <!-- JETTY DEPENDENCIES FOR IN IDE TESTING --> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + <version>1.5.8</version> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </dependency> + + </dependencies> + </profile> + <profile> + <id>jboss5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + </profile> + </profiles> + + </project> Modified: examples/trunk/wicket/numberguess/readme.txt =================================================================== --- examples/trunk/wicket/numberguess/readme.txt 2009-10-14 14:27:19 UTC (rev 4041) +++ examples/trunk/wicket/numberguess/readme.txt 2009-10-14 14:28:48 UTC (rev 4042) @@ -5,4 +5,6 @@ Application," which will launch jetty with the example. Then hit http://localhost:8080/ +Make sure to use the jetty profile when building your workspace or running maven goals. +Alternatively, you can deploy to JBoss AS using the build.xml file as usual.