Seam SVN: r9083 - in trunk/src/rss: META-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-09-22 01:18:22 -0400 (Mon, 22 Sep 2008)
New Revision: 9083
Added:
trunk/src/rss/META-INF/
trunk/src/rss/META-INF/faces-config.xml
trunk/src/rss/META-INF/seam-rss.taglib.xml
Log:
Missing META-INF folder for rss
Added: trunk/src/rss/META-INF/faces-config.xml
===================================================================
--- trunk/src/rss/META-INF/faces-config.xml (rev 0)
+++ trunk/src/rss/META-INF/faces-config.xml 2008-09-22 05:18:22 UTC (rev 9083)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<faces-config version="1.2"
+ 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">
+
+ <component>
+ <component-type>org.jboss.seam.rss.ui.UIFeed</component-type>
+ <component-class>org.jboss.seam.rss.ui.UIFeed</component-class>
+ </component>
+ <component>
+ <component-type>org.jboss.seam.rss.ui.UIEntry</component-type>
+ <component-class>org.jboss.seam.rss.ui.UIEntry</component-class>
+ </component>
+
+</faces-config>
Added: trunk/src/rss/META-INF/seam-rss.taglib.xml
===================================================================
--- trunk/src/rss/META-INF/seam-rss.taglib.xml (rev 0)
+++ trunk/src/rss/META-INF/seam-rss.taglib.xml 2008-09-22 05:18:22 UTC (rev 9083)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+ "facelet-taglib_1_0.dtd">
+
+<facelet-taglib>
+ <namespace>http://jboss.com/products/seam/rss</namespace>
+
+ <tag>
+ <tag-name>feed</tag-name>
+ <component>
+ <component-type>org.jboss.seam.rss.ui.UIFeed</component-type>
+ </component>
+ </tag>
+
+ <tag>
+ <tag-name>entry</tag-name>
+ <component>
+ <component-type>org.jboss.seam.rss.ui.UIEntry</component-type>
+ </component>
+ </tag>
+
+</facelet-taglib>
+
16 years, 2 months
Seam SVN: r9082 - branches/community/Seam_2_0/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-21 23:03:30 -0400 (Sun, 21 Sep 2008)
New Revision: 9082
Modified:
branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
Log:
JBSEAM-3440
Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
===================================================================
--- branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 03:02:30 UTC (rev 9081)
+++ branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 03:03:30 UTC (rev 9082)
@@ -144,7 +144,7 @@
{
throw new IllegalStateException("cannot passivate persistence context with active transaction");
}
- if ( session!=null && !session.isDirty() )
+ if ( session!=null && session.isOpen() && !session.isDirty() )
{
session.close();
session = null;
@@ -212,7 +212,7 @@
{
log.debug("destroying seam managed session for session factory: " + sessionFactoryJndiName);
}
- if (session!=null)
+ if (session!=null && session.isOpen())
{
session.close();
}
Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
===================================================================
--- branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 03:02:30 UTC (rev 9081)
+++ branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 03:03:30 UTC (rev 9082)
@@ -205,7 +205,7 @@
log.debug("destroying seam managed persistence context for persistence unit: " + persistenceUnitJndiName);
}
- if (entityManager!=null)
+ if (entityManager!=null && entityManager.isOpen())
{
entityManager.close();
}
16 years, 2 months
Seam SVN: r9081 - trunk/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-21 23:02:30 -0400 (Sun, 21 Sep 2008)
New Revision: 9081
Modified:
trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
Log:
JBSEAM-3440
Modified: trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
===================================================================
--- trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 02:37:37 UTC (rev 9080)
+++ trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 03:02:30 UTC (rev 9081)
@@ -150,7 +150,7 @@
{
throw new IllegalStateException("cannot passivate persistence context with active transaction");
}
- if ( session!=null && !session.isDirty() )
+ if ( session!=null && session.isOpen() && !session.isDirty() )
{
session.close();
session = null;
@@ -218,7 +218,7 @@
{
log.debug("destroying seam managed session for session factory: " + sessionFactoryJndiName);
}
- if (session!=null)
+ if (session!=null && session.isOpen())
{
session.close();
}
Modified: trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 02:37:37 UTC (rev 9080)
+++ trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 03:02:30 UTC (rev 9081)
@@ -206,7 +206,7 @@
log.debug("destroying seam managed persistence context for persistence unit: " + persistenceUnitJndiName);
}
- if (entityManager!=null)
+ if (entityManager!=null && entityManager.isOpen())
{
entityManager.close();
}
16 years, 2 months
Seam SVN: r9080 - trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-21 22:37:37 -0400 (Sun, 21 Sep 2008)
New Revision: 9080
Modified:
trunk/seam21migration.txt
Log:
JBSEAM-3422
Modified: trunk/seam21migration.txt
===================================================================
--- trunk/seam21migration.txt 2008-09-22 02:04:52 UTC (rev 9079)
+++ trunk/seam21migration.txt 2008-09-22 02:37:37 UTC (rev 9080)
@@ -82,7 +82,14 @@
requiring that it is configured with the security rules instead of Identity:
<security:rule-based-permission-resolver security-rules="#{securityRules}"/>
+
+Identity.isLoggedIn()
+---------------------
+This method has been modified so that it doesn't attempt to perform an authentication if credentials
+have been set. Instead, it will simply return true if the user is currently authenticated. If you
+require the previous behaviour, then please use Identity.tryLogin() instead.
+
PDF (iText)
--------
16 years, 2 months
Seam SVN: r9079 - trunk/src/main/org/jboss/seam/security.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-21 22:04:52 -0400 (Sun, 21 Sep 2008)
New Revision: 9079
Modified:
trunk/src/main/org/jboss/seam/security/Identity.java
Log:
JBSEAM-3422
Modified: trunk/src/main/org/jboss/seam/security/Identity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/Identity.java 2008-09-22 01:46:37 UTC (rev 9078)
+++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-09-22 02:04:52 UTC (rev 9079)
@@ -141,23 +141,41 @@
return instance;
}
+ /**
+ * Simple check that returns true if the user is logged in, without attempting to authenticate
+ *
+ * @return true if the user is logged in
+ */
public boolean isLoggedIn()
{
- return isLoggedIn(true);
+ // If there is a principal set, then the user is logged in.
+ return getPrincipal() != null;
}
+ /**
+ * Will attempt to authenticate quietly if the user's credentials are set and they haven't
+ * authenticated already. A quiet authentication doesn't throw any exceptions if authentication
+ * fails.
+ *
+ * @return true if the user is logged in, false otherwise
+ */
+ public boolean tryLogin()
+ {
+ if (!authenticating && getPrincipal() == null && credentials.isSet() &&
+ Contexts.isEventContextActive() &&
+ !Contexts.getEventContext().isSet(LOGIN_TRIED))
+ {
+ Contexts.getEventContext().set(LOGIN_TRIED, true);
+ quietLogin();
+ }
+
+ return isLoggedIn();
+ }
+
+ @Deprecated
public boolean isLoggedIn(boolean attemptLogin)
{
- if (!authenticating && attemptLogin && getPrincipal() == null && credentials.isSet() &&
- Contexts.isEventContextActive() &&
- !Contexts.getEventContext().isSet(LOGIN_TRIED))
- {
- Contexts.getEventContext().set(LOGIN_TRIED, true);
- quietLogin();
- }
-
- // If there is a principal set, then the user is logged in.
- return getPrincipal() != null;
+ return attemptLogin ? tryLogin() : isLoggedIn();
}
public Principal getPrincipal()
@@ -217,7 +235,7 @@
{
try
{
- if (isLoggedIn(false))
+ if (isLoggedIn())
{
// If authentication has already occurred during this request via a silent login,
// and login() is explicitly called then we still want to raise the LOGIN_SUCCESSFUL event,
@@ -234,14 +252,14 @@
authenticate();
- if (!isLoggedIn(false))
+ if (!isLoggedIn())
{
throw new LoginException();
}
if ( log.isDebugEnabled() )
{
- log.debug("Login successful for: " + getUsername());
+ log.debug("Login successful for: " + getCredentials().getUsername());
}
if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
@@ -253,7 +271,7 @@
if ( log.isDebugEnabled() )
{
- log.debug("Login failed for: " + getUsername(), ex);
+ log.debug("Login failed for: " + getCredentials().getUsername(), ex);
}
if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_FAILED, ex);
}
@@ -273,12 +291,12 @@
if (Events.exists()) Events.instance().raiseEvent(EVENT_QUIET_LOGIN);
// Ensure that we haven't been authenticated as a result of the EVENT_QUIET_LOGIN event
- if (!isLoggedIn(false))
+ if (!isLoggedIn())
{
if (credentials.isSet())
{
authenticate();
- if (isLoggedIn(false) && Contexts.isEventContextActive())
+ if (isLoggedIn() && Contexts.isEventContextActive())
{
Contexts.getEventContext().set(SILENT_LOGIN, true);
}
@@ -299,7 +317,7 @@
throws LoginException
{
// If we're already authenticated, then don't authenticate again
- if (!isLoggedIn(false) && !credentials.isInvalid())
+ if (!isLoggedIn() && !credentials.isInvalid())
{
principal = null;
subject = new Subject();
@@ -395,7 +413,7 @@
public void logout()
{
- if (isLoggedIn(false))
+ if (isLoggedIn())
{
unAuthenticate();
Session.instance().invalidate();
@@ -414,7 +432,7 @@
if (!securityEnabled) return true;
if (systemOp != null && Boolean.TRUE.equals(systemOp.get())) return true;
- isLoggedIn(true);
+ tryLogin();
for ( Group sg : getSubject().getPrincipals(Group.class) )
{
@@ -495,7 +513,7 @@
*/
public void checkRole(String role)
{
- isLoggedIn(true);
+ tryLogin();
if ( !hasRole(role) )
{
@@ -526,7 +544,7 @@
{
if (systemOp != null && Boolean.TRUE.equals(systemOp.get())) return;
- isLoggedIn(true);
+ tryLogin();
if ( !hasPermission(name, action, arg) )
{
@@ -548,7 +566,7 @@
{
if (systemOp != null && Boolean.TRUE.equals(systemOp.get())) return;
- isLoggedIn(true);
+ tryLogin();
if ( !hasPermission(target, action) )
{
16 years, 2 months
Seam SVN: r9078 - trunk/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-21 21:46:37 -0400 (Sun, 21 Sep 2008)
New Revision: 9078
Modified:
trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
Log:
JBSEAM-3440
Modified: trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
===================================================================
--- trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 01:45:18 UTC (rev 9077)
+++ trunk/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 01:46:37 UTC (rev 9078)
@@ -253,7 +253,7 @@
public void changeFlushMode(FlushModeType flushMode)
{
- if (session!=null)
+ if (session!=null && session.isOpen())
{
setSessionFlushMode(flushMode);
}
Modified: trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 01:45:18 UTC (rev 9077)
+++ trunk/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 01:46:37 UTC (rev 9078)
@@ -283,7 +283,7 @@
public void changeFlushMode(FlushModeType flushMode)
{
- if (entityManager!=null)
+ if (entityManager!=null && entityManager.isOpen())
{
setEntityManagerFlushMode(flushMode);
}
16 years, 2 months
Seam SVN: r9077 - branches/community/Seam_2_0/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-21 21:45:18 -0400 (Sun, 21 Sep 2008)
New Revision: 9077
Modified:
branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
Log:
don't attempt to change flush mode if persistence manager is already closed
Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java
===================================================================
--- branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-21 23:55:14 UTC (rev 9076)
+++ branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedHibernateSession.java 2008-09-22 01:45:18 UTC (rev 9077)
@@ -247,7 +247,7 @@
public void changeFlushMode(FlushModeType flushMode)
{
- if (session!=null)
+ if (session!=null && session.isOpen())
{
setSessionFlushMode(flushMode);
}
Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java
===================================================================
--- branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-21 23:55:14 UTC (rev 9076)
+++ branches/community/Seam_2_0/src/main/org/jboss/seam/persistence/ManagedPersistenceContext.java 2008-09-22 01:45:18 UTC (rev 9077)
@@ -282,7 +282,7 @@
public void changeFlushMode(FlushModeType flushMode)
{
- if (entityManager!=null)
+ if (entityManager!=null && entityManager.isOpen())
{
setEntityManagerFlushMode(flushMode);
}
16 years, 2 months
Seam SVN: r9076 - in trunk/examples/seamspace: view and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-21 19:55:14 -0400 (Sun, 21 Sep 2008)
New Revision: 9076
Modified:
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ImagePermission.java
trunk/examples/seamspace/view/imagepermissiondetail.page.xml
Log:
JBSEAM-3315
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ImagePermission.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ImagePermission.java 2008-09-21 23:44:52 UTC (rev 9075)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/ImagePermission.java 2008-09-21 23:55:14 UTC (rev 9076)
@@ -14,6 +14,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Conversation;
+import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.security.Role;
import org.jboss.seam.security.SimplePrincipal;
import org.jboss.seam.security.management.IdentityManager;
@@ -114,8 +115,9 @@
this.selectedActions = selectedActions;
}
- public void applyPermissions()
+ public String applyPermissions()
{
+ // If the recipient isn't null, it means we're editing existing permissions
if (recipient != null)
{
List<Permission> grantedPermissions = new ArrayList<Permission>();
@@ -140,8 +142,15 @@
if (!grantedPermissions.isEmpty()) permissionManager.grantPermissions(grantedPermissions);
if (!revokedPermissions.isEmpty()) permissionManager.revokePermissions(revokedPermissions);
}
+ // otherwise this is a set of new permissions
else
{
+ if (selectedActions.size() == 0)
+ {
+ FacesMessages.instance().add("You must select at least one action");
+ return "failure";
+ }
+
List<Permission> permissions = new ArrayList<Permission>();
for (String role : selectedRoles)
@@ -171,6 +180,7 @@
permissionManager.grantPermissions(permissions);
}
Conversation.instance().endBeforeRedirect();
+ return "success";
}
public List<Member> getAvailableFriends()
Modified: trunk/examples/seamspace/view/imagepermissiondetail.page.xml
===================================================================
--- trunk/examples/seamspace/view/imagepermissiondetail.page.xml 2008-09-21 23:44:52 UTC (rev 9075)
+++ trunk/examples/seamspace/view/imagepermissiondetail.page.xml 2008-09-21 23:55:14 UTC (rev 9076)
@@ -4,6 +4,8 @@
<page>
<navigation from-action="#{imagePermission.applyPermissions}">
- <redirect view-id="/imagepermissions.xhtml"/>
+ <rule if-outcome="success">
+ <redirect view-id="/imagepermissions.xhtml"/>
+ </rule>
</navigation>
</page>
\ No newline at end of file
16 years, 2 months
Seam SVN: r9075 - in trunk: build and 2 other directories.
by seam-commits＠lists.jboss.org
Author: danielc.roth
Date: 2008-09-21 19:44:52 -0400 (Sun, 21 Sep 2008)
New Revision: 9075
Added:
trunk/build/rss.pom.xml
Removed:
trunk/src/rss/build.xml
Modified:
trunk/build.xml
trunk/build/build.xml
trunk/build/classpath.tmpl
trunk/build/common.build.xml
trunk/build/root.pom.xml
trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java
Log:
JBSEAM-3423 RSS feed as module. yarfraw and httpclient-3.1 added in mvn repo.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -46,6 +46,7 @@
<deployWithSources pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar"/>
<deployWithSources pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/>
<deployWithSources pom="${excel.pom}" jar="${lib.dir}/jboss-seam-excel.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-excel-sources.jar"/>
+ <deployWithSources pom="${rss.pom}" jar="${lib.dir}/jboss-seam-rss.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-rss-sources.jar"/>
<deployWithSources pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/>
<deployWithSources pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/>
<deployWithSources pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" repositoryId="offline.repository.jboss.org" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/>
@@ -124,6 +125,7 @@
<offline pom="remoting.pom" repository="${offline.repository.jboss.org}" />
<offline pom="pdf.pom" repository="${offline.repository.jboss.org}" />
<offline pom="excel.pom" repository="${offline.repository.jboss.org}" />
+ <offline pom="rss.pom" repository="${offline.repository.jboss.org}" />
<offline pom="mail.pom" repository="${offline.repository.jboss.org}" />
<offline pom="ioc.pom" repository="${offline.repository.jboss.org}" />
<offline pom="gen.pom" repository="${offline.repository.jboss.org}" />
Modified: trunk/build/classpath.tmpl
===================================================================
--- trunk/build/classpath.tmpl 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/classpath.tmpl 2008-09-21 23:44:52 UTC (rev 9075)
@@ -9,7 +9,8 @@
<classpathentry kind="src" path="src/mail"/>
<classpathentry kind="src" path="src/pdf"/>
<classpathentry kind="src" path="src/excel"/>
- <classpathentry kind="src" path="src/debug"/>
+ <classpathentry kind="src" path="src/excel"/>
+ <classpathentry kind="src" path="src/rss"/>
<classpathentry kind="src" path="src/gen"/>
<classpathentry kind="src" path="src/interop/jul"/>
<classpathentry kind="src" path="src/test/unit"/>
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/common.build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -107,6 +107,7 @@
<pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" />
<pomfile name="pdf.pom" value="${build.dir}/pdf.pom.xml" />
<pomfile name="excel.pom" value="${build.dir}/excel.pom.xml" />
+ <pomfile name="rss.pom" value="${build.dir}/rss.pom.xml" />
<pomfile name="remoting.pom" value="${build.dir}/remoting.pom.xml" />
<pomfile name="ui.pom" value="${build.dir}/ui.pom.xml" />
<pomfile name="docs.pom" value="${build.dir}/docs.pom.xml" />
@@ -132,6 +133,7 @@
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="compile" />
+ <copyDependencies id="rss" pom="${rss.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
@@ -150,6 +152,8 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-resteasy" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-excel" version="${complete.version}" />
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-rss" version="${complete.version}" />
</copyInlineDependencies>
<property name="copyseamdone" value="true" />
</target>
@@ -187,6 +191,7 @@
<deploy pom="${resteasy.pom}" jar="${seam.dir}/lib/jboss-seam-resteasy.jar" repositoryId="@{repositoryId}" />
<deploy pom="${pdf.pom}" jar="${seam.dir}/lib/jboss-seam-pdf.jar" repositoryId="@{repositoryId}" />
<deploy pom="${excel.pom}" jar="${seam.dir}/lib/jboss-seam-excel.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${rss.pom}" jar="${seam.dir}/lib/jboss-seam-rss.jar" repositoryId="@{repositoryId}" />
<deploy pom="${mail.pom}" jar="${seam.dir}/lib/jboss-seam-mail.jar" repositoryId="@{repositoryId}" />
<deploy pom="${ioc.pom}" jar="${seam.dir}/lib/jboss-seam-ioc.jar" repositoryId="@{repositoryId}" />
<deploy pom="${gen.pom}" jar="${seam.dir}/lib/jboss-seam-gen.jar" repositoryId="@{repositoryId}" />
@@ -212,7 +217,6 @@
<propertyref name="remoting.pom" />
<propertyref name="resteasy.pom" />
<propertyref name="gen.pom" />
- <propertyref name="pdf.pom" />
<propertyref name="excel.pom" />
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build/root.pom.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -549,6 +549,30 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.yarfraw</groupId>
+ <artifactId>yarfraw</artifactId>
+ <version>0.92</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>javassist</groupId>
Added: trunk/build/rss.pom.xml
===================================================================
--- trunk/build/rss.pom.xml (rev 0)
+++ trunk/build/rss.pom.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-rss</artifactId>
+
+
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
+
+ <!-- See parent pom for notes on how to declare dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.yarfraw</groupId>
+ <artifactId>yarfraw</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -18,6 +18,7 @@
<property name="classes.excel.dir" value="${classes.dir}/excelclasses" />
<property name="classes.ioc.dir" value="${classes.dir}/iocclasses" />
<property name="classes.mail.dir" value="${classes.dir}/mailclasses" />
+ <property name="classes.rss.dir" value="${classes.dir}/rssclasses" />
<property name="classes.debug.dir" value="${classes.dir}/debugclasses" />
<property name="classes.wicket.dir" value="${classes.dir}/wicketclasses" />
<property name="classes.jul.dir" value="${classes.dir}/julclasses" />
@@ -39,6 +40,7 @@
<property name="src.ioc.dir" value="src/ioc" />
<property name="src.mail.dir" value="src/mail" />
<property name="src.debug.dir" value="src/debug" />
+ <property name="src.rss.dir" value="src/rss" />
<property name="src.wicket.dir" value="src/wicket" />
<property name="src.jul.dir" value="src/interop/jul" />
<property name="src.resteasy.dir" value="src/resteasy" />
@@ -73,6 +75,7 @@
<property name="dist.src.pdf.dir" value="${dist.dir}/src/pdf" />
<property name="dist.src.ioc.dir" value="${dist.dir}/src/ioc" />
<property name="dist.src.mail.dir" value="${dist.dir}/src/mail" />
+ <property name="dist.src.rss.dir" value="${dist.dir}/src/rss" />
<property name="dist.src.debug.dir" value="${dist.dir}/src/debug" />
<property name="dist.src.wicket.dir" value="${dist.dir}/src/wicket" />
<property name="dist.src.jul.dir" value="${dist.dir}/src/interop/jul" />
@@ -163,7 +166,7 @@
<delete dir="${lib.dir}" quiet="${quietclean}" />
</target>
- <target name="build" depends="jarcore,jarexcel,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
+ <target name="build" depends="jarcore,jarexcel,jarrss,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
<target name="select-compiler">
<available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
@@ -248,6 +251,21 @@
</target>
+ <!-- ########################### RSS TARGETS ###########################-->
+
+ <target name="initrss" depends="init, jarcore, jarui">
+ <init classesdir="${classes.rss.dir}" srcdir="${src.rss.dir}" modulename="rss" pom="${rss.pom}" />
+ </target>
+
+ <target name="compilerss" depends="initrss, select-compiler">
+ <compile classesdir="${classes.rss.dir}" srcdir="${src.rss.dir}" classpath="compile.rss.path" />
+ </target>
+
+ <target name="jarrss" depends="compilerss" description="Build the distribution .jar file for the RSS package">
+ <archive classesdir="${classes.rss.dir}" module="jboss-seam-rss" pom="${rss.pom}" srcdir="${src.rss.dir}" />
+ </target>
+
+
<!-- ########################### IOC TARGETS ###########################-->
<target name="initioc" depends="init, jarcore">
@@ -501,6 +519,7 @@
<target name="copysource">
<copysource destdir="${dist.src.core.dir}" srcdir="${src.core.dir}" />
<copysource destdir="${dist.src.pdf.dir}" srcdir="${src.pdf.dir}" />
+ <copysource destdir="${dist.src.rss.dir}" srcdir="${src.rss.dir}" />
<copysource destdir="${dist.src.excel.dir}" srcdir="${src.excel.dir}" />
<copysource destdir="${dist.src.ioc.dir}" srcdir="${src.ioc.dir}" />
<copysource destdir="${dist.src.remoting.dir}" srcdir="${src.remoting.dir}" />
@@ -1055,6 +1074,7 @@
<propertyref name="gen.pom" />
<propertyref name="pdf.pom" />
<propertyref name="excel.pom" />
+ <propertyref name="rss.pom" />
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
@@ -1077,6 +1097,7 @@
<dependenciesWithSources id="mail" scope="compile" pom="${mail.pom}" />
<dependenciesWithSources id="pdf" scope="compile" pom="${pdf.pom}" />
<dependenciesWithSources id="excel" scope="compile" pom="${excel.pom}" />
+ <dependenciesWithSources id="rss" scope="compile" pom="${rss.pom}" />
<dependenciesWithSources id="remoting" scope="compile" pom="${remoting.pom}" />
<dependenciesWithSources id="ui" scope="compile" pom="${ui.pom}" />
</target>
@@ -1097,6 +1118,7 @@
<dependencies id="mail" scope="compile" pom="${mail.pom}" />
<dependencies id="pdf" scope="compile" pom="${pdf.pom}" />
<dependencies id="excel" scope="compile" pom="${excel.pom}" />
+ <dependencies id="rss" scope="compile" pom="${rss.pom}" />
<dependencies id="remoting" scope="compile" pom="${remoting.pom}" />
<dependencies id="ui" scope="compile" pom="${ui.pom}" />
<eclipseClasspath tofile=".classpath" file="${build.dir}/classpath.tmpl" filterProperty="automagic.classpath.entries">
@@ -1107,6 +1129,7 @@
<path refid="compile.mail.path" />
<path refid="compile.pdf.path" />
<path refid="compile.excel.path" />
+ <path refid="compile.rss.path" />
<path refid="compile.remoting.path" />
<path refid="compile.ui.path" />
<path refid="compile.jul.path" />
Deleted: trunk/src/rss/build.xml
===================================================================
--- trunk/src/rss/build.xml 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/src/rss/build.xml 2008-09-21 23:44:52 UTC (rev 9075)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<project name="Concept" default="jar" basedir=".">
-
- <fileset id="lib" dir="../../lib">
- <include name="*.jar" />
- </fileset>
-
- <fileset id="yarfraw" dir="c:/java/lib/yarfraw-0.92-bin-all">
- <include name="*.jar" />
- </fileset>
-
- <path id="build.classpath">
- <fileset refid="lib" />
- <fileset refid="yarfraw" />
- </path>
-
- <target name="compile">
- <javac srcdir="." destdir="." classpathref="build.classpath" debug="on" source="1.5" />
- </target>
-
- <target name="jar" depends="compile">
- <jar destfile="jboss-seam-rss.jar" basedir="." />
- </target>
-</project>
Modified: trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java
===================================================================
--- trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java 2008-09-21 23:26:58 UTC (rev 9074)
+++ trunk/src/rss/org/jboss/seam/rss/ui/UIFeed.java 2008-09-21 23:44:52 UTC (rev 9075)
@@ -75,7 +75,11 @@
try {
FeedWriter.writeChannel(DEFAULT_FEED_FORMAT, channelFeed, byteStream);
} catch (YarfrawException e) {
- throw new IOException("Could not create feed", e);
+ /**
+ * Was IOException, but 1.5 does not have this constructor
+ * http://java.sun.com/j2se/1.5.0/docs/api/java/io/IOException.html
+ */
+ throw new RuntimeException("Could not create feed", e);
}
Writer responseWriter = ((HttpServletResponse)facesContext.getExternalContext().getResponse()).getWriter();
HttpServletResponse response = (HttpServletResponse)facesContext.getExternalContext().getResponse();
16 years, 2 months
Seam SVN: r9074 - trunk/examples/seamspace/src/org/jboss/seam/example/seamspace.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-21 19:26:58 -0400 (Sun, 21 Sep 2008)
New Revision: 9074
Modified:
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberImage.java
Log:
JBSEAM-3315
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberImage.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberImage.java 2008-09-21 22:44:44 UTC (rev 9073)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/MemberImage.java 2008-09-21 23:26:58 UTC (rev 9074)
@@ -14,7 +14,7 @@
@Permissions({
@Permission(action = "view"),
- @Permission(action = "comment")
+ @Permission(action = "foo")
})
@Entity
public class MemberImage implements Serializable
16 years, 2 months