Seam SVN: r7680 - trunk/doc/reference/en/modules.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-03-24 13:35:22 -0400 (Mon, 24 Mar 2008)
New Revision: 7680
Modified:
trunk/doc/reference/en/modules/configuration.xml
trunk/doc/reference/en/modules/persistence.xml
Log:
JBSEAM-1946, JBSEAM-2761
added section on using an alternate JPA provider.
Modified: trunk/doc/reference/en/modules/configuration.xml
===================================================================
--- trunk/doc/reference/en/modules/configuration.xml 2008-03-24 17:28:31 UTC (rev 7679)
+++ trunk/doc/reference/en/modules/configuration.xml 2008-03-24 17:35:22 UTC (rev 7680)
@@ -427,6 +427,50 @@
</sect2>
</sect1>
+
+ <sect1 id="alt-jpa-providers">
+ <title>Using Alternate JPA Providers</title>
+
+ <para> Seam comes packaged and configured with Hibernate as the primary JPA provider.
+ This helps with the <emphasis>Configuration by Exception</emphasis> concept.
+ If you require using a different JPA provider you must tell <literal>seam</literal>
+ about it.
+ </para>
+
+ <para>This can be be done in one of two ways:
+ <itemizedlist>
+ <listitem>
+ <para>Update your application's <literal>components.xml</literal>
+ so that the generic <literal>PersistenceProvider</literal> takes
+ precedence over the hibernate version. Simply add the following
+ to the file:
+ <programlisting><![CDATA[<component name="org.jboss.seam.persistence.persistenceProvider"
+ class="org.jboss.seam.persistence.PersistenceProvider"
+ scope="stateless">
+</component>]]></programlisting>
+ </para>
+ </listitem>
+ <listitem>
+ <para>If you want to take advantage of your JPA providers
+ non-standard features you will need to write you own implementation of
+ the <literal>PersistenceProvider</literal>. Use
+ <literal>HibernatePersistenceProvider</literal> as a starting
+ point (don't forget to provide it to the community :). Then you
+ will need to tell <literal>seam</literal> to use it as before.
+ <programlisting><![CDATA[<component name="org.jboss.seam.persistence.persistenceProvider"
+ class="org.your.package.YourPersistenceProvider">
+</component>]]></programlisting>
+
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>All that is left is updating the <literal>persistence.xml</literal>
+ file with the correct provider class, and what ever properties it
+ needs. Don't forget to package your new provider's jar files in the
+ application if they are needed.
+ </para>
+ </sect1>
<sect1>
<title>Configuring Seam in Java EE 5</title>
Modified: trunk/doc/reference/en/modules/persistence.xml
===================================================================
--- trunk/doc/reference/en/modules/persistence.xml 2008-03-24 17:28:31 UTC (rev 7679)
+++ trunk/doc/reference/en/modules/persistence.xml 2008-03-24 17:35:22 UTC (rev 7680)
@@ -484,7 +484,8 @@
API via the <literal>getDelegate()</literal> method. Naturally, the most interesting
vendor is Hibernate, and the most powerful delegate interface is
<literal>org.hibernate.Session</literal>. You'd be nuts to use anything else. Trust
- me, I'm not biased at all.
+ me, I'm not biased at all. For configuring alternate JPA providers see
+ <link linkend="alt-jpa-providers">Using Alternate JPA Providers</link>
</para>
<para>
17 years, 9 months
Seam SVN: r7679 - branches/Seam_2_0/doc/Seam_Reference_Guide/en.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-03-24 13:28:31 -0400 (Mon, 24 Mar 2008)
New Revision: 7679
Modified:
branches/Seam_2_0/doc/Seam_Reference_Guide/en/Configuration.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en/Persistence.xml
Log:
JBSEAM-2761, JBSEAM-1946
Added a section on using alternate JPA providers.
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Configuration.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en/Configuration.xml 2008-03-23 01:21:04 UTC (rev 7678)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en/Configuration.xml 2008-03-24 17:28:31 UTC (rev 7679)
@@ -421,6 +421,50 @@
</sect2>
</sect1>
+
+ <sect1 id="alt-jpa-providers">
+ <title>Using Alternate JPA Providers</title>
+
+ <para> Seam comes packaged and configured with Hibernate as the primary JPA provider.
+ This helps with the <emphasis>Configuration by Exception</emphasis> concept.
+ If you require using a different JPA provider you must tell <literal>seam</literal>
+ about it.
+ </para>
+
+ <para>This can be be done in one of two ways:
+ <itemizedlist>
+ <listitem>
+ <para>Update your application's <literal>components.xml</literal>
+ so that the generic <literal>PersistenceProvider</literal> takes
+ precedence over the hibernate version. Simply add the following
+ to the file:
+ <programlisting><![CDATA[<component name="org.jboss.seam.persistence.persistenceProvider"
+ class="org.jboss.seam.persistence.PersistenceProvider"
+ scope="stateless">
+</component>]]></programlisting>
+ </para>
+ </listitem>
+ <listitem>
+ <para>If you want to take advantage of your JPA providers
+ non-standard features you will need to write you own implementation of
+ the <literal>PersistenceProvider</literal>. Use
+ <literal>HibernatePersistenceProvider</literal> as a starting
+ point (don't forget to provide it to the community :). Then you
+ will need to tell <literal>seam</literal> to use it as before.
+ <programlisting><![CDATA[<component name="org.jboss.seam.persistence.persistenceProvider"
+ class="org.your.package.YourPersistenceProvider">
+</component>]]></programlisting>
+
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>All that is left is updating the <literal>persistence.xml</literal>
+ file with the correct provider class, and what ever properties it
+ needs. Don't forget to package your new provider's jar files in the
+ application if they are needed.
+ </para>
+ </sect1>
<sect1>
<title>Configuring Seam in Java EE 5</title>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Persistence.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en/Persistence.xml 2008-03-23 01:21:04 UTC (rev 7678)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en/Persistence.xml 2008-03-24 17:28:31 UTC (rev 7679)
@@ -484,7 +484,8 @@
API via the <literal>getDelegate()</literal> method. Naturally, the most interesting
vendor is Hibernate, and the most powerful delegate interface is
<literal>org.hibernate.Session</literal>. You'd be nuts to use anything else. Trust
- me, I'm not biased at all.
+ me, I'm not biased at all. For configuring alternate JPA providers see
+ <link linkend="alt-jpa-providers">Using Alternate JPA Providers</link>
</para>
<para>
17 years, 9 months
Seam SVN: r7678 - trunk/src/main/org/jboss/seam/mock.
by seam-commits@lists.jboss.org
Author: matt.drees
Date: 2008-03-22 21:21:04 -0400 (Sat, 22 Mar 2008)
New Revision: 7678
Modified:
trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
Log:
JBSEAM-2720
Modified: trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-03-22 17:03:24 UTC (rev 7677)
+++ trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-03-23 01:21:04 UTC (rev 7678)
@@ -28,7 +28,9 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpSession;
import javax.transaction.UserTransaction;
@@ -528,14 +530,32 @@
protected void init()
{
- Cookie[] cookieArray = getCookies().toArray(new Cookie[] {});
- request = new MockHttpServletRequest(session, getPrincipalName(), getPrincipalRoles(), cookieArray, isGetRequest() ? "GET" : "POST");
- response = new MockHttpServletResponse();
+ request = createRequest();
+ response = createResponse();
externalContext = new MockExternalContext(servletContext, request, response);
facesContext = new MockFacesContext(externalContext, application);
facesContext.setCurrent();
}
+ /**
+ * Override if you wish to customize the HttpServletRequest used in this request.
+ * You may find {@link HttpServletRequestWrapper} useful.
+ */
+ protected HttpServletRequest createRequest()
+ {
+ Cookie[] cookieArray = getCookies().toArray(new Cookie[] {});
+ return new MockHttpServletRequest(session, getPrincipalName(), getPrincipalRoles(), cookieArray, isGetRequest() ? "GET" : "POST");
+ }
+
+ /**
+ * Override if you wish to customize the HttpServletResponse used in this request.
+ * You may find {@link HttpServletResponseWrapper} useful.
+ */
+ protected HttpServletResponse createResponse()
+ {
+ return new MockHttpServletResponse();
+ }
+
private void setStandardJspVariables()
{
// TODO: looks like we should also set request, session, application,
17 years, 9 months
Seam SVN: r7677 - in trunk: src/main/org/jboss/seam/deployment and 9 other directories.
by seam-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-03-22 13:03:24 -0400 (Sat, 22 Mar 2008)
New Revision: 7677
Modified:
trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java
trunk/src/main/org/jboss/seam/faces/Navigator.java
trunk/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java
trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java
trunk/src/main/org/jboss/seam/web/RewritingResponse.java
trunk/src/test/integration/src/org/jboss/seam/test/integration/UnversionedThing.java
trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java
trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
trunk/ui/src/main/java/org/jboss/seam/ui/component/html/HtmlLoadStyle.java
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java
Log:
fix warnings
Modified: trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
===================================================================
--- trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -77,8 +77,6 @@
/**
* Obtains a PlatformTransactionManager from either the name or expression
* specified.
- *
- * @return
*/
protected PlatformTransactionManager getPlatformTransactionManager()
{
Modified: trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -1,7 +1,6 @@
package org.jboss.seam.deployment;
import java.io.File;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URL;
Modified: trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -1,6 +1,5 @@
package org.jboss.seam.deployment;
-import java.lang.annotation.Annotation;
import java.util.Map;
import java.util.Set;
Modified: trunk/src/main/org/jboss/seam/faces/Navigator.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/Navigator.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/faces/Navigator.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -1,6 +1,5 @@
package org.jboss.seam.faces;
-import java.io.IOException;
import java.util.Map;
import javax.faces.application.FacesMessage.Severity;
Modified: trunk/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/mock/AbstractDBUnitSeamTest.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -245,6 +245,7 @@
}
}
+ @Override
public String toString()
{
// TODO: This is not pretty because DBUnit's DatabaseOperation doesn't implement toString() properly
@@ -348,6 +349,7 @@
// http://www.carbonfive.com/community/archives/2005/07/dbunit_hsql_and.html
config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, new DefaultDataTypeFactory()
{
+ @Override
public DataType createDataType(int sqlType, String sqlTypeName)
throws DataTypeException
{
Modified: trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -32,7 +32,6 @@
import javax.servlet.http.HttpSession;
import javax.transaction.UserTransaction;
-import org.hibernate.validator.ClassValidator;
import org.hibernate.validator.InvalidValue;
import org.jboss.seam.Component;
import org.jboss.seam.Seam;
Modified: trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -1,6 +1,5 @@
package org.jboss.seam.navigation;
-import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Modified: trunk/src/main/org/jboss/seam/web/RewritingResponse.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/RewritingResponse.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/main/org/jboss/seam/web/RewritingResponse.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -15,7 +15,6 @@
private static LogProvider log = Logging.getLogProvider(RewritingResponse.class);
private HttpServletRequest request;
- private HttpServletResponse response;
private Collection<Pattern> patterns;
@@ -26,7 +25,6 @@
super(response);
this.request = request;
- this.response = response;
this.patterns = patterns;
}
Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/UnversionedThing.java
===================================================================
--- trunk/src/test/integration/src/org/jboss/seam/test/integration/UnversionedThing.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/test/integration/src/org/jboss/seam/test/integration/UnversionedThing.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -3,7 +3,6 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.Version;
@Entity
public class UnversionedThing {
Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java
===================================================================
--- trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -15,7 +15,7 @@
@Test
public void testValueExpression() throws Exception
{
- String cid = new FacesRequest()
+ new FacesRequest()
{
@Override
@@ -31,7 +31,7 @@
@Test
public void testMissingMethod() throws Exception
{
- String cid = new FacesRequest()
+ new FacesRequest()
{
@Override
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -13,7 +13,6 @@
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionListener;
-import javax.faces.event.PhaseEvent;
import javax.faces.model.DataModel;
import org.jboss.seam.navigation.Pages;
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/component/html/HtmlLoadStyle.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/component/html/HtmlLoadStyle.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/html/HtmlLoadStyle.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -42,6 +42,7 @@
* Setter for isolated
* @param __isolated - new value
*/
+ @Override
public void setIsolated( boolean __isolated ){
this._isolated = __isolated;
this._isolatedSet = true;
@@ -54,6 +55,7 @@
* Getter for isolated
* @return isolated value from local variable or value bindings
*/
+ @Override
public boolean isIsolated( ){
if(this._isolatedSet){
return this._isolated;
@@ -81,8 +83,8 @@
// Save state
// ----------------------------------------------------- StateHolder Methods
-
- public Object saveState(FacesContext context) {
+ @Override
+ public Object saveState(FacesContext context) {
Object values[] = new Object[3];
values[0] = super.saveState(context);
values[1] = new Boolean(_isolated);
@@ -91,8 +93,8 @@
return values;
}
-
- public void restoreState(FacesContext context, Object state) {
+ @Override
+ public void restoreState(FacesContext context, Object state) {
Object values[] = (Object[]) state;
super.restoreState(context, values[0]);
_isolated = ((Boolean)values[1]).booleanValue();
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java 2008-03-21 20:33:35 UTC (rev 7676)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java 2008-03-22 17:03:24 UTC (rev 7677)
@@ -7,7 +7,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.jboss.seam.core.Init;
import org.jboss.seam.core.PojoCache;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
17 years, 9 months
Seam SVN: r7676 - branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-03-21 16:33:35 -0400 (Fri, 21 Mar 2008)
New Revision: 7676
Modified:
branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/Identity.java
Log:
JBPAPP-659 - clear authenticated session
Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/Identity.java
===================================================================
--- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/Identity.java 2008-03-21 18:19:52 UTC (rev 7675)
+++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/Identity.java 2008-03-21 20:33:35 UTC (rev 7676)
@@ -320,6 +320,7 @@
public void logout()
{
principal = null;
+ unAuthenticate();
Seam.invalidateSession();
}
17 years, 9 months
Seam SVN: r7675 - in trunk/src/main/org/jboss/seam: security/permission and 1 other directory.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-03-21 14:19:52 -0400 (Fri, 21 Mar 2008)
New Revision: 7675
Added:
trunk/src/main/org/jboss/seam/annotations/security/AclFlag.java
trunk/src/main/org/jboss/seam/annotations/security/AclFlags.java
trunk/src/main/org/jboss/seam/security/permission/AccountPermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/AccountType.java
trunk/src/main/org/jboss/seam/security/permission/AclPermission.java
trunk/src/main/org/jboss/seam/security/permission/AclPermissionResolver.java
trunk/src/main/org/jboss/seam/security/permission/AclPermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/JpaAclPermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java
Removed:
trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java
trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java
Modified:
trunk/src/main/org/jboss/seam/security/permission/AccountPermission.java
trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java
Log:
user/role permissions, acl permissions
Added: trunk/src/main/org/jboss/seam/annotations/security/AclFlag.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/security/AclFlag.java (rev 0)
+++ trunk/src/main/org/jboss/seam/annotations/security/AclFlag.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,24 @@
+package org.jboss.seam.annotations.security;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Maps a permission for the target class to a bit value
+ *
+ * @author Shane Bryzak
+ */
+@Target({TYPE})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+public @interface AclFlag
+{
+ long mask();
+ String action();
+}
Added: trunk/src/main/org/jboss/seam/annotations/security/AclFlags.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/security/AclFlags.java (rev 0)
+++ trunk/src/main/org/jboss/seam/annotations/security/AclFlags.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,23 @@
+package org.jboss.seam.annotations.security;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies a list of ACL flags for a class
+ *
+ * @author Shane Bryzak
+ */
+@Target({TYPE})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+public @interface AclFlags
+{
+ AclFlag[] value() default {};
+}
Modified: trunk/src/main/org/jboss/seam/security/permission/AccountPermission.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/AccountPermission.java 2008-03-21 15:28:38 UTC (rev 7674)
+++ trunk/src/main/org/jboss/seam/security/permission/AccountPermission.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -7,9 +7,7 @@
* @author Shane Bryzak
*/
public abstract class AccountPermission
-{
- public enum AccountType {user, role}
-
+{
public abstract String getTarget();
public abstract void setTarget(String target);
Added: trunk/src/main/org/jboss/seam/security/permission/AccountPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/AccountPermissionStore.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/AccountPermissionStore.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,17 @@
+package org.jboss.seam.security.permission;
+
+import java.util.List;
+
+/**
+ * Persistent store for account-based (user/role) permissions
+ *
+ * @author Shane Bryzak
+ */
+public interface AccountPermissionStore
+{
+ List<AccountPermission> listPermissions(String target, String action);
+ List<AccountPermission> listPermissions(String target);
+
+ boolean grantPermission(String target, String action, String account, AccountType accountType);
+ boolean revokePermission(String target, String action, String account, AccountType accountType);
+}
Added: trunk/src/main/org/jboss/seam/security/permission/AccountType.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/AccountType.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/AccountType.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,7 @@
+package org.jboss.seam.security.permission;
+
+public enum AccountType
+{
+ user,
+ role
+}
Added: trunk/src/main/org/jboss/seam/security/permission/AclPermission.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/AclPermission.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/AclPermission.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,19 @@
+package org.jboss.seam.security.permission;
+
+public abstract class AclPermission
+{
+ public abstract String getObjectId();
+ public abstract void setObjectId(String objectId);
+
+ public abstract String getIdentifier();
+ public abstract void setIdentifier(String identifier);
+
+ public abstract String getAccount();
+ public abstract void setAccount(String account);
+
+ public abstract AccountType getAccountType();
+ public abstract void setAccountType(AccountType accountType);
+
+ public abstract long getPermissions();
+ public abstract void setPermissions(long permissions);
+}
Added: trunk/src/main/org/jboss/seam/security/permission/AclPermissionResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/AclPermissionResolver.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/AclPermissionResolver.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,87 @@
+package org.jboss.seam.security.permission;
+
+import static org.jboss.seam.ScopeType.APPLICATION;
+import static org.jboss.seam.annotations.Install.FRAMEWORK;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.jboss.seam.Component;
+import org.jboss.seam.annotations.Create;
+import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.security.Identity;
+
+@Name("org.jboss.seam.security.aclPermissionResolver")
+@Scope(APPLICATION)
+@BypassInterceptors
+@Install(precedence=FRAMEWORK)
+@Startup
+public class AclPermissionResolver implements PermissionResolver, Serializable
+{
+ private static final String DEFAULT_PERMISSION_STORE_NAME = "aclPermissionStore";
+
+ private AclPermissionStore permissionStore;
+
+ private static final LogProvider log = Logging.getLogProvider(AclPermissionResolver.class);
+
+ @Create
+ public void create()
+ {
+ initPermissionStore();
+ }
+
+ protected void initPermissionStore()
+ {
+ if (permissionStore == null)
+ {
+ permissionStore = (AclPermissionStore) Component.getInstance(DEFAULT_PERMISSION_STORE_NAME, true);
+ }
+
+ if (permissionStore == null)
+ {
+ log.warn("no permission store available - please install a PermissionStore with the name '" +
+ DEFAULT_PERMISSION_STORE_NAME + "' if acl-based permissions are required.");
+ }
+ }
+
+ public boolean hasPermission(Object target, String action)
+ {
+ if (permissionStore == null) return false;
+
+ List<AclPermission> permissions = permissionStore.listPermissions(target);
+
+ Identity identity = Identity.instance();
+
+ if (!identity.isLoggedIn()) return false;
+
+ String username = identity.getPrincipal().getName();
+
+ for (AclPermission permission : permissions)
+ {
+ if ((username.equals(permission.getAccount()) && permission.getAccountType().equals(AccountType.user)) ||
+ (permission.getAccountType().equals(AccountType.role) && identity.hasRole(permission.getAccount())))
+ {
+ if (hasPermissionFlag(target, action, permission.getPermissions()))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ protected boolean hasPermissionFlag(Object target, String action, long permissions)
+ {
+ // TODO
+
+ return false;
+ }
+
+}
Added: trunk/src/main/org/jboss/seam/security/permission/AclPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/AclPermissionStore.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/AclPermissionStore.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,15 @@
+package org.jboss.seam.security.permission;
+
+import java.util.List;
+
+/**
+ * Persistent storage for ACL (instance-based) permissions
+ *
+ * @author Shane Bryzak
+ */
+public interface AclPermissionStore
+{
+ List<AclPermission> listPermissions(Object target);
+ boolean grantPermission(Object target, String action, String account, AccountType accountType);
+ boolean revokePermission(Object target, String action, String account, AccountType accountType);
+}
Modified: trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java 2008-03-21 15:28:38 UTC (rev 7674)
+++ trunk/src/main/org/jboss/seam/security/permission/DynamicPermissionResolver.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -17,7 +17,6 @@
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.security.Identity;
-import org.jboss.seam.security.permission.AccountPermission.AccountType;
/**
* Resolves dynamically-assigned permissions kept in a persistent store, such as a
@@ -32,9 +31,9 @@
@Startup
public class DynamicPermissionResolver implements PermissionResolver, Serializable
{
- private static final String DEFAULT_PERMISSION_STORE_NAME = "permissionStore";
+ private static final String DEFAULT_PERMISSION_STORE_NAME = "accountPermissionStore";
- private PermissionStore permissionStore;
+ private AccountPermissionStore permissionStore;
private static final LogProvider log = Logging.getLogProvider(DynamicPermissionResolver.class);
@@ -48,7 +47,7 @@
{
if (permissionStore == null)
{
- permissionStore = (PermissionStore) Component.getInstance(DEFAULT_PERMISSION_STORE_NAME, true);
+ permissionStore = (AccountPermissionStore) Component.getInstance(DEFAULT_PERMISSION_STORE_NAME, true);
}
if (permissionStore == null)
@@ -58,12 +57,12 @@
}
}
- public PermissionStore getPermissionStore()
+ public AccountPermissionStore getPermissionStore()
{
return permissionStore;
}
- public void setPermissionStore(PermissionStore permissionStore)
+ public void setPermissionStore(AccountPermissionStore permissionStore)
{
this.permissionStore = permissionStore;
}
Deleted: trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java 2008-03-21 15:28:38 UTC (rev 7674)
+++ trunk/src/main/org/jboss/seam/security/permission/JPAPermissionStore.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -1,122 +0,0 @@
-package org.jboss.seam.security.permission;
-
-import static org.jboss.seam.ScopeType.APPLICATION;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-
-import org.jboss.seam.Component;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.intercept.BypassInterceptors;
-import org.jboss.seam.security.permission.AccountPermission.AccountType;
-
-/**
- * A permission store implementation that uses JPA as its persistence mechanism.
- *
- * @author Shane Bryzak
- */
-@Scope(APPLICATION)
-@BypassInterceptors
-public class JPAPermissionStore implements PermissionStore
-{
- private String entityManagerName = "entityManager";
-
- private Class<? extends AccountPermission> permissionClass;
-
- public boolean grantPermission(String target, String action, String account,
- AccountType accountType)
- {
- try
- {
- if (permissionClass == null)
- {
- throw new RuntimeException("Could not grant permission, permissionClass not set");
- }
-
- AccountPermission permission = permissionClass.newInstance();
- permission.setTarget(target);
- permission.setAction(action);
- permission.setAccount(account);
- permission.setAccountType(accountType);
-
- getEntityManager().persist(permission);
-
- return true;
- }
- catch (Exception ex)
- {
- throw new RuntimeException("Could not grant permission", ex);
- }
- }
-
- public boolean revokePermission(String target, String action,
- String account, AccountType accountType)
- {
- try
- {
- EntityManager em = getEntityManager();
-
- AccountPermission permission = (AccountPermission) em.createQuery(
- "from " + permissionClass.getName() +
- " where target = :target and action = :action and account = :account " +
- " and accountType = :accountType")
- .setParameter("target", target)
- .setParameter("action", "action")
- .setParameter("account", account)
- .setParameter("accountType", accountType)
- .getSingleResult();
-
- em.remove(permission);
- return true;
- }
- catch (NoResultException ex)
- {
- return false;
- }
- }
-
- public List<AccountPermission> listPermissions(String target, String action)
- {
- return getEntityManager().createQuery(
- "from " + permissionClass.getName() +
- " where target = :target and action = :action")
- .setParameter("target", target)
- .setParameter("action", action)
- .getResultList();
- }
-
- public List<AccountPermission> listPermissions(String target)
- {
- return getEntityManager().createQuery(
- "from " + permissionClass.getName() + " where target = :target")
- .setParameter("target", target)
- .getResultList();
- }
-
- private EntityManager getEntityManager()
- {
- return (EntityManager) Component.getInstance(entityManagerName);
- }
-
- public String getEntityManagerName()
- {
- return entityManagerName;
- }
-
- public void setEntityManagerName(String name)
- {
- this.entityManagerName = name;
- }
-
- public Class getPermissionClass()
- {
- return permissionClass;
- }
-
- public void setPermissionClass(Class permissionClass)
- {
- this.permissionClass = permissionClass;
- }
-}
Added: trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,121 @@
+package org.jboss.seam.security.permission;
+
+import static org.jboss.seam.ScopeType.APPLICATION;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+
+import org.jboss.seam.Component;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
+
+/**
+ * A permission store implementation that uses JPA as its persistence mechanism.
+ *
+ * @author Shane Bryzak
+ */
+@Scope(APPLICATION)
+@BypassInterceptors
+public class JpaAccountPermissionStore implements AccountPermissionStore
+{
+ private String entityManagerName = "entityManager";
+
+ private Class<? extends AccountPermission> permissionClass;
+
+ public boolean grantPermission(String target, String action, String account,
+ AccountType accountType)
+ {
+ try
+ {
+ if (permissionClass == null)
+ {
+ throw new RuntimeException("Could not grant permission, permissionClass not set");
+ }
+
+ AccountPermission permission = permissionClass.newInstance();
+ permission.setTarget(target);
+ permission.setAction(action);
+ permission.setAccount(account);
+ permission.setAccountType(accountType);
+
+ getEntityManager().persist(permission);
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw new RuntimeException("Could not grant permission", ex);
+ }
+ }
+
+ public boolean revokePermission(String target, String action,
+ String account, AccountType accountType)
+ {
+ try
+ {
+ EntityManager em = getEntityManager();
+
+ AccountPermission permission = (AccountPermission) em.createQuery(
+ "from " + permissionClass.getName() +
+ " where target = :target and action = :action and account = :account " +
+ " and accountType = :accountType")
+ .setParameter("target", target)
+ .setParameter("action", "action")
+ .setParameter("account", account)
+ .setParameter("accountType", accountType)
+ .getSingleResult();
+
+ em.remove(permission);
+ return true;
+ }
+ catch (NoResultException ex)
+ {
+ return false;
+ }
+ }
+
+ public List<AccountPermission> listPermissions(String target, String action)
+ {
+ return getEntityManager().createQuery(
+ "from " + permissionClass.getName() +
+ " where target = :target and action = :action")
+ .setParameter("target", target)
+ .setParameter("action", action)
+ .getResultList();
+ }
+
+ public List<AccountPermission> listPermissions(String target)
+ {
+ return getEntityManager().createQuery(
+ "from " + permissionClass.getName() + " where target = :target")
+ .setParameter("target", target)
+ .getResultList();
+ }
+
+ private EntityManager getEntityManager()
+ {
+ return (EntityManager) Component.getInstance(entityManagerName);
+ }
+
+ public String getEntityManagerName()
+ {
+ return entityManagerName;
+ }
+
+ public void setEntityManagerName(String name)
+ {
+ this.entityManagerName = name;
+ }
+
+ public Class getPermissionClass()
+ {
+ return permissionClass;
+ }
+
+ public void setPermissionClass(Class permissionClass)
+ {
+ this.permissionClass = permissionClass;
+ }
+}
Added: trunk/src/main/org/jboss/seam/security/permission/JpaAclPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/JpaAclPermissionStore.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/JpaAclPermissionStore.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,54 @@
+package org.jboss.seam.security.permission;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class JpaAclPermissionStore implements AclPermissionStore, Serializable
+{
+ private String entityManagerName = "entityManager";
+
+ private Class<? extends AclPermission> permissionClass;
+
+ protected String getIdentifier(Object target)
+ {
+ return null;
+ }
+
+ public boolean grantPermission(Object target, String action, String account, AccountType accountType)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public List<AclPermission> listPermissions(Object target)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean revokePermission(Object target, String action, String account, AccountType accountType)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public String getEntityManagerName()
+ {
+ return entityManagerName;
+ }
+
+ public void setEntityManagerName(String entityManagerName)
+ {
+ this.entityManagerName = entityManagerName;
+ }
+
+ public Class getPermissionClass()
+ {
+ return permissionClass;
+ }
+
+ public void setPermissionClass(Class permissionClass)
+ {
+ this.permissionClass = permissionClass;
+ }
+}
Added: trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -0,0 +1,134 @@
+package org.jboss.seam.security.permission;
+
+import static org.jboss.seam.ScopeType.APPLICATION;
+import static org.jboss.seam.annotations.Install.BUILT_IN;
+
+import java.util.List;
+
+import org.jboss.seam.Component;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
+import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.security.Identity;
+
+@Scope(APPLICATION)
+@Name("org.jboss.seam.security.permissionManager")
+@Install(precedence = BUILT_IN)
+public class PermissionManager
+{
+ public static final String ACCOUNT_PERMISSION_STORE_COMPONENT_NAME = "accountPermissionStore";
+ public static final String ACL_PERMISSION_STORE_COMPONENT_NAME = "aclPermissionStore";
+
+ public static final String PERMISSION_PERMISSION_NAME = "seam.permission";
+
+ public static final String PERMISSION_READ = "read";
+ public static final String PERMISSION_GRANT = "grant";
+ public static final String PERMISSION_REVOKE = "revoke";
+
+ private static final LogProvider log = Logging.getLogProvider(PermissionManager.class);
+
+ private AccountPermissionStore accountPermissionStore;
+
+ private AclPermissionStore aclPermissionStore;
+
+ @Create
+ public void create()
+ {
+ if (accountPermissionStore == null)
+ {
+ accountPermissionStore = (AccountPermissionStore) Component.getInstance(ACCOUNT_PERMISSION_STORE_COMPONENT_NAME, true);
+ }
+
+ if (accountPermissionStore == null)
+ {
+ log.warn("no account permission store available - please install an AccountPermissionStore with the name '" +
+ ACCOUNT_PERMISSION_STORE_COMPONENT_NAME + "' if account-based permission management is required.");
+ }
+
+ if (aclPermissionStore == null)
+ {
+ aclPermissionStore = (AclPermissionStore) Component.getInstance(ACL_PERMISSION_STORE_COMPONENT_NAME);
+ }
+
+ if (aclPermissionStore == null)
+ {
+ log.warn("no ACL permission store available - please install an AclPermissionStore with the name '" +
+ ACL_PERMISSION_STORE_COMPONENT_NAME + "' if ACL-based permission management is required.");
+ }
+ }
+
+ public static PermissionManager instance()
+ {
+ if ( !Contexts.isApplicationContextActive() )
+ {
+ throw new IllegalStateException("No active application context");
+ }
+
+ PermissionManager instance = (PermissionManager) Component.getInstance(
+ PermissionManager.class, ScopeType.APPLICATION);
+
+ if (instance == null)
+ {
+ throw new IllegalStateException("No PermissionManager could be created");
+ }
+
+ return instance;
+ }
+
+ public AccountPermissionStore getAccountPermissionStore()
+ {
+ return accountPermissionStore;
+ }
+
+ public void setAccountPermissionStore(AccountPermissionStore accountPermissionStore)
+ {
+ this.accountPermissionStore = accountPermissionStore;
+ }
+
+ public List<AccountPermission> listPermissions(String target, String action)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_READ);
+ return accountPermissionStore.listPermissions(target, action);
+ }
+
+ public List<AccountPermission> listPermissions(String target)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_READ);
+ return accountPermissionStore.listPermissions(target);
+ }
+
+ public List<AclPermission> listPermissions(Object target)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_READ);
+ return aclPermissionStore.listPermissions(target);
+ }
+
+ public boolean grantPermission(String target, String action, String account, AccountType accountType)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_GRANT);
+ return accountPermissionStore.grantPermission(target, action, account, accountType);
+ }
+
+ public boolean grantPermission(Object target, String action, String account, AccountType accountType)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_GRANT);
+ return aclPermissionStore.grantPermission(target, action, account, accountType);
+ }
+
+ public boolean revokePermission(String target, String action, String account, AccountType accountType)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_REVOKE);
+ return accountPermissionStore.revokePermission(target, action, account, accountType);
+ }
+
+ public boolean revokePermission(Object target, String action, String account, AccountType accountType)
+ {
+ Identity.instance().checkPermission(PERMISSION_PERMISSION_NAME, PERMISSION_REVOKE);
+ return aclPermissionStore.revokePermission(target, action, account, accountType);
+ }
+}
Deleted: trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java 2008-03-21 15:28:38 UTC (rev 7674)
+++ trunk/src/main/org/jboss/seam/security/permission/PermissionStore.java 2008-03-21 18:19:52 UTC (rev 7675)
@@ -1,19 +0,0 @@
-package org.jboss.seam.security.permission;
-
-import java.util.List;
-
-import org.jboss.seam.security.permission.AccountPermission.AccountType;
-
-/**
- * Persistent store for user/role permissions
- *
- * @author Shane Bryzak
- */
-public interface PermissionStore
-{
- List<AccountPermission> listPermissions(String target, String action);
- List<AccountPermission> listPermissions(String target);
-
- boolean grantPermission(String target, String action, String account, AccountType accountType);
- boolean revokePermission(String target, String action, String account, AccountType accountType);
-}
17 years, 9 months
Seam SVN: r7674 - branches/Seam_1_2_1_AP/lib.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-03-21 11:28:38 -0400 (Fri, 21 Mar 2008)
New Revision: 7674
Modified:
branches/Seam_1_2_1_AP/lib/el-ri.jar
Log:
fix of unwanted commit
Modified: branches/Seam_1_2_1_AP/lib/el-ri.jar
===================================================================
(Binary files differ)
17 years, 9 months
Seam SVN: r7673 - branches/Seam_1_2_1_AP/examples/itext/view.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-03-21 11:07:08 -0400 (Fri, 21 Mar 2008)
New Revision: 7673
Modified:
branches/Seam_1_2_1_AP/examples/itext/view/chapters.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/format.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/nested.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/pageSize.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/sections.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/signature.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/table.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/whyseam.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/whyseam_html.xhtml
branches/Seam_1_2_1_AP/examples/itext/view/whyseam_rtf.xhtml
Log:
JBPAPP-634 - changed itext example pages
Modified: branches/Seam_1_2_1_AP/examples/itext/view/chapters.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/chapters.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/chapters.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -1,7 +1,7 @@
<p:document xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://jboss.com/products/seam/pdf">
-
+<f:view contentType="text/html"/>
<f:facet name="header">
<p:font size="12">
<p:footer borderWidthTop="1" borderColorTop="blue" borderWidthBottom="0" alignment="center">Why Seam? [<p:pageNumber />]</p:footer>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/format.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/format.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/format.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -6,7 +6,7 @@
subject="seam"
author="Seam Team"
creator="Seam PDF example app">
-
+<f:view contentType="text/html"/>
<p:image alignment="right" wrap="true" resource="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingBefore="16" spacingAfter="40">Order #{currentOrder.orderId} </p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/nested.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/nested.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/nested.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -2,7 +2,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://jboss.com/products/seam/pdf">
-
+<f:view contentType="text/html"/>
<p:image alignment="right" wrap="true" resource="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingAfter="50">Nested Tables</p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/pageSize.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/pageSize.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/pageSize.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -3,6 +3,7 @@
xmlns:p="http://jboss.com/products/seam/pdf"
pageSize="#{param.pageSize}">
+<f:view contentType="text/html"/>
<f:facet name="header">
<p:font size="12">
<p:footer borderWidthTop="1" borderColorTop="blue" borderWidthBottom="0" alignment="center">Why Seam? [<p:pageNumber />]</p:footer>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/sections.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/sections.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/sections.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -1,7 +1,7 @@
<p:document xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://jboss.com/products/seam/pdf">
-
+<f:view contentType="text/html"/>
<p:chapter number="1">
<p:title>
<p:font size="18"><p:paragraph>Getting Started</p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/signature.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/signature.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/signature.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -7,6 +7,7 @@
author="Seam Team"
creator="Seam PDF example app">
+<f:view contentType="text/html"/>
<p:image alignment="right" wrap="true" resource="/jboss.jpg" />
<p:font size="24"><p:paragraph spacingBefore="16" spacingAfter="40">Order #{currentOrder.orderId} </p:paragraph></p:font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/table.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/table.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/table.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -2,6 +2,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns="http://jboss.com/products/seam/pdf">
+<f:view contentType="text/html"/>
+
<image alignment="right" wrap="true" resource="/jboss.jpg" />
<font size="24"><paragraph spacingAfter="50">Table Test</paragraph></font>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/whyseam.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/whyseam.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/whyseam.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -7,6 +7,7 @@
author="Seam Team"
creator="Seam PDF example app">
+<f:view contentType="text/html"/>
<f:facet name="header">
<p:font size="12">
<p:footer borderWidthTop="1" borderColorTop="blue" borderWidthBottom="0" alignment="center">Why Seam? [<p:pageNumber />]</p:footer>
Modified: branches/Seam_1_2_1_AP/examples/itext/view/whyseam_html.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/whyseam_html.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/whyseam_html.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -1,3 +1,5 @@
+<f:view contentType="text/html"/>
+
<p:document xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:p="http://jboss.com/products/seam/pdf"
Modified: branches/Seam_1_2_1_AP/examples/itext/view/whyseam_rtf.xhtml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/view/whyseam_rtf.xhtml 2008-03-21 15:02:02 UTC (rev 7672)
+++ branches/Seam_1_2_1_AP/examples/itext/view/whyseam_rtf.xhtml 2008-03-21 15:07:08 UTC (rev 7673)
@@ -7,6 +7,7 @@
author="Seam Team"
creator="Seam PDF example app">
+<f:view contentType="text/html"/>
<f:facet name="header">
<p:font size="12">
<p:footer borderWidthTop="1" borderColorTop="blue" borderWidthBottom="0" alignment="center">Why Seam? [<p:pageNumber />]</p:footer>
17 years, 9 months
Seam SVN: r7672 - in branches/Seam_1_2_1_AP: examples/glassfish/nbproject and 17 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-03-21 11:02:02 -0400 (Fri, 21 Mar 2008)
New Revision: 7672
Added:
branches/Seam_1_2_1_AP/lib/jsf-api.jar
branches/Seam_1_2_1_AP/lib/jsf-impl.jar
branches/Seam_1_2_1_AP/lib/jsp-api.jar
Removed:
branches/Seam_1_2_1_AP/lib/myfaces-api-1.1.4.jar
branches/Seam_1_2_1_AP/lib/myfaces-impl-1.1.4.jar
Modified:
branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml
branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml
branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml
branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml
branches/Seam_1_2_1_AP/examples/hibernate2/build.xml
branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml
branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml
branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml
branches/Seam_1_2_1_AP/examples/jpa/build.xml
branches/Seam_1_2_1_AP/examples/jpa/lib/mc/commons-logging.jar
branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml
branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml
branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml
branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml
branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml
branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml
branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml
branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml
branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml
branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr
branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml
branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml
branches/Seam_1_2_1_AP/lib/el-api.jar
branches/Seam_1_2_1_AP/lib/el-ri.jar
branches/Seam_1_2_1_AP/lib/servlet-api.jar
branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml
Log:
JBPAPP-679
Modified: branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml
===================================================================
--- branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -662,8 +662,8 @@
el-api.jar
el-ri.jar
jsf-facelets.jar
- myfaces-api.jar
- myfaces-impl.jar
+ jsf-api.jar
+ jsf-impl.jar
jboss-ejb3.jar
jboss-jca.jar
jboss-j2ee.jar
@@ -953,8 +953,8 @@
jboss-microcontainer.jar
jboss-jca.jar
...
- myfaces-api.jar
- myfaces-impl.jar
+ jsf-api.jar
+ jsf-impl.jar
mc-conf.jar/
jndi.properties
log4j.xml
Modified: branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -62,7 +62,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/myfaces-api-1.1.4.jar:../../lib/myfaces-impl-1.1.4.jar</classpath>
+ <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/jsf-api.jar:../../lib/jsf-impl.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified: branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -11,6 +11,11 @@
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_1_2.xsd">
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
+ </application>
+
<!-- Navigation rules for the Booking demo app -->
<navigation-rule>
Modified: branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -29,8 +29,9 @@
<servlet-mapping>
<servlet-name>Seam Resource Servlet</servlet-name>
<url-pattern>/seam/resource/*</url-pattern>
- </servlet-mapping>
-
+ </servlet-mapping>
+
+ <!-- JSF RI -->
<listener>
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
Modified: branches/Seam_1_2_1_AP/examples/hibernate2/build.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/build.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/build.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -150,8 +150,8 @@
<include name="el-api.jar" />
<include name="el-ri.jar" />
<include name="jsf-facelets.jar" />
- <include name="myfaces-api-1.1.4.jar" />
- <include name="myfaces-impl-1.1.4.jar" />
+ <include name="jsf-api.jar" />
+ <include name="jsf-impl.jar" />
<include name="thirdparty-all.jar" />
<include name="commons*.jar" />
</lib>
@@ -212,8 +212,8 @@
<include name="el-api.jar" />
<include name="el-ri.jar" />
<include name="jsf-facelets.jar" />
- <include name="myfaces-api-1.1.4.jar" />
- <include name="myfaces-impl-1.1.4.jar" />
+ <include name="jsf-api.jar" />
+ <include name="jsf-impl.jar" />
<include name="thirdparty-all.jar" />
<include name="commons*.jar" />
</lib>
@@ -267,9 +267,9 @@
<include name="ajax4jsf*.jar" />
<include name="oscache*.jar" />
<include name="jsf-facelets.jar" />
- <include name="myfaces-api-1.1.4.jar" />
- <include name="myfaces-impl-1.1.4.jar" />
- <include name="thirdparty-all.jar" />
+ <include name="jsf-api.jar" />
+ <include name="jsf-impl.jar" />
+ <include name="thirdparty-all.jar" />
<include name="commons*.jar" />
</lib>
<lib dir="${hibernatelib}">
Modified: branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -53,7 +53,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">../../jboss-seam-debug.jar:../../jboss-seam-gen.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/myfaces-api-1.1.4.jar:../../lib/hibernate-all.jar</classpath>
+ <classpath mode="compile">../../jboss-seam-debug.jar:../../jboss-seam-gen.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/jsf-api.jar:../../lib/hibernate-all.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified: branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -10,7 +10,9 @@
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_1_2.xsd">
+
<application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
</application>
Modified: branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -66,9 +66,14 @@
<param-value>true</param-value>
</context-param>
- <!-- MyFaces -->
+ <!-- MyFaces
<listener>
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>-->
+
+ <!-- JSF RI -->
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
<session-config>
Modified: branches/Seam_1_2_1_AP/examples/jpa/build.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/build.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/jpa/build.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -154,8 +154,8 @@
<include name="ajax4jsf*.jar" />
<include name="oscache*.jar" />
<include name="jsf-facelets.jar" />
- <include name="myfaces-api-1.1.4.jar" />
- <include name="myfaces-impl-1.1.4.jar" />
+ <include name="jsf-api.jar" />
+ <include name="jsf-impl.jar" />
<include name="thirdparty-all.jar" />
<include name="commons*.jar" />
</lib>
@@ -214,8 +214,8 @@
<include name="ajax4jsf*.jar" />
<include name="oscache*.jar" />
<include name="jsf-facelets.jar" />
- <include name="myfaces-api-1.1.4.jar" />
- <include name="myfaces-impl-1.1.4.jar" />
+ <include name="jsf-api.jar" />
+ <include name="jsf-impl.jar" />
<include name="thirdparty-all.jar" />
<include name="commons*.jar" />
</lib>
@@ -267,8 +267,8 @@
<include name="ajax4jsf*.jar" />
<include name="oscache*.jar" />
<include name="jsf-facelets.jar" />
- <include name="myfaces-api-1.1.4.jar" />
- <include name="myfaces-impl-1.1.4.jar" />
+ <include name="jsf-api.jar" />
+ <include name="jsf-impl.jar" />
<include name="thirdparty-all.jar" />
<include name="commons*.jar" />
</lib>
Modified: branches/Seam_1_2_1_AP/examples/jpa/lib/mc/commons-logging.jar
===================================================================
(Binary files differ)
Modified: branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -62,7 +62,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/myfaces-api-1.1.4.jar:../../lib/myfaces-impl-1.1.4.jar</classpath>
+ <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/jsf-api.jar:../../lib/jsf-impl-1.1.4.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified: branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -10,7 +10,9 @@
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_1_2.xsd">
+
<application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
</application>
Modified: branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -22,8 +22,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
<application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
- <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
</application>
<lifecycle>
Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -21,14 +21,14 @@
<java>jboss-seam.jar</java>
</module>
- <module>
+ <!-- <module>
<java>el-api.jar</java>
</module>
<module>
<java>el-ri.jar</java>
- </module>
-
+ </module>-->
+
<module>
<java>drools-compiler-4.0.2.jar</java>
</module>
@@ -46,7 +46,7 @@
</module>
<module>
- <java>jcaptcha-all-1.0-RC3.jar</java>
+ <java>jcaptcha-all-1.0-RC4.jar</java>
</module>
</application>
\ No newline at end of file
Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -5,7 +5,8 @@
<faces-config>
<application>
- <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
</application>
<!-- Phase listener needed for all Seam applications -->
Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -33,9 +33,15 @@
<!-- MyFaces -->
+ <!-- <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>-->
+
+ <!-- JSF RI -->
<listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
+
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
Modified: branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -10,7 +10,6 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
<!-- Facelets support -->
<application>
- <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
</application>
Modified: branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -11,7 +11,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
<application>
- <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
</application>
Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -107,7 +107,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/myfaces-impl-1.1.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -693,8 +693,8 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/myfaces-impl-1.1.4.jar" />
- <url>jar://$MODULE_DIR$/../../lib/myfaces-impl-1.1.4.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/jsf-impl.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr 2008-03-21 15:02:02 UTC (rev 7672)
@@ -315,7 +315,7 @@
<library name="jsf">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/myfaces-api-1.1.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/myfaces-impl-1.1.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jsf-impl.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.7.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-collections-3.1.jar!/" />
Modified: branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -11,6 +11,7 @@
<!--
<view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
-->
+ <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
</application>
<!-- Why do I have to define this here again? It's already in wiki.taglib.xml! -->
Modified: branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -72,11 +72,15 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- MyFaces -->
-
+ <!-- MyFaces
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
+ </listener>-->
+
+ <!-- JSF RI -->
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
<!-- Facelets development mode (disable in production) -->
Modified: branches/Seam_1_2_1_AP/lib/el-api.jar
===================================================================
(Binary files differ)
Modified: branches/Seam_1_2_1_AP/lib/el-ri.jar
===================================================================
(Binary files differ)
Added: branches/Seam_1_2_1_AP/lib/jsf-api.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/lib/jsf-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Seam_1_2_1_AP/lib/jsf-impl.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/lib/jsf-impl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Seam_1_2_1_AP/lib/jsp-api.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/lib/jsp-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/Seam_1_2_1_AP/lib/myfaces-api-1.1.4.jar
===================================================================
(Binary files differ)
Deleted: branches/Seam_1_2_1_AP/lib/myfaces-impl-1.1.4.jar
===================================================================
(Binary files differ)
Modified: branches/Seam_1_2_1_AP/lib/servlet-api.jar
===================================================================
(Binary files differ)
Modified: branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml 2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml 2008-03-21 15:02:02 UTC (rev 7672)
@@ -80,7 +80,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-jpdl.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/myfaces-api-1.1.4.jar:lib/myfaces-impl-1.1.4.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath>
+ <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-jpdl.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/jsf-api.jar:lib/jsf-impl.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
17 years, 9 months
Seam SVN: r7671 - branches/Seam_1_2_1_AP/examples/itext/src/org/jboss/seam/example/pdf.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2008-03-21 07:10:44 -0400 (Fri, 21 Mar 2008)
New Revision: 7671
Modified:
branches/Seam_1_2_1_AP/examples/itext/src/org/jboss/seam/example/pdf/Images.java
Log:
JBPAPP-634
Modified: branches/Seam_1_2_1_AP/examples/itext/src/org/jboss/seam/example/pdf/Images.java
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/src/org/jboss/seam/example/pdf/Images.java 2008-03-20 22:11:32 UTC (rev 7670)
+++ branches/Seam_1_2_1_AP/examples/itext/src/org/jboss/seam/example/pdf/Images.java 2008-03-21 11:10:44 UTC (rev 7671)
@@ -1,19 +1,14 @@
package org.jboss.seam.example.pdf;
-import org.jboss.seam.annotations.*;
+import java.awt.Image;
-import java.awt.*;
-import java.awt.image.*;
-import java.awt.geom.*;
-import java.net.URL;
+import org.jboss.seam.annotations.Name;
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.JFreeChart;
+import org.jfree.data.DefaultPieDataset;
+import org.jfree.data.PieDataset;
-import org.jfree.chart.*;
-import org.jfree.data.xy.*;
-import org.jfree.ui.*;
-import org.jfree.data.general.*;
-
-
@Name("images")
public class Images {
private PieDataset getData() {
17 years, 9 months