[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Thu Nov 16 21:01:39 EST 2006
User: gavin
Date: 06/11/16 21:01:39
Modified: src/main/org/jboss/seam/core
ApplicationContext.java BusinessProcessContext.java
ConversationContext.java EventContext.java
Expressions.java FacesContext.java Init.java
IsUserInRole.java PageContext.java
ProcessInstance.java SessionContext.java
TaskInstance.java UserPrincipal.java
Log:
@Startup no longer works as a way to avoid create=true
Revision Changes Path
1.4 +1 -3 jboss-seam/src/main/org/jboss/seam/core/ApplicationContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ApplicationContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ApplicationContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ApplicationContext.java 16 Nov 2006 17:25:04 -0000 1.3
+++ ApplicationContext.java 17 Nov 2006 02:01:39 -0000 1.4
@@ -1,4 +1,4 @@
-//$Id: ApplicationContext.java,v 1.3 2006/11/16 17:25:04 gavin Exp $
+//$Id: ApplicationContext.java,v 1.4 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
@@ -19,7 +18,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.applicationContext")
public class ApplicationContext
{
1.4 +1 -3 jboss-seam/src/main/org/jboss/seam/core/BusinessProcessContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BusinessProcessContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/BusinessProcessContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- BusinessProcessContext.java 16 Nov 2006 17:25:04 -0000 1.3
+++ BusinessProcessContext.java 17 Nov 2006 02:01:39 -0000 1.4
@@ -1,4 +1,4 @@
-//$Id: BusinessProcessContext.java,v 1.3 2006/11/16 17:25:04 gavin Exp $
+//$Id: BusinessProcessContext.java,v 1.4 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
@@ -19,7 +18,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.businessProcessContext")
public class BusinessProcessContext
{
1.4 +1 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ConversationContext.java 16 Nov 2006 17:25:04 -0000 1.3
+++ ConversationContext.java 17 Nov 2006 02:01:39 -0000 1.4
@@ -1,4 +1,4 @@
-//$Id: ConversationContext.java,v 1.3 2006/11/16 17:25:04 gavin Exp $
+//$Id: ConversationContext.java,v 1.4 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
@@ -19,7 +18,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.conversationContext")
public class ConversationContext
{
1.4 +1 -3 jboss-seam/src/main/org/jboss/seam/core/EventContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EventContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/EventContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EventContext.java 16 Nov 2006 17:25:04 -0000 1.3
+++ EventContext.java 17 Nov 2006 02:01:39 -0000 1.4
@@ -1,4 +1,4 @@
-//$Id: EventContext.java,v 1.3 2006/11/16 17:25:04 gavin Exp $
+//$Id: EventContext.java,v 1.4 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
@@ -19,7 +18,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.eventContext")
public class EventContext
{
1.10 +2 -4 jboss-seam/src/main/org/jboss/seam/core/Expressions.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Expressions.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Expressions.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Expressions.java 16 Nov 2006 17:25:04 -0000 1.9
+++ Expressions.java 17 Nov 2006 02:01:39 -0000 1.10
@@ -1,4 +1,4 @@
-//$Id: Expressions.java,v 1.9 2006/11/16 17:25:04 gavin Exp $
+//$Id: Expressions.java,v 1.10 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -12,7 +12,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.util.UnifiedELMethodBinding;
import org.jboss.seam.util.UnifiedELValueBinding;
@@ -24,7 +23,6 @@
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
@Name("org.jboss.seam.core.expressions")
- at Startup
public class Expressions
{
@@ -146,7 +144,7 @@
public static Expressions instance()
{
- return (Expressions) Component.getInstance(Expressions.class);
+ return (Expressions) Component.getInstance(Expressions.class, ScopeType.APPLICATION, true);
}
}
1.3 +1 -3 jboss-seam/src/main/org/jboss/seam/core/FacesContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FacesContext.java 16 Nov 2006 17:25:04 -0000 1.2
+++ FacesContext.java 17 Nov 2006 02:01:39 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: FacesContext.java,v 1.2 2006/11/16 17:25:04 gavin Exp $
+//$Id: FacesContext.java,v 1.3 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
/**
@@ -17,7 +16,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.facesContext")
public class FacesContext
{
1.29 +16 -1 jboss-seam/src/main/org/jboss/seam/core/Init.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Init.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- Init.java 8 Nov 2006 15:48:52 -0000 1.28
+++ Init.java 17 Nov 2006 02:01:39 -0000 1.29
@@ -1,4 +1,4 @@
-//$Id: Init.java,v 1.28 2006/11/08 15:48:52 gavin Exp $
+//$Id: Init.java,v 1.29 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
@@ -107,6 +107,11 @@
{
return method;
}
+ @Override
+ public String toString()
+ {
+ return "FactoryMethod(" + method + ')';
+ }
}
public static class FactoryBinding {
@@ -133,6 +138,11 @@
{
return scope;
}
+ @Override
+ public String toString()
+ {
+ return "FactoryBinding(" + expression + ')';
+ }
}
public FactoryMethod getFactory(String variable)
@@ -173,6 +183,11 @@
this.method = method;
this.component = component;
}
+ @Override
+ public String toString()
+ {
+ return "ObserverMethod(" + method + ')';
+ }
}
public List<ObserverMethod> getObservers(String eventType)
1.5 +0 -2 jboss-seam/src/main/org/jboss/seam/core/IsUserInRole.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IsUserInRole.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/IsUserInRole.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- IsUserInRole.java 16 Nov 2006 17:25:04 -0000 1.4
+++ IsUserInRole.java 17 Nov 2006 02:01:39 -0000 1.5
@@ -14,7 +14,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Lifecycle;
@@ -27,7 +26,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.isUserInRole")
public class IsUserInRole
{
1.3 +1 -3 jboss-seam/src/main/org/jboss/seam/core/PageContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PageContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PageContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PageContext.java 16 Nov 2006 17:25:04 -0000 1.2
+++ PageContext.java 17 Nov 2006 02:01:39 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: PageContext.java,v 1.2 2006/11/16 17:25:04 gavin Exp $
+//$Id: PageContext.java,v 1.3 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
@@ -19,7 +18,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.pageContext")
public class PageContext
{
1.14 +1 -3 jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProcessInstance.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ProcessInstance.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ProcessInstance.java 16 Nov 2006 17:25:04 -0000 1.13
+++ ProcessInstance.java 17 Nov 2006 02:01:39 -0000 1.14
@@ -12,7 +12,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.util.Work;
@@ -22,12 +21,11 @@
* jBPM ProcessInstance.
*
* @author Gavin King
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
@Scope(ScopeType.APPLICATION)
@Name("org.jboss.seam.core.processInstance")
@Intercept(InterceptionType.NEVER)
- at Startup
public class ProcessInstance
{
1.4 +1 -3 jboss-seam/src/main/org/jboss/seam/core/SessionContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SessionContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/SessionContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SessionContext.java 16 Nov 2006 17:25:04 -0000 1.3
+++ SessionContext.java 17 Nov 2006 02:01:39 -0000 1.4
@@ -1,4 +1,4 @@
-//$Id: SessionContext.java,v 1.3 2006/11/16 17:25:04 gavin Exp $
+//$Id: SessionContext.java,v 1.4 2006/11/17 02:01:39 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.InterceptionType.NEVER;
@@ -7,7 +7,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
@@ -19,7 +18,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.sessionContext")
public class SessionContext
{
1.13 +1 -3 jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskInstance.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TaskInstance.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TaskInstance.java 16 Nov 2006 17:25:04 -0000 1.12
+++ TaskInstance.java 17 Nov 2006 02:01:39 -0000 1.13
@@ -12,7 +12,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.util.Work;
@@ -22,12 +21,11 @@
* jBPM TaskInstance.
*
* @author Gavin King
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
@Scope(ScopeType.APPLICATION)
@Name("org.jboss.seam.core.taskInstance")
@Intercept(InterceptionType.NEVER)
- at Startup
public class TaskInstance
{
1.7 +1 -3 jboss-seam/src/main/org/jboss/seam/core/UserPrincipal.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserPrincipal.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/UserPrincipal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- UserPrincipal.java 16 Nov 2006 17:25:04 -0000 1.6
+++ UserPrincipal.java 17 Nov 2006 02:01:39 -0000 1.7
@@ -13,7 +13,6 @@
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.Unwrap;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
@@ -26,7 +25,6 @@
*/
@Scope(ScopeType.APPLICATION)
@Intercept(NEVER)
- at Startup
@Name("org.jboss.seam.core.userPrincipal")
public class UserPrincipal
{
@@ -54,7 +52,7 @@
{
throw new IllegalStateException("No active application scope");
}
- return (Principal) Component.getInstance(UserPrincipal.class, ScopeType.APPLICATION, false);
+ return (Principal) Component.getInstance(UserPrincipal.class, ScopeType.APPLICATION, true);
}
}
More information about the jboss-cvs-commits
mailing list