Seam SVN: r9626 - trunk/src/main/org/jboss/seam/security.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:43:05 -0500 (Mon, 24 Nov 2008)
New Revision: 9626
Modified:
trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java
Log:
fix use of deprecated method
Modified: trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java 2008-11-24 17:36:55 UTC (rev 9625)
+++ trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java 2008-11-24 17:43:05 UTC (rev 9626)
@@ -74,7 +74,7 @@
Identity identity = Identity.instance();
- identity.isLoggedIn(true);
+ identity.tryLogin();
PersistenceProvider provider = PersistenceProvider.instance();
Class beanClass = provider.getBeanClass(entity);
15 years, 5 months
Seam SVN: r9625 - trunk/src/test/unit/org/jboss/seam/test/unit.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:36:55 -0500 (Mon, 24 Nov 2008)
New Revision: 9625
Modified:
trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java
Log:
JBSEAM-3746
Modified: trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java 2008-11-24 17:35:57 UTC (rev 9624)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/AbstractPageTest.java 2008-11-24 17:36:55 UTC (rev 9625)
@@ -17,8 +17,6 @@
import org.jboss.seam.mock.MockExternalContext;
import org.jboss.seam.mock.MockFacesContext;
import org.jboss.seam.navigation.Pages;
-import org.jboss.seam.test.unit.PageActionsTest.NoRedirectFacesManager;
-import org.jboss.seam.test.unit.component.TestActions;
import org.jboss.seam.util.Conversions;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
15 years, 5 months
Seam SVN: r9624 - trunk/src/excel/org/jboss/seam/excel/jxl.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:35:57 -0500 (Mon, 24 Nov 2008)
New Revision: 9624
Modified:
trunk/src/excel/org/jboss/seam/excel/jxl/JXLHelper.java
Log:
fix broken javadoc
Modified: trunk/src/excel/org/jboss/seam/excel/jxl/JXLHelper.java
===================================================================
--- trunk/src/excel/org/jboss/seam/excel/jxl/JXLHelper.java 2008-11-24 17:35:10 UTC (rev 9623)
+++ trunk/src/excel/org/jboss/seam/excel/jxl/JXLHelper.java 2008-11-24 17:35:57 UTC (rev 9624)
@@ -624,8 +624,7 @@
* @param data The contents of the cell
* @param cellFormat The cell format settings of the cell
* @return The prepared cell representation
- * @see <a * href="http://jexcelapi.sourceforge.net/resources/javadocs/2_6/docs/jxl/write/Wr..."
- * >WritableCell< /a>
+ * @see <a href="http://jexcelapi.sourceforge.net/resources/javadocs/2_6/docs/jxl/write/Wr...">WritableCell</a>
*/
public static WritableCell createCell(int column, int row, CellType type, Object data, WritableCellFormat cellFormat)
{
15 years, 5 months
Seam SVN: r9623 - trunk/src/pdf/org/jboss/seam/pdf/ui.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:35:10 -0500 (Mon, 24 Nov 2008)
New Revision: 9623
Modified:
trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java
trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java
trunk/src/pdf/org/jboss/seam/pdf/ui/UITable.java
Log:
JBSEAM-3746
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java 2008-11-24 17:33:15 UTC (rev 9622)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIField.java 2008-11-24 17:35:10 UTC (rev 9623)
@@ -5,7 +5,6 @@
import java.util.Map;
import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import org.jboss.seam.contexts.Contexts;
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java 2008-11-24 17:33:15 UTC (rev 9622)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIForm.java 2008-11-24 17:35:10 UTC (rev 9623)
@@ -1,9 +1,6 @@
package org.jboss.seam.pdf.ui;
import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UITable.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UITable.java 2008-11-24 17:33:15 UTC (rev 9622)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UITable.java 2008-11-24 17:35:10 UTC (rev 9623)
@@ -1,13 +1,14 @@
package org.jboss.seam.pdf.ui;
-import java.awt.Color;
-
import javax.faces.context.FacesContext;
import org.jboss.seam.pdf.ITextUtils;
-import com.lowagie.text.*;
-import com.lowagie.text.pdf.*;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Image;
+import com.lowagie.text.Phrase;
+import com.lowagie.text.pdf.PdfPCell;
+import com.lowagie.text.pdf.PdfPTable;
public class UITable extends ITextComponent
{
15 years, 5 months
Seam SVN: r9622 - trunk/src/remoting/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:33:15 -0500 (Mon, 24 Nov 2008)
New Revision: 9622
Modified:
trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java
Log:
JBSEAM-3746
Modified: trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-11-24 17:31:44 UTC (rev 9621)
+++ trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-11-24 17:33:15 UTC (rev 9622)
@@ -337,10 +337,6 @@
{
if (m.getAnnotation(WebRemote.class) == null) continue;
- WebRemote webRemote = m.getAnnotation(WebRemote.class);
-
- String[] excludes = webRemote.exclude();
-
// Append the return type to the source block
appendTypeSource(out, m.getGenericReturnType(), types);
Modified: trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java 2008-11-24 17:31:44 UTC (rev 9621)
+++ trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java 2008-11-24 17:33:15 UTC (rev 9622)
@@ -1,10 +1,10 @@
package org.jboss.seam.remoting;
+import java.io.IOException;
import java.io.OutputStream;
-import java.io.IOException;
+
import org.jboss.seam.remoting.wrapper.BeanWrapper;
import org.jboss.seam.remoting.wrapper.Wrapper;
-import java.util.List;
/**
*
15 years, 5 months
Seam SVN: r9621 - in trunk/src/main/org/jboss/seam: contexts and 10 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:31:44 -0500 (Mon, 24 Nov 2008)
New Revision: 9621
Modified:
trunk/src/main/org/jboss/seam/annotations/Begin.java
trunk/src/main/org/jboss/seam/annotations/Logger.java
trunk/src/main/org/jboss/seam/annotations/Out.java
trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java
trunk/src/main/org/jboss/seam/core/EventInterceptor.java
trunk/src/main/org/jboss/seam/document/DocumentStore.java
trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java
trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java
trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java
trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java
trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
trunk/src/main/org/jboss/seam/mock/MockViewHandler.java
trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java
trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java
trunk/src/main/org/jboss/seam/security/openid/OpenId.java
trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java
trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java
trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java
trunk/src/main/org/jboss/seam/web/IdentityFilter.java
trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java
Log:
JBSEAM-3746
Modified: trunk/src/main/org/jboss/seam/annotations/Begin.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/Begin.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/annotations/Begin.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -2,6 +2,7 @@
package org.jboss.seam.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: trunk/src/main/org/jboss/seam/annotations/Logger.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/Logger.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/annotations/Logger.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,7 +1,7 @@
//$Id$
package org.jboss.seam.annotations;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Documented;
Modified: trunk/src/main/org/jboss/seam/annotations/Out.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/Out.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/annotations/Out.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -6,15 +6,16 @@
*/
package org.jboss.seam.annotations;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.jboss.seam.ScopeType;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
/**
* Specifies that a seam component should be outjected from
* the annotated field or getter method of a session bean.
Modified: trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/contexts/FacesLifecycle.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -11,7 +11,6 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseId;
-import javax.servlet.ServletRequest;
import org.jboss.seam.ScopeType;
import org.jboss.seam.log.LogProvider;
Modified: trunk/src/main/org/jboss/seam/core/EventInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/EventInterceptor.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/core/EventInterceptor.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,6 +1,7 @@
package org.jboss.seam.core;
import java.lang.reflect.Method;
+
import org.jboss.seam.annotations.RaiseEvent;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
Modified: trunk/src/main/org/jboss/seam/document/DocumentStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/document/DocumentStore.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/document/DocumentStore.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -4,7 +4,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.faces.FacesException;
import javax.faces.application.ViewHandler;
import javax.faces.context.FacesContext;
Modified: trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/drools/DroolsActionHandler.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,6 +1,7 @@
package org.jboss.seam.drools;
import java.util.List;
+
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
Modified: trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/drools/DroolsAssignmentHandler.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,6 +1,7 @@
package org.jboss.seam.drools;
import java.util.List;
+
import org.drools.WorkingMemory;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.taskmgmt.def.AssignmentHandler;
Modified: trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/drools/DroolsDecisionHandler.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,6 +1,7 @@
package org.jboss.seam.drools;
import java.util.List;
+
import org.drools.WorkingMemory;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.node.DecisionHandler;
Modified: trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -6,11 +6,9 @@
package org.jboss.seam.init;
import java.net.URI;
-import java.net.URISyntaxException;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
-import org.testng.Assert;
/**
* <p>Converts an <a href="http://www.w3.org/TR/xml-names/">XML namespace</a> to a Java package name.</p>
Modified: trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/mock/AbstractSeamTest.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -51,7 +51,6 @@
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.faces.Renderer;
import org.jboss.seam.init.Initialization;
-import org.jboss.seam.jsf.SeamApplication;
import org.jboss.seam.jsf.SeamPhaseListener;
import org.jboss.seam.mail.MailSession;
import org.jboss.seam.pageflow.Pageflow;
Modified: trunk/src/main/org/jboss/seam/mock/MockViewHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/MockViewHandler.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/mock/MockViewHandler.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -8,7 +8,6 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import org.jboss.seam.util.Faces;
import org.jboss.seam.util.Strings;
public class MockViewHandler extends ViewHandler {
Modified: trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/security/EntityPermissionChecker.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -9,7 +9,6 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
Modified: trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/security/management/action/UserSearch.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -12,7 +12,6 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelection;
-
import org.jboss.seam.security.management.IdentityManager;
@Name("org.jboss.seam.security.management.userSearch")
Modified: trunk/src/main/org/jboss/seam/security/openid/OpenId.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/openid/OpenId.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/security/openid/OpenId.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,27 +1,34 @@
package org.jboss.seam.security.openid;
+import java.io.IOException;
import java.io.Serializable;
-
-import org.openid4java.*;
-import org.openid4java.consumer.*;
-import org.openid4java.discovery.*;
-import org.openid4java.message.*;
-import org.openid4java.message.ax.*;
-
import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.*;
-
-import org.jboss.seam.annotations.*;
-import org.jboss.seam.*;
-import org.jboss.seam.faces.*;
-import org.jboss.seam.core.*;
-import org.jboss.seam.security.*;
-
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletRequest;
+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.faces.FacesManager;
+import org.jboss.seam.faces.Redirect;
+import org.jboss.seam.security.Identity;
+import org.openid4java.OpenIDException;
+import org.openid4java.consumer.ConsumerException;
+import org.openid4java.consumer.ConsumerManager;
+import org.openid4java.consumer.VerificationResult;
+import org.openid4java.discovery.DiscoveryInformation;
+import org.openid4java.discovery.Identifier;
+import org.openid4java.message.AuthRequest;
+import org.openid4java.message.AuthSuccess;
+import org.openid4java.message.ParameterList;
+import org.openid4java.message.ax.AxMessage;
+import org.openid4java.message.ax.FetchRequest;
+import org.openid4java.message.ax.FetchResponse;
+
@Name("openid")
@Install(precedence=Install.BUILT_IN, classDependencies="org.openid4java.consumer.ConsumerManager")
@Scope(ScopeType.SESSION)
Modified: trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/security/openid/OpenIdPhaseListener.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,11 +1,16 @@
package org.jboss.seam.security.openid;
-import javax.faces.context.*;
-import javax.faces.event.*;
-import javax.servlet.http.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.servlet.http.HttpServletResponse;
+
import org.jboss.seam.Component;
import org.jboss.seam.navigation.Pages;
Modified: trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/security/permission/PermissionMetadata.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -3,7 +3,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
Modified: trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/web/AuthenticationFilter.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -33,7 +33,6 @@
import org.jboss.seam.servlet.ContextualHttpServletRequest;
import org.jboss.seam.servlet.ServletRequestSessionMap;
import org.jboss.seam.util.Base64;
-import org.jboss.seam.util.Strings;
/**
* Seam Servlet Filter supporting HTTP Basic and Digest authentication. Some code
Modified: trunk/src/main/org/jboss/seam/web/IdentityFilter.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/IdentityFilter.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/web/IdentityFilter.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,11 +1,13 @@
package org.jboss.seam.web;
import java.io.IOException;
+
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Name;
Modified: trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java
===================================================================
--- trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java 2008-11-24 17:14:35 UTC (rev 9620)
+++ trunk/src/main/org/jboss/seam/web/IdentityRequestWrapper.java 2008-11-24 17:31:44 UTC (rev 9621)
@@ -1,8 +1,10 @@
package org.jboss.seam.web;
import java.security.Principal;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+
import org.jboss.seam.Seam;
import org.jboss.seam.security.Identity;
15 years, 5 months
Seam SVN: r9620 - trunk/seam-gen/src.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:14:35 -0500 (Mon, 24 Nov 2008)
New Revision: 9620
Modified:
trunk/seam-gen/src/Action.java
trunk/seam-gen/src/ActionBean.java
trunk/seam-gen/src/ActionJavaBean.java
trunk/seam-gen/src/Authenticator.java
trunk/seam-gen/src/Conversation.java
trunk/seam-gen/src/ConversationBean.java
trunk/seam-gen/src/ConversationJavaBean.java
trunk/seam-gen/src/Entity.java
trunk/seam-gen/src/EntityHome.java
trunk/seam-gen/src/FormAction.java
trunk/seam-gen/src/FormActionBean.java
trunk/seam-gen/src/FormActionJavaBean.java
Log:
whitespace
use consistent formatting
use StatusMessages rather than FacesMessages
Modified: trunk/seam-gen/src/Action.java
===================================================================
--- trunk/seam-gen/src/Action.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/Action.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -3,8 +3,8 @@
import javax.ejb.Local;
@Local
-public interface @interfaceName@ {
-
+public interface @interfaceName@
+{
// seam-gen method
public void @methodName@();
Modified: trunk/seam-gen/src/ActionBean.java
===================================================================
--- trunk/seam-gen/src/ActionBean.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/ActionBean.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -5,21 +5,21 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.log.Log;
-import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.international.StatusMessages;
@Stateless
@Name("@componentName@")
-public class @beanName@ implements @interfaceName@ {
-
+public class @beanName@ implements @interfaceName@
+{
@Logger private Log log;
- @In FacesMessages facesMessages;
+ @In StatusMessages statusMessages;
public void @methodName@()
{
// implement your business logic here
log.info("@componentName@.@methodName@() action called");
- facesMessages.add("@methodName@");
+ statusMessages.add("@methodName@");
}
// add additional action methods
Modified: trunk/seam-gen/src/ActionJavaBean.java
===================================================================
--- trunk/seam-gen/src/ActionJavaBean.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/ActionJavaBean.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -4,20 +4,20 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.log.Log;
-import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.international.StatusMessages;
@Name("@componentName@")
-public class @interfaceName@ {
-
+public class @interfaceName@
+{
@Logger private Log log;
- @In FacesMessages facesMessages;
+ @In StatusMessages statusMessages;
public void @methodName@()
{
// implement your business logic here
log.info("@componentName@.@methodName@() action called");
- facesMessages.add("@methodName@");
+ statusMessages.add("@methodName@");
}
// add additional action methods
Modified: trunk/seam-gen/src/Authenticator.java
===================================================================
--- trunk/seam-gen/src/Authenticator.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/Authenticator.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -10,7 +10,7 @@
@Name("authenticator")
public class Authenticator
{
- @Logger Log log;
+ @Logger private Log log;
@In Identity identity;
@In Credentials credentials;
Modified: trunk/seam-gen/src/Conversation.java
===================================================================
--- trunk/seam-gen/src/Conversation.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/Conversation.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -3,9 +3,8 @@
import javax.ejb.Local;
@Local
-public interface @interfaceName@ {
-
- // seam-gen methods
+public interface @interfaceName@
+{
public String begin();
public String increment();
public String end();
Modified: trunk/seam-gen/src/ConversationBean.java
===================================================================
--- trunk/seam-gen/src/ConversationBean.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/ConversationBean.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -12,8 +12,8 @@
@Stateful
@Name("@componentName@")
-public class @beanName@ implements @interfaceName@, Serializable {
-
+public class @beanName@ implements @interfaceName@, Serializable
+{
@Logger private Log log;
private int value;
Modified: trunk/seam-gen/src/ConversationJavaBean.java
===================================================================
--- trunk/seam-gen/src/ConversationJavaBean.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/ConversationJavaBean.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -12,8 +12,8 @@
@Scope(CONVERSATION)
@Name("@componentName@")
-public class @interfaceName@ implements Serializable {
-
+public class @interfaceName@ implements Serializable
+{
@Logger private Log log;
private int value;
Modified: trunk/seam-gen/src/Entity.java
===================================================================
--- trunk/seam-gen/src/Entity.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/Entity.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -8,8 +8,8 @@
import org.hibernate.validator.Length;
@Entity
-public class @entityName@ implements Serializable {
-
+public class @entityName@ implements Serializable
+{
// seam-gen attributes (you should probably edit these)
private Long id;
private Integer version;
@@ -45,4 +45,5 @@
public void setName(String name) {
this.name = name;
}
+
}
Modified: trunk/seam-gen/src/EntityHome.java
===================================================================
--- trunk/seam-gen/src/EntityHome.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/EntityHome.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -10,8 +10,7 @@
@Name("@homeName@")
public class @entityName@Home extends EntityHome<@entityName@>
{
- @RequestParameter
- Long @componentName@Id;
+ @RequestParameter Long @componentName@Id;
@Override
public Object getId()
Modified: trunk/seam-gen/src/FormAction.java
===================================================================
--- trunk/seam-gen/src/FormAction.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/FormAction.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -3,12 +3,13 @@
import javax.ejb.Local;
@Local
-public interface @interfaceName@ {
-
+public interface @interfaceName@
+{
public void @methodName@();
public String getValue();
public void setValue(String value);
public void destroy();
// add additional interface methods here
+
}
Modified: trunk/seam-gen/src/FormActionBean.java
===================================================================
--- trunk/seam-gen/src/FormActionBean.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/FormActionBean.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -7,16 +7,16 @@
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.log.Log;
-import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.international.StatusMessages;
import org.hibernate.validator.Length;
@Stateful
@Name("@componentName@")
-public class @beanName@ implements @interfaceName@ {
-
+public class @beanName@ implements @interfaceName@
+{
@Logger private Log log;
- @In FacesMessages facesMessages;
+ @In StatusMessages statusMessages;
private String value;
@@ -24,7 +24,7 @@
{
// implement your business logic here
log.info("@componentName@.@methodName@() action called with: #{@componentName@.value}");
- facesMessages.add("@methodName@ #{@componentName@.value}");
+ statusMessages.add("@methodName@ #{@componentName@.value}");
}
// add additional action methods
Modified: trunk/seam-gen/src/FormActionJavaBean.java
===================================================================
--- trunk/seam-gen/src/FormActionJavaBean.java 2008-11-24 17:12:58 UTC (rev 9619)
+++ trunk/seam-gen/src/FormActionJavaBean.java 2008-11-24 17:14:35 UTC (rev 9620)
@@ -4,15 +4,15 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.log.Log;
-import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.international.StatusMessages;
import org.hibernate.validator.Length;
@Name("@componentName@")
-public class @interfaceName@ {
-
+public class @interfaceName@
+{
@Logger private Log log;
- @In FacesMessages facesMessages;
+ @In StatusMessages statusMessages;
private String value;
@@ -20,7 +20,7 @@
{
// implement your business logic here
log.info("@componentName@.@methodName@() action called with: #{@componentName@.value}");
- facesMessages.add("@methodName@ #{@componentName@.value}");
+ statusMessages.add("@methodName@ #{@componentName@.value}");
}
// add additional action methods
15 years, 5 months
Seam SVN: r9619 - trunk/seam-gen/icefaces/build-scripts.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:12:58 -0500 (Mon, 24 Nov 2008)
New Revision: 9619
Modified:
trunk/seam-gen/icefaces/build-scripts/build-war.xml
trunk/seam-gen/icefaces/build-scripts/build.properties
trunk/seam-gen/icefaces/build-scripts/build.xml
Log:
make JBoss AS domain configurable
introduce stage target
build exploded ear in place rather than assembling structure on copy
Modified: trunk/seam-gen/icefaces/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-11-24 17:12:31 UTC (rev 9618)
+++ trunk/seam-gen/icefaces/build-scripts/build-war.xml 2008-11-24 17:12:58 UTC (rev 9619)
@@ -21,7 +21,8 @@
<property name="classes.action.dir" value="${war.dir}/${action.dir}" />
<property name="test.dir" value="test-build" />
<property name="bootstrap.dir" value="${basedir}/bootstrap" />
- <property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
+ <property name="jboss.domain" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy" />
<property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" />
<property name="testng.jar" value="${basedir}/lib/testng.jar" />
<property name="javac.debug" value="true" />
Modified: trunk/seam-gen/icefaces/build-scripts/build.properties
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.properties 2008-11-24 17:12:31 UTC (rev 9618)
+++ trunk/seam-gen/icefaces/build-scripts/build.properties 2008-11-24 17:12:58 UTC (rev 9619)
@@ -1,2 +1,3 @@
jboss.home = @jbossHome@
-icefaces.home = @iceHome@
\ No newline at end of file
+jboss.domain = default
+icefaces.home = @iceHome@
Modified: trunk/seam-gen/icefaces/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/icefaces/build-scripts/build.xml 2008-11-24 17:12:31 UTC (rev 9618)
+++ trunk/seam-gen/icefaces/build-scripts/build.xml 2008-11-24 17:12:58 UTC (rev 9619)
@@ -20,7 +20,8 @@
<property name="war.dir" value="exploded-archives/${project.name}.war"/>
<property name="test.dir" value="test-build"/>
<property name="bootstrap.dir" value="${basedir}/bootstrap"/>
- <property name="deploy.dir" value="${jboss.home}/server/default/deploy"/>
+ <property name="jboss.domain" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy"/>
<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear"/>
<property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar"/>
<property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war"/>
15 years, 5 months
Seam SVN: r9618 - in trunk/seam-gen: build-scripts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:12:31 -0500 (Mon, 24 Nov 2008)
New Revision: 9618
Modified:
trunk/seam-gen/build-scripts/build.xml
trunk/seam-gen/build.xml
Log:
introduce stage target
build exploded ear in place rather than assembling structure on copy
Modified: trunk/seam-gen/build-scripts/build.xml
===================================================================
--- trunk/seam-gen/build-scripts/build.xml 2008-11-24 17:11:59 UTC (rev 9617)
+++ trunk/seam-gen/build-scripts/build.xml 2008-11-24 17:12:31 UTC (rev 9618)
@@ -16,11 +16,12 @@
<property name="lib.dir" value="lib"/>
<property name="endorsed.dir" value="${lib.dir}/endorsed"/>
<property name="ear.dir" value="exploded-archives/${project.name}.ear"/>
- <property name="jar.dir" value="exploded-archives/${project.name}.jar"/>
- <property name="war.dir" value="exploded-archives/${project.name}.war"/>
+ <property name="jar.dir" value="${ear.dir}/${project.name}.jar"/>
+ <property name="war.dir" value="${ear.dir}/${project.name}.war"/>
<property name="test.dir" value="test-build"/>
<property name="bootstrap.dir" value="${basedir}/bootstrap"/>
- <property name="deploy.dir" value="${jboss.home}/server/default/deploy"/>
+ <property name="jboss.domain" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy"/>
<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear"/>
<property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar"/>
<property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war"/>
@@ -28,13 +29,13 @@
<property name="javac.debug" value="true"/>
<property name="javac.deprecation" value="false"/>
<property name="debug" value="false"/>
-
+
<!--Properties for validating configuration files -->
<property name="validate.resources.dir" value="${basedir}/exploded-archives"/>
<property name="schema.dir" value="${basedir}/exploded-archives/schemas"/>
<property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/>
<property name="schema.version" value="@schemaVersion@"/>
-
+
<fileset id="lib" dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
@@ -228,12 +229,17 @@
</copy>
</target>
- <target name="archive" depends="jar,war,ear"
+ <target name="stage" depends="jar,war,ear"/>
+
+ <target name="archive" depends="stage"
description="Package the archives">
<jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/>
<jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/>
<jar jarfile="${dist.dir}/${project.name}.ear">
- <fileset dir="${ear.dir}"/>
+ <fileset dir="${ear.dir}">
+ <exclude name="${project.name}.jar/**"/>
+ <exclude name="${project.name}.war/**"/>
+ </fileset>
<fileset dir="${dist.dir}">
<include name="${project.name}.jar"/>
<include name="${project.name}.war"/>
@@ -250,19 +256,10 @@
</copy>
</target>
- <target name="explode" depends="jar,war,ear,datasource"
+ <target name="explode" depends="stage,datasource"
description="Deploy the exploded archive">
<fail unless="jboss.home">jboss.home not set</fail>
- <mkdir dir="${jar.deploy.dir}"/>
- <mkdir dir="${war.deploy.dir}"/>
-
- <copy todir="${jar.deploy.dir}">
- <fileset dir="${jar.dir}"/>
- </copy>
- <copy todir="${war.deploy.dir}">
- <fileset dir="${war.dir}"/>
- </copy>
<copy todir="${ear.deploy.dir}">
<fileset dir="${ear.dir}"/>
</copy>
@@ -431,7 +428,7 @@
</javadoc>
</target>
- <target name="validateConfiguration" depends="war,ear,jar" description="Validate the xml configuration files">
+ <target name="validateConfiguration" depends="stage" description="Validate the xml configuration files">
<mkdir dir="${schema.dir}"/>
<unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}">
<patternset>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-11-24 17:11:59 UTC (rev 9617)
+++ trunk/seam-gen/build.xml 2008-11-24 17:12:31 UTC (rev 9618)
@@ -1193,9 +1193,10 @@
<jpaconfiguration persistenceunit="${project.name}"/>
<classpath>
<dirset dir="${project.home}/exploded-archives">
- <include name="*.war/WEB-INF/classes" if="project.war"/>
- <include name="*.war/WEB-INF/dev" if="project.war"/>
- <include name="*.jar" if="project.ear"/>
+ <!-- eek! in one case we are nested...is this okay to use this pattern? how about throw in project name? -->
+ <include name="**/*.war/WEB-INF/classes" if="project.war"/>
+ <include name="**/*.war/WEB-INF/dev" if="project.war"/>
+ <include name="**/*.jar" if="project.ear"/>
</dirset>
</classpath>
<property key="hibernatetool.util.toolclass" value="org.jboss.seam.tool.Util"/>
15 years, 5 months
Seam SVN: r9617 - trunk/seam-gen/build-scripts.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-11-24 12:11:59 -0500 (Mon, 24 Nov 2008)
New Revision: 9617
Modified:
trunk/seam-gen/build-scripts/build-war.xml
trunk/seam-gen/build-scripts/build.properties
Log:
make JBoss AS domain configurable
Modified: trunk/seam-gen/build-scripts/build-war.xml
===================================================================
--- trunk/seam-gen/build-scripts/build-war.xml 2008-11-24 17:10:52 UTC (rev 9616)
+++ trunk/seam-gen/build-scripts/build-war.xml 2008-11-24 17:11:59 UTC (rev 9617)
@@ -21,7 +21,8 @@
<property name="classes.action.dir" value="${war.dir}/${action.dir}" />
<property name="test.dir" value="test-build" />
<property name="bootstrap.dir" value="${basedir}/bootstrap" />
- <property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
+ <property name="jboss.domain" value="default"/>
+ <property name="deploy.dir" value="${jboss.home}/server/${jboss.domain}/deploy" />
<property name="war.deploy.dir" value="${deploy.dir}/${project.name}.war" />
<property name="testng.jar" value="${basedir}/lib/testng.jar" />
<property name="javac.debug" value="true" />
Modified: trunk/seam-gen/build-scripts/build.properties
===================================================================
--- trunk/seam-gen/build-scripts/build.properties 2008-11-24 17:10:52 UTC (rev 9616)
+++ trunk/seam-gen/build-scripts/build.properties 2008-11-24 17:11:59 UTC (rev 9617)
@@ -1 +1,2 @@
-jboss.home = @jbossHome@
\ No newline at end of file
+jboss.home = @jbossHome@
+jboss.domain = default
15 years, 5 months