Author: maschmid
Date: 2012-04-05 11:11:13 -0400 (Thu, 05 Apr 2012)
New Revision: 14527
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/import.sql
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/faces-config.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/print.xhtml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/template.xhtml
Log:
Blog example mostly working
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ear/pom.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -14,13 +14,6 @@
<packaging>ear</packaging>
<name>Blog EAR Module (EE6)</name>
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- <jboss-cache.lib>jboss-cache-1.4.1.SP9.jar</jboss-cache.lib>
- <jgroups.lib>jgroups-2.4.1.jar</jgroups.lib>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jboss.seam.examples-ee6</groupId>
@@ -48,24 +41,38 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
+ <version>2.7</version>
<configuration>
+ <version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<!-- Exclude eclipse generated application.xml and manually
modified jboss-app.xml during mvn build -->
<earSourceExcludes>**/application.xml,
**/jboss-app.xml</earSourceExcludes>
<!-- use maven generated application.xml instead -->
<generateApplicationXml>true</generateApplicationXml>
<filtering>true</filtering>
+
+ <!-- Required as indexerService cannot be initialized before
the blogEntityManagerFactory is available -->
+ <initializeInOrder>true</initializeInOrder>
+
<modules>
+
+ <ejbModule>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>blog-ejb</artifactId>
+ <bundleFileName>blog-ejb.jar</bundleFileName>
+ </ejbModule>
+
<webModule>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-web</artifactId>
<contextRoot>/seam-blog</contextRoot>
<bundleFileName>blog-web.war</bundleFileName>
</webModule>
+
<ejbModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>blog-ejb</artifactId>
- <bundleFileName>blog-ejb.jar</bundleFileName>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
</ejbModule>
</modules>
</configuration>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-ear/src/main/application/META-INF/jboss-deployment-structure.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -1,6 +1,7 @@
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
<deployment>
<dependencies>
+ <module name="org.antlr" export="true"/>
<module name="org.apache.log4j" export="true"/>
<module name="org.dom4j" export="true"/>
<module name="org.apache.commons.logging" export="true"/>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -28,22 +28,27 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
</dependency>
<!--<dependency>-->
<!--<groupId>org.hibernate</groupId>-->
@@ -52,43 +57,51 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-analyzers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-infinispan</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search-orm</artifactId>
- </dependency>
- <dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
</dependencies>
<profiles>
<profile>
<id>jbossas51</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<build>
<plugins>
<plugin>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/Blog.java
2012-04-05 15:11:13 UTC (rev 14527)
@@ -23,7 +23,7 @@
* @author Simon Brown
*/
@Entity
-@Cache(usage=CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+@Cache(usage=CacheConcurrencyStrategy.TRANSACTIONAL)
public class Blog {
/** the name of the blog */
@@ -51,7 +51,7 @@
/** the list of blog entries, in reverse chronological order */
@OneToMany(mappedBy="blog")
@OrderBy("date desc")
- @Cache(usage=CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+ @Cache(usage=CacheConcurrencyStrategy.TRANSACTIONAL)
private List<BlogEntry> blogEntries;
/**
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/java/domain/BlogEntry.java
2012-04-05 15:11:13 UTC (rev 14527)
@@ -11,6 +11,7 @@
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
@@ -23,7 +24,7 @@
* @author Sanne Grinovero
*/
@Entity
-@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
@Indexed
@AnalyzerDefs({
@AnalyzerDef(name = "en",
@@ -55,11 +56,11 @@
@Field(name = "title:ngrams", analyzer = @Analyzer(definition =
"ngrams"))})
private String title;
- @Size(max = 200)
+ @Size(max=1024)
private String excerpt;
@NotNull
- @Size(max = 1400)
+ @Lob
@Fields({
@Field(name = "body:en", analyzer = @Analyzer(definition = "en")),
@Field(name = "body:ngrams", analyzer = @Analyzer(definition =
"ngrams"))})
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/META-INF/persistence.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -9,13 +9,14 @@
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
+
+ <property name="hibernate.cache.use_second_level_cache" value="true"/>
<property name="hibernate.cache.use_query_cache" value="true"/>
- <!--<property name="jboss.entity.manager.factory.jndi.name"
value="java:/blogEntityManagerFactory"/>-->
+ <property name="jboss.entity.manager.factory.jndi.name"
value="java:/blogEntityManagerFactory"/>
<property name="hibernate.jdbc.charSet" value="utf-8"/>
<!-- use a file system based index -->
- <property name="hibernate.search.default.directory_provider"
- value="org.hibernate.search.store.FSDirectoryProvider"/>
+ <property name="hibernate.search.default.directory_provider"
value="filesystem"/>
<!-- directory where the indexes will be stored -->
<property name="hibernate.search.default.indexBase"
value="./blogindexes"/>
</properties>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/import.sql
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/import.sql
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/src/main/resources/import.sql
2012-04-05 15:11:13 UTC (rev 14527)
@@ -1,5 +1,5 @@
insert into blog (name, description, locale, timezone, password) values
('JBoss Seam Blog', 'An example of a RESTful Seam application', 'en_AU', 'PST',
'tokyo')
insert into hitcount (blog_name, pageviews) values ('JBoss Seam Blog', 1000)
-insert into blogentry (blog_name, id, title, excerpt, body, date) values
('JBoss Seam Blog', 'seamtext', 'Introducing Seam Text', null, 'Seam Text is a
human-friendly language for formatting text in blogs, forums and wikis. It''s
easy to enter text in *emphasis*, |monospace|, ~deleted~ or ^superscript^; you
can easily enter links, lists, quotes and code
blocks.'+char(10)+''+char(10)+'[This is a
link.=>http://hibernate.org]'+char(10)+''+char(10)+'You can *not* enter HTML
entities, even escaped: \& \< \> \"
\ '+char(10)+''+char(10)+'And even emoticons: ;) :-) :-{
;-)'+char(10)+''+char(10)+'Here is an ordered
list:'+char(10)+''+char(10)+'#JBoss'+char(10)+'#Seam'+char(10)+'#Hibernate'+char(10)+''+char(10)+'And
this is an unordered
list:'+char(10)+''+char(10)+'=jBPM'+char(10)+'=Drools'+char(10)+'=Ajax4JSF'+char(10)+'=Facelets'+char(10)+''+char(10)+'"Here
is a quote from someone else"'+char(10)+''+char(10)+'`<p>Here is some
code</p>`'+char(10)+''+char(10)+'And!
some plain HTML (restricted
subset):'+char(10)+''+char(10)+'<table><tr><td>Foo</td><td>Bar</td></tr></table>',
'2007-01-18 4:00')
-insert into blogentry (blog_name, id, title, excerpt, body, date) values
('JBoss Seam Blog', 'book', 'Seam book excerpt on InfoQ', null, 'Michael and
Thomas are writing [a book=>http://safari.oreilly.com/013241273X] about Seam
for [O''Reilly=>http://www.oreillynet.com/], which is apparently the hottest
selling item on Rough Cuts. InfoQ are running an
[excerpt=>http://www.infoq.com/articles/jboss-seam] from the first
chapter.'+char(10)+''+char(10)+'Meanwhile, Norman and I have been tearing our
way through JIRA issues, and so 1.1.1 will be ready to go when I get back from
vacation :-)', '2006-12-19 19:00')
-insert into blogentry (blog_name, id, title, excerpt, body, date) values
('JBoss Seam Blog', 'roadmap11', 'Seam Roadmap', 'The [1.1
release=>http://blog.hibernate.org/cgi-bin/blosxom.cgi/2006/12/13#seam11-goes-ga]
involved a lot of hard work in the guts of Seam, refactoring and fixing bugs,
and working with \"tricky\" code that handles concerns like clustering and
concurrency. Sure, there are many new features, but a lot of the real work is
less user-visible. Now that this hard stuff is out of the way, it lets us add
some interesting new stuff pretty quickly. Here''s a quick roadmap for the next
few months:', 'The [1.1
release=>http://blog.hibernate.org/cgi-bin/blosxom.cgi/2006/12/13#seam11-goes-ga]
involved a lot of hard work in the guts of Seam, refactoring and fixing bugs,
and working with \"tricky\" code that handles concerns like clustering and
concurrency. Sure, there are many new features, but a lot of the real work is
less user-visible. Now that this hard stuff is o!
ut of the way, it lets us add some interesting new stuff pretty quickly.
Here''s a quick roadmap for the next few
months:'+char(10)+''+char(10)+'++++Spring integration
package'+char(10)+''+char(10)+'We''re seeing regular requests from people who
have existing DAOs and business logic written using the Spring Framework and
want a migration path to Seam that lets them re-use this existing code
unchanged. The planned Spring integration package will
provide:'+char(10)+''+char(10)+'=injection of Spring beans into Seam
components, using |@In|'+char(10)+'=access to the Spring beans in the
EL'+char(10)+'=injection of Seam components into Spring beans using Spring
XML'+char(10)+'=integration of the Spring DAO framework with Seam-managed
persistence contexts'+char(10)+''+char(10)+'So, you''ll be able to easily call
existing code written in Spring from your Seam component, JSF views, or jBPM
process definitions, and have that code be able to take advantage of Seam''s
conversation-scope!
persistence contexts. For the first time, you can have Spring!
code th
at isn''t vulnerable to |LazyInitializationException|!'+char(10)+'We''ll
probably even go as far as:'+char(10)+''+char(10)+'=The ability to treat a
Spring bean as a Seam |STATELESS JAVA\_BEAN| component, with a full stack of
Seam interceptors'+char(10)+''+char(10)+'In which case a class can
simultaneously be a Seam component and a Spring bean, the same way a class can
simultaneously be a JSF managed beans, an EJB3 session bean, and a Seam
component
today.'+char(10)+''+char(10)+'++++Seam/Security'+char(10)+''+char(10)+'The
most-requested feature in the Seam forums is security. Unfortunately, the
security-related specifications did not go through the same process of
self-examination and improvement in Java EE 5 that some other specifications
(EJB) did, and so there is now a yawning hole, exactly where the platform
should strongest. (Today the most inadequate specifications in Java are the
portlet spec, the atrocious servlet spec, and any JSR relating to security.)
Seam 1.1.5 w!
ill introduce Seam/Security, an extension to Seam that
provides:'+char(10)+''+char(10)+'=a usable authentication layer'+char(10)+'=an
ACL based permissioning model'+char(10)+'=an optional (customizable) user/role
model'+char(10)+'=a totally cool (at least we think so) authorization mechanism
based upon EL and Drools'+char(10)+''+char(10)+'The permissioning model lets
you do \"row level\" security by writing rules that refer to the actual object
instance that we are checking permissions for.'+char(10)+''+char(10)+'A
subsequent release will also provide a console for administration of
permissions, users/roles and rules. OK, I''m sure that sounds pretty vague now,
but stay tuned.'+char(10)+''+char(10)+'++++Seam and iText'+char(10)+'Generating
PDF is amazingly unsexy, but also incredibly useful. Seam 1.1.5 will provide a
library of JSF controls for iText, letting you quickly create JSF templates
that are capable of rendering PDF, Text and RTF. This will be as easy to use
as:'+c!
har(10)+''+char(10)+'`<it:document xmlns:f="http://java.sun.co!
m/jsf/co
re"'+char(10)+'
xmlns:it="http://jboss.com/products/seam/pdf";>'+char(10)+'
<it:paragraph>Hello
World!</it:paragraph>'+char(10)+'</f:view>`'+char(10)+''+char(10)+'++++Integration
of seam-gen with Hibernate Tools'+char(10)+''+char(10)+'Rails has made
commandline tools popular for web development, and was the inspiration behind
seam-gen. But I''m one of those recalcitrant IDE kinda guys, and I expect
tooling to be properly integrated with Eclipse. We''ll be updating the GUI for
Hibernate Tools to take advantage of the new templates in Seam 1.1, which will
let you do everything you can do today using seam-gen, totally within
Eclipse.'+char(10)+''+char(10)+'++++Seam/WS'+char(10)+''+char(10)+'We''ve been
promising for months that Seam is the killer component model for SOA.
Unfortunately, we got so bogged down in Seam 1.1 that we''re well behind on our
original plan to deliver this in 2006.'+char(10)+''+char(10)+'Seam 1.2 will
integrate Seam with the Java EE 5 Web Service!
s layer and provide support for service conversations in its context model
(I''ve not yet decided whether this calls for a new |SERVICE\_CONVERSATION|
context, or whether it is just a different interpretation of the existing
|CONVERSATION| context for a WS invocation.) Eventually, Seam/WS will also
support service orchestration and conversation recovery via
jBPM.'+char(10)+''+char(10)+'Actually, Seam/WS will just be one piece of a
larger initiative to bring Seam to ESB and SOA environments, but at present
this idea is mostly speculative.'+char(10)+''+char(10)+'Look for a beta release
of Seam 1.2 in Q1.', '2006-12-14 15:29')
+insert into blogentry (blog_name, id, title, excerpt, body, date) values
('JBoss Seam Blog', 'seamtext', 'Introducing Seam Text', null, 'Seam Text is a
human-friendly language for formatting text in blogs, forums and wikis. It''s
easy to enter text in *emphasis*, |monospace|, ~deleted~ or ^superscript^; you
can easily enter links, lists, quotes and code blocks.', '2007-01-18 14:00:00')
+insert into blogentry (blog_name, id, title, excerpt, body, date) values
('JBoss Seam Blog', 'book', 'Seam book excerpt on InfoQ', null, 'Michael and
Thomas are writing [a book=>http://safari.oreilly.com/013241273X] about Seam
for [O''Reilly=>http://www.oreillynet.com/], which is apparently the hottest
selling item on Rough Cuts. InfoQ are running an
[excerpt=>http://www.infoq.com/articles/jboss-seam] from the first chapter.
Meanwhile, Norman and I have been tearing our way through JIRA issues, and so
1.1.1 will be ready to go when I get back from vacation :-)', '2006-12-19
19:00:00')
+insert into blogentry (blog_name, id, title, excerpt, body, date) values
('JBoss Seam Blog', 'roadmap11', 'Seam Roadmap', 'The [1.1
release=>http://blog.hibernate.org/cgi-bin/blosxom.cgi/2006/12/13#seam11-goes-ga]
involved a lot of hard work in the guts of Seam, refactoring and fixing bugs,
and working with \"tricky\" code that handles concerns like clustering and
concurrency. Sure, there are many new features, but a lot of the real work is
less user-visible. Now that this hard stuff is out of the way, it lets us add
some interesting new stuff pretty quickly. Here''s a quick roadmap for the next
few months:', 'The [1.1
release=>http://blog.hibernate.org/cgi-bin/blosxom.cgi/2006/12/13#seam11-goes-ga]
involved a lot of hard work in the guts of Seam, refactoring and fixing bugs,
and working with \"tricky\" code that handles concerns like clustering and
concurrency. Sure, there are many new features, but a lot of the real work is
less user-visible. Now that this hard stuff is o!
ut of the way, it lets us add some interesting new stuff pretty quickly.
Here''s a quick roadmap for the next few months.', '2006-12-14 15:29:00')
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -35,6 +35,11 @@
<artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -25,13 +25,14 @@
<dependency>
<groupId>org.jboss.seam.examples-ee6</groupId>
<artifactId>blog-ejb</artifactId>
- <version>${project.version}</version>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
- <version>${project.version}</version>
+ <type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -73,10 +74,6 @@
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- </dependency>
</dependencies>
<build>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/components.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -30,8 +30,10 @@
</theme:available-themes>
</theme:theme-selector>
- <!--<persistence:managed-persistence-context auto-create="true"
name="entityManager">-->
-
<!--<persistence:persistence-unit-jndi-name>java:/blogEntityManagerFactory</persistence:persistence-unit-jndi-name>-->
- <!--</persistence:managed-persistence-context>-->
+ <persistence:managed-persistence-context auto-create="true"
name="entityManager">
+
<persistence:persistence-unit-jndi-name>java:/blogEntityManagerFactory</persistence:persistence-unit-jndi-name>
+ </persistence:managed-persistence-context>
+ <cache:eh-cache-provider/>
+
</components>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/faces-config.xml
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/WEB-INF/faces-config.xml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<faces-config version="1.2"
+<faces-config version="2.1"
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-facesconfig_2_1.xsd";>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/print.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/print.xhtml
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/print.xhtml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -9,13 +9,13 @@
lang="en">
<f:view>
- <head>
+ <h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>#{blog.name}</title>
<link href="#{theme.css}" rel="stylesheet" type="text/css" />
- </head>
+ </h:head>
- <body>
+ <h:body>
<div id="menu">
<ui:include src="nav.xhtml"/>
  
@@ -26,7 +26,7 @@
<p>[Timezone: #{blog.timeZone.displayName}]</p>
<ui:insert name="content"/>
</div>
- </body>
+ </h:body>
</f:view>
</html>
Modified:
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/template.xhtml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/template.xhtml
2012-04-05 12:42:07 UTC (rev 14526)
+++
branches/community/Seam_2_3/examples-ee6/blog/blog-web/src/main/webapp/template.xhtml
2012-04-05 15:11:13 UTC (rev 14527)
@@ -9,7 +9,7 @@
lang="en">
<f:view>
- <head>
+ <h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>#{blog.name}</title>
<link href="#{theme.css}" rel="stylesheet" type="text/css" />
@@ -18,9 +18,9 @@
title="atom"
href="#{request.contextPath}/seam/index.xml" />
- </head>
+ </h:head>
- <body>
+ <h:body>
<div id="menu">
<ui:include src="menu.xhtml"/>
</div>
@@ -35,7 +35,7 @@
Total pageviews: #{blog.hitCount.pageviews}
</div>
</div>
- </body>
+ </h:body>
</f:view>
</html>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
