3:48 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-11-09 16:48:57 -0500 (Mon, 09 Nov 2009)
New Revision: 4895
Modified:
examples/trunk/jsf/permalink/pom.xml
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/Blog.java
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/CommentBoard.java
Log:
fix permalink example for weld 1.0.0
Modified: examples/trunk/jsf/permalink/pom.xml
===================================================================
--- examples/trunk/jsf/permalink/pom.xml 2009-11-09 20:47:39 UTC (rev 4894)
+++ examples/trunk/jsf/permalink/pom.xml 2009-11-09 21:48:57 UTC (rev 4895)
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.jboss.weld.examples</groupId>
<artifactId>weld-examples-parent</artifactId>
- <version>1.0.0-CR1</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -116,26 +115,27 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<additionalBuildcommands>
- <!-- annoyingly creates a bin directory
- <buildCommand>
-
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- </buildCommand>
+ <!--
+ annoyingly creates a bin directory <buildCommand>
+
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ </buildCommand>
-->
<buildCommand>
-
<name>org.jboss.tools.common.verification.verifybuilder</name>
+
<name>org.jboss.tools.common.verification.verifybuilder</name>
</buildCommand>
</additionalBuildcommands>
<additionalConfig>
<file>
<name>.settings/org.maven.ide.eclipse.prefs</name>
<content>activeProfiles=jdk5
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1</content>
+ eclipse.preferences.version=1
+ fullBuildGoals=process-test-resources
+ includeModules=false
+ resolveWorkspaceProjects=true
+ resourceFilterGoals=process-resources
+ resources\:testResources
+ skipCompilerPlugin=true
+ version=1</content>
</file>
</additionalConfig>
<additionalProjectFacets>
@@ -154,7 +154,10 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <!-- don't stage or package files added to ${webapp.directory} by
war:inplace -->
+ <!--
+ don't stage or package files added to
+ ${webapp.directory} by war:inplace
+ -->
<warSourceExcludes>WEB-INF/classes/**,WEB-INF/lib/**</warSourceExcludes>
</configuration>
</plugin>
@@ -166,15 +169,24 @@
<prompt>${project.artifactId}</prompt>
<!-- userAliases are for cli:execute-phase -->
<userAliases>
- <runjetty>compile org.mortbay.jetty:maven-jetty-plugin:run
-Pjetty</runjetty>
- <stopjetty>org.mortbay.jetty:maven-jetty-plugin:stop
-Pjetty</stopjetty>
- <runtomcat>compile
org.apache.maven.plugins:maven-war-plugin:inplace
org.codehaus.mojo:tomcat-maven-plugin:run -Ptomcat</runtomcat>
+ <runjetty>compile
+ org.mortbay.jetty:maven-jetty-plugin:run -Pjetty</runjetty>
+ <stopjetty>org.mortbay.jetty:maven-jetty-plugin:stop
+ -Pjetty</stopjetty>
+ <runtomcat>compile
+ org.apache.maven.plugins:maven-war-plugin:inplace
+ org.codehaus.mojo:tomcat-maven-plugin:run
-Ptomcat</runtomcat>
<explode>compile -o</explode>
<!-- tomcat requires use of war:inplace -->
- <tcexplode>compile
org.apache.maven.plugins:maven-war-plugin:inplace -Ptomcat -o</tcexplode>
- <restart>org.apache.maven.plugins:maven-antrun-plugin:run
-Prestart-embedded</restart>
-
<profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles
-o</profiles>
- <pom>org.apache.maven.plugins:maven-help-plugin:effective-pom
-o</pom>
+ <tcexplode>compile
+ org.apache.maven.plugins:maven-war-plugin:inplace
+ -Ptomcat -o</tcexplode>
+ <restart>org.apache.maven.plugins:maven-antrun-plugin:run
+ -Prestart-embedded</restart>
+
<profiles>org.apache.maven.plugins:maven-help-plugin:active-profiles
+ -o</profiles>
+ <pom>org.apache.maven.plugins:maven-help-plugin:effective-pom
+ -o</pom>
</userAliases>
<!-- commands are for cli:execute -->
<commands>
@@ -224,12 +236,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.GA</version>
@@ -248,8 +254,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
</dependency>
@@ -299,14 +304,25 @@
<artifactId>tomcat-maven-plugin</artifactId>
<configuration>
<path>/${project.build.finalName}</path>
- <!-- uncomment to use server configuration override; see
readme.txt for details -->
+ <!--
+ uncomment to use server configuration override;
+ see readme.txt for details
+ -->
<!--<server>tomcatserver</server>-->
<url>http://localhost:${tomcat.http.port}/manager</url>
- <port>${embedded-tomcat.http.port}</port> <!-- port
for embedded Tomcat only (putting this configuration in the execution for the run goal
doesn't work) -->
- <!-- this isn't useful to us because we also need an web.xml
override -->
+ <port>${embedded-tomcat.http.port}</port>
<!--
-
<contextFile>src/main/webapp-tomcat/META-INF/context.xml</contextFile>
+ port for embedded Tomcat only (putting this
+ configuration in the execution for the run goal
+ doesn't work)
-->
+ <!--
+ this isn't useful to us because we also need an
+ web.xml override
+ -->
+ <!--
+
<contextFile>src/main/webapp-tomcat/META-INF/context.xml</contextFile>
+ -->
</configuration>
</plugin>
@@ -348,12 +364,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.GA</version>
@@ -372,8 +382,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
</dependency>
@@ -409,7 +418,8 @@
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
<connectors>
- <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector
+
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>${jetty.http.port}</port>
<maxIdleTime>3600000</maxIdleTime>
</connector>
@@ -436,25 +446,16 @@
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<tasks>
- <touch
file="${webapp.directory}/WEB-INF/web.xml"/>
+ <touch file="${webapp.directory}/WEB-INF/web.xml"
/>
</tasks>
</configuration>
<!-- Hooking an execution to a phase is more correct, but slower
-->
<!--
- <executions>
- <execution>
- <id>touch-web-inf</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <touch
file="${webapp.directory}/WEB-INF/web.xml"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
+ <executions> <execution>
<id>touch-web-inf</id>
+ <phase>validate</phase> <configuration>
<tasks>
+ <touch file="${webapp.directory}/WEB-INF/web.xml"/>
+ </tasks> </configuration> <goals>
<goal>run</goal>
+ </goals> </execution> </executions>
-->
</plugin>
</plugins>
Modified:
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/Blog.java
===================================================================
---
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/Blog.java 2009-11-09
20:47:39 UTC (rev 4894)
+++
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/Blog.java 2009-11-09
21:48:57 UTC (rev 4895)
@@ -26,15 +26,15 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.stereotype.Model;
+import javax.enterprise.inject.Model;
import javax.inject.Inject;
-import javax.inject.Named;
/**
* @author Dan Allen
*/
+@Model
public
-@Model
+
class Blog
{
private static final int PAGE_SIZE = 3;
Modified:
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/CommentBoard.java
===================================================================
---
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/CommentBoard.java 2009-11-09
20:47:39 UTC (rev 4894)
+++
examples/trunk/jsf/permalink/src/main/java/org/jboss/weld/examples/permalink/CommentBoard.java 2009-11-09
21:48:57 UTC (rev 4895)
@@ -21,12 +21,10 @@
*/
package org.jboss.weld.examples.permalink;
-import javax.faces.context.FacesContext;
+import javax.enterprise.inject.Model;
import javax.faces.application.FacesMessage;
-
-import javax.enterprise.inject.stereotype.Model;
+import javax.faces.context.FacesContext;
import javax.inject.Inject;
-import javax.inject.Named;
/**
* @author Dan Allen