[seam-commits] Seam SVN: r8701 - in trunk/examples/wiki/src: main/org/jboss/seam/wiki/core/action and 1 other directory.
Author: christian.bauer(a)jboss.com
Date: 2008-08-15 07:05:25 -0400 (Fri, 15 Aug 2008)
New Revision: 8701
Modified:
trunk/examples/wiki/src/etc/META-INF/components-dev.xml
trunk/examples/wiki/src/etc/META-INF/components-prod.xml
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java
Log:
Minor fixes
Modified: trunk/examples/wiki/src/etc/META-INF/components-dev.xml
===================================================================
--- trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-08-15 10:38:23 UTC (rev
8700)
+++ trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-08-15 11:05:25 UTC (rev
8701)
@@ -43,8 +43,7 @@
<!-- ############## END OF WIKI USER CONFIGURATION ############## -->
<!-- Running in regular JBoss AS, Seam starts the persistence unit -->
- <core:init debug="false"
-
disabled-interceptors="org.jboss.seam.persistence.ManagedEntityIdentityInterceptor"/>
+ <core:init debug="false"/>
<!-- Wiki persistence unit, relies on cache manager backend for Hibernate 2nd
level cache -->
<persistence:entity-manager-factory name="wikiEntityManagerFactory"
@@ -69,22 +68,4 @@
</property>
</component>
- <!--
- <resteasy:application-config
- strip-seam-resource-path="true"
- resource-path-prefix="/restv1">
-
- <resteasy:media-type-mappings>
- <key>xml</key><value>application/xml</value>
- <key>txt</key><value>text/plain</value>
- </resteasy:media-type-mappings>
-
- <resteasy:language-mappings>
- <key>deutsch</key><value>de-DE</value>
- </resteasy:language-mappings>
-
- </resteasy:application-config>
- -->
-
-
</components>
Modified: trunk/examples/wiki/src/etc/META-INF/components-prod.xml
===================================================================
--- trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-08-15 10:38:23 UTC (rev
8700)
+++ trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-08-15 11:05:25 UTC (rev
8701)
@@ -41,8 +41,7 @@
<!-- ############## END OF WIKI USER CONFIGURATION ############## -->
<!-- Running in regular JBoss AS, Seam starts the persistence unit -->
- <core:init debug="false"
-
disabled-interceptors="org.jboss.seam.persistence.ManagedEntityIdentityInterceptor"/>
+ <core:init debug="false"/>
<!-- Wiki persistence unit, relies on cache manager backend for Hibernate 2nd
level cache -->
<persistence:entity-manager-factory name="wikiEntityManagerFactory"
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java
===================================================================
---
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java 2008-08-15
10:38:23 UTC (rev 8700)
+++
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java 2008-08-15
11:05:25 UTC (rev 8701)
@@ -8,16 +8,14 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Install;
import static org.jboss.seam.annotations.Install.APPLICATION;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.*;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.core.Events;
import org.jboss.seam.security.AuthorizationException;
import org.jboss.seam.security.Identity;
import org.jboss.seam.wiki.core.model.*;
+import org.jboss.seam.wiki.core.model.Role;
/**
* Need this until Drools fixes bugs and becomes usable/debuggable.
@@ -28,6 +26,7 @@
@BypassInterceptors
@Install(precedence=APPLICATION)
@AutoCreate
+@Startup
public class WikiIdentity extends Identity {
private User currentUser;