[webbeans-commits] Webbeans SVN: r3773 - in examples/trunk/jsf/numberguess: src/jetty and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Sep 23 17:45:46 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-09-23 17:45:46 -0400 (Wed, 23 Sep 2009)
New Revision: 3773
Added:
examples/trunk/jsf/numberguess/src/jetty/resources/
examples/trunk/jsf/numberguess/src/jetty/resources/META-INF/
examples/trunk/jsf/numberguess/src/jetty/resources/META-INF/beans.xml
examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties
Removed:
examples/trunk/jsf/numberguess/src/jetty/java/log4j.properties
Modified:
examples/trunk/jsf/numberguess/pom.xml
examples/trunk/jsf/numberguess/src/jetty/java/Start.java
Log:
get jetty working in the IDE
Modified: examples/trunk/jsf/numberguess/pom.xml
===================================================================
--- examples/trunk/jsf/numberguess/pom.xml 2009-09-23 21:45:19 UTC (rev 3772)
+++ examples/trunk/jsf/numberguess/pom.xml 2009-09-23 21:45:46 UTC (rev 3773)
@@ -183,6 +183,12 @@
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.webbeans.servlet</groupId>
<artifactId>webbeans-servlet</artifactId>
<scope>runtime</scope>
@@ -323,29 +329,37 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.webbeans.servlet</groupId>
<artifactId>webbeans-servlet</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.el</groupId>
@@ -369,6 +383,12 @@
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -395,6 +415,40 @@
</webResources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <useProjectReferences>false</useProjectReferences>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+ <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>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/jetty/java</source>
+ </sources>
+ <resources>
+ <resource>
+ <directory>src/jetty/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -446,6 +500,8 @@
<include>META-INF/context.xml</include>
<include>WEB-INF/web.xml</include>
<include>WEB-INF/jetty-env.xml</include>
+ <include>WEB-INF/appengine-web.xml</include>
+ <include>WEB-INF/logging.properties</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
Modified: examples/trunk/jsf/numberguess/src/jetty/java/Start.java
===================================================================
--- examples/trunk/jsf/numberguess/src/jetty/java/Start.java 2009-09-23 21:45:19 UTC (rev 3772)
+++ examples/trunk/jsf/numberguess/src/jetty/java/Start.java 2009-09-23 21:45:46 UTC (rev 3773)
@@ -17,7 +17,6 @@
bb.setServer(server);
bb.setContextPath("/");
bb.setWar("src/main/webapp");
- bb.setDescriptor("src/main/webapp-jetty/WEB-INF/web.xml");
// Disable for now
// Resource jettyEnv = Resource.newResource("src/main/webapp-jetty/WEB-INF/jetty-env.xml");
Deleted: examples/trunk/jsf/numberguess/src/jetty/java/log4j.properties
===================================================================
--- examples/trunk/jsf/numberguess/src/jetty/java/log4j.properties 2009-09-23 21:45:19 UTC (rev 3772)
+++ examples/trunk/jsf/numberguess/src/jetty/java/log4j.properties 2009-09-23 21:45:46 UTC (rev 3773)
@@ -1,10 +0,0 @@
-log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n
-
-
-log4j.rootLogger=INFO,Stdout
-
-log4j.logger.org.jboss.webbeans=DEBUG
-
-
Added: examples/trunk/jsf/numberguess/src/jetty/resources/META-INF/beans.xml
===================================================================
Property changes on: examples/trunk/jsf/numberguess/src/jetty/resources/META-INF/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties (from rev 3765, examples/trunk/jsf/numberguess/src/jetty/java/log4j.properties)
===================================================================
--- examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties (rev 0)
+++ examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties 2009-09-23 21:45:46 UTC (rev 3773)
@@ -0,0 +1,10 @@
+log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n
+
+
+log4j.rootLogger=INFO,Stdout
+
+log4j.logger.org.jboss.webbeans=DEBUG
+
+
Property changes on: examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
More information about the weld-commits
mailing list