Seam SVN: r9545 - in trunk/ui/src/main: java/org/jboss/seam/ui/component and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-11-11 00:16:05 -0500 (Tue, 11 Nov 2008)
New Revision: 9545
Modified:
trunk/ui/src/main/config/component/button.xml
trunk/ui/src/main/config/component/link.xml
trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
Log:
JBSEAM-3609
Modified: trunk/ui/src/main/config/component/button.xml
===================================================================
--- trunk/ui/src/main/config/component/button.xml 2008-11-11 05:15:41 UTC (rev 9544)
+++ trunk/ui/src/main/config/component/button.xml 2008-11-11 05:16:05 UTC (rev 9545)
@@ -59,10 +59,16 @@
<classname>java.lang.Object</classname>
<description>Specify the task to operate on (e.g. for @StartTask)</description>
</property>
- <property>
- <name>conversationName</name>
- <classname>java.lang.String</classname>
- <description>The name of the conversation for natural conversations</description>
- </property>
+ <property>
+ <name>conversationName</name>
+ <classname>java.lang.String</classname>
+ <description>The name of the conversation for natural conversations</description>
+ </property>
+ <property>
+ <name>includePageParams</name>
+ <classname>boolean</classname>
+ <description>Include page parameters defined in pages.xml when rendering the button</description>
+ <defaultvalue>true</defaultvalue>
+ </property>
</component>
</components>
Modified: trunk/ui/src/main/config/component/link.xml
===================================================================
--- trunk/ui/src/main/config/component/link.xml 2008-11-11 05:15:41 UTC (rev 9544)
+++ trunk/ui/src/main/config/component/link.xml 2008-11-11 05:16:05 UTC (rev 9545)
@@ -65,10 +65,16 @@
<classname>java.lang.Object</classname>
<description>Specify the task to operate on (e.g. for @StartTask)</description>
</property>
- <property>
- <name>conversationName</name>
- <classname>java.lang.String</classname>
- <description>The name of the conversation for natural conversations</description>
- </property>
+ <property>
+ <name>conversationName</name>
+ <classname>java.lang.String</classname>
+ <description>The name of the conversation for natural conversations</description>
+ </property>
+ <property>
+ <name>includePageParams</name>
+ <classname>boolean</classname>
+ <description>Include page parameters defined in pages.xml when rendering the button</description>
+ <defaultvalue>true</defaultvalue>
+ </property>
</component>
</components>
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-11-11 05:15:41 UTC (rev 9544)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2008-11-11 05:16:05 UTC (rev 9545)
@@ -57,7 +57,7 @@
}
}
- if (viewId != null)
+ if (viewId != null && isIncludePageParams())
{
Map<String, Object> pageParameters = Pages.instance().getStringValuesFromModel(context, viewId, usedParameters);
for (Map.Entry<String, Object> me : pageParameters.entrySet())
@@ -139,6 +139,10 @@
public abstract void setConversationName(String name);
public abstract String getConversationName();
+
+ public abstract void setIncludePageParams(boolean value);
+
+ public abstract boolean isIncludePageParams();
public UISelection getSelection()
{
17 years, 5 months
- 1
- 0
Seam SVN: r9544 - in trunk/src/main/org/jboss/seam: faces and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-11-11 00:15:41 -0500 (Tue, 11 Nov 2008)
New Revision: 9544
Modified:
trunk/src/main/org/jboss/seam/faces/FacesManager.java
trunk/src/main/org/jboss/seam/faces/Navigator.java
trunk/src/main/org/jboss/seam/faces/Redirect.java
trunk/src/main/org/jboss/seam/navigation/Pages.java
trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java
trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
JBSEAM-3609
Modified: trunk/src/main/org/jboss/seam/faces/FacesManager.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesManager.java 2008-11-11 03:05:05 UTC (rev 9543)
+++ trunk/src/main/org/jboss/seam/faces/FacesManager.java 2008-11-11 05:15:41 UTC (rev 9544)
@@ -93,22 +93,10 @@
}
url = url.substring(0, loc);
}
- redirect(url, parameters, true);
+ redirect(url, parameters, true, true);
}
- /**
- * Redirect to the given view id, encoding the conversation id
- * into the request URL.
- *
- * @param viewId the JSF view id
- */
@Override
- public void redirect(String viewId)
- {
- redirect(viewId, null, true);
- }
-
- @Override
protected void storeConversationToViewRootIfNecessary()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -144,6 +132,18 @@
}
/**
+ * Redirect to the given view id, encoding the conversation id
+ * into the request URL.
+ *
+ * @param viewId the JSF view id
+ */
+ @Override
+ public void redirect(String viewId)
+ {
+ redirect(viewId, null, true, true);
+ }
+
+ /**
* Redirect to the given view id, after encoding parameters and conversation
* id into the request URL.
*
@@ -152,12 +152,8 @@
* @param includeConversationId determines if the conversation id is to be encoded
*/
public void redirect(String viewId, Map<String, Object> parameters,
- boolean includeConversationId)
+ boolean includeConversationId, boolean includePageParams)
{
- /*if ( Lifecycle.getPhaseId()==PhaseId.RENDER_RESPONSE )
- {
- throw new IllegalStateException("attempted to redirect during RENDER_RESPONSE phase");
- }*/
if (viewId == null)
{
throw new RedirectException("cannot redirect to a null viewId");
@@ -168,12 +164,13 @@
{
url = encodeParameters(url, parameters);
}
- url = Pages.instance().encodePageParameters(
- FacesContext.getCurrentInstance(),
- url,
- viewId,
- parameters==null ? Collections.EMPTY_SET : parameters.keySet()
- );
+
+ if (includePageParams)
+ {
+ url = Pages.instance().encodePageParameters(FacesContext.getCurrentInstance(),
+ url, viewId, parameters==null ? Collections.EMPTY_SET : parameters.keySet());
+ }
+
if (includeConversationId)
{
beforeRedirect(viewId);
Modified: trunk/src/main/org/jboss/seam/faces/Navigator.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/Navigator.java 2008-11-11 03:05:05 UTC (rev 9543)
+++ trunk/src/main/org/jboss/seam/faces/Navigator.java 2008-11-11 05:15:41 UTC (rev 9544)
@@ -37,17 +37,22 @@
FacesManager.instance().redirectToExternalURL(url);
}
+ protected void redirect(String viewId, Map<String, Object> parameters)
+ {
+ redirect(viewId, parameters, true);
+ }
+
/**
* Redirect to the view id.
*/
- protected void redirect(String viewId, Map<String, Object> parameters)
+ protected void redirect(String viewId, Map<String, Object> parameters, boolean includePageParams)
{
if ( Strings.isEmpty(viewId) )
{
viewId = Pages.getCurrentViewId();
}
if ( log.isDebugEnabled() ) log.debug("redirecting to: " + viewId);
- FacesManager.instance().redirect(viewId, parameters, true);
+ FacesManager.instance().redirect(viewId, parameters, true, includePageParams);
}
/**
Modified: trunk/src/main/org/jboss/seam/faces/Redirect.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/Redirect.java 2008-11-11 03:05:05 UTC (rev 9543)
+++ trunk/src/main/org/jboss/seam/faces/Redirect.java 2008-11-11 05:15:41 UTC (rev 9544)
@@ -146,7 +146,7 @@
*/
public void execute()
{
- FacesManager.instance().redirect(viewId, parameters, conversationPropagationEnabled);
+ FacesManager.instance().redirect(viewId, parameters, conversationPropagationEnabled, true);
}
/**
Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-11-11 03:05:05 UTC (rev 9543)
+++ trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-11-11 05:15:41 UTC (rev 9544)
@@ -1571,6 +1571,8 @@
}
final String viewId = redirect.attributeValue("view-id");
final String url = redirect.attributeValue("url");
+ final String includePageParamsAttr = redirect.attributeValue("include-page-params");
+ final boolean includePageParams = includePageParamsAttr == null ? true : Boolean.getBoolean(includePageParamsAttr);
Element messageElement = redirect.element("message");
String control = messageElement==null ? null : messageElement.attributeValue("for");
@@ -1580,8 +1582,7 @@
FacesMessage.SEVERITY_INFO :
getFacesMessageValuesMap().get( severityName.toUpperCase() );
rule.addNavigationHandler(new RedirectNavigationHandler(stringValueExpressionFor(viewId),
- stringValueExpressionFor(url),
- params, message, severity, control) );
+ stringValueExpressionFor(url), params, message, severity, control, includePageParams) );
}
List<Element> childElements = element.elements("out");
Modified: trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java 2008-11-11 03:05:05 UTC (rev 9543)
+++ trunk/src/main/org/jboss/seam/navigation/RedirectNavigationHandler.java 2008-11-11 05:15:41 UTC (rev 9544)
@@ -23,9 +23,10 @@
private final String message;
private final Severity severity;
private final String control;
+ private final boolean includePageParams;
- public RedirectNavigationHandler(ValueExpression<String> viewId, ValueExpression<String> url,
- List<Param> params, String message, Severity severity, String control)
+ public RedirectNavigationHandler(ValueExpression<String> viewId, ValueExpression<String> url, List<Param> params,
+ String message, Severity severity, String control, boolean includePageParams)
{
this.viewId = viewId;
this.url = url;
@@ -33,6 +34,7 @@
this.message = message;
this.severity = severity;
this.control = control;
+ this.includePageParams = includePageParams;
}
@Override
@@ -56,7 +58,7 @@
if (url != null) {
redirectExternal(url.getValue());
} else {
- redirect(viewId == null ? null : viewId.getValue(), parameters);
+ redirect(viewId == null ? null : viewId.getValue(), parameters, includePageParams);
}
return true;
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-11-11 03:05:05 UTC (rev 9543)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-11-11 05:15:41 UTC (rev 9544)
@@ -287,7 +287,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.end-conversation">
- <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
+ <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
<xs:attribute name="root" default="false" type="pages:tf-boolean"/>
<xs:attribute name="if" type="pages:boolean-value-expression" />
</xs:attributeGroup>
@@ -416,6 +416,7 @@
<xs:attributeGroup name="attlist.redirect">
<xs:attribute name="view-id" type="pages:view-id" />
<xs:attribute name="url" type="pages:url" />
+ <xs:attribute name="include-page-params" type="pages:tf-boolean" />
</xs:attributeGroup>
<xs:element name="http-error">
17 years, 5 months
- 1
- 0
Seam SVN: r9543 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-11-10 22:05:05 -0500 (Mon, 10 Nov 2008)
New Revision: 9543
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Remoting.xml
Log:
documented exception handling
Modified: trunk/doc/Seam_Reference_Guide/en-US/Remoting.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Remoting.xml 2008-11-11 02:07:21 UTC (rev 9542)
+++ trunk/doc/Seam_Reference_Guide/en-US/Remoting.xml 2008-11-11 03:05:05 UTC (rev 9543)
@@ -523,6 +523,34 @@
<para> To turn off debugging, call <literal>setDebug(false)</literal>. If you want to write your own messages to the
debug log, call <literal>Seam.Remoting.log(message)</literal>. </para>
</section>
+
+ <section>
+ <title>Handling Exceptions</title>
+
+ <para>
+ When invoking a remote component method, it is possible to specify an exception handler which will process
+ the response in the event of an exception during component invocation. To specify an exception handler function,
+ include a reference to it after the callback parameter in your JavaScript:
+ </para>
+
+ <programlisting><![CDATA[var callback = function(result) { alert(result); };
+var exceptionHandler = function(ex) { alert("An exception occurred: " + ex.getMessage()); };
+Seam.Component.getInstance("helloAction").sayHello(name, callback, exceptionHandler);]]></programlisting>
+
+ <para>
+ If you do not have a callback handler defined, you must specify <literal>null</literal> in its place:
+ </para>
+
+ <programlisting><![CDATA[var exceptionHandler = function(ex) { alert("An exception occurred: " + ex.getMessage()); };
+Seam.Component.getInstance("helloAction").sayHello(name, null, exceptionHandler);]]></programlisting>
+
+ <para>
+ The exception object that is passed to the exception handler exposes one method, <literal>getMessage()</literal>
+ that returns the exception message which is produced by the exception thrown by the <literal>@WebRemote</literal>
+ method.
+ </para>
+
+ </section>
<section>
<title>The Loading Message</title>
17 years, 5 months
- 1
- 0
Seam SVN: r9542 - trunk/src/main/org/jboss/seam/security.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-11-10 21:07:21 -0500 (Mon, 10 Nov 2008)
New Revision: 9542
Modified:
trunk/src/main/org/jboss/seam/security/RunAsOperation.java
Log:
add roles directly to subject
Modified: trunk/src/main/org/jboss/seam/security/RunAsOperation.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/RunAsOperation.java 2008-11-11 00:01:50 UTC (rev 9541)
+++ trunk/src/main/org/jboss/seam/security/RunAsOperation.java 2008-11-11 02:07:21 UTC (rev 9542)
@@ -2,8 +2,6 @@
import java.security.Principal;
import java.security.acl.Group;
-import java.util.HashSet;
-import java.util.Set;
import javax.security.auth.Subject;
@@ -18,15 +16,12 @@
private Principal principal;
private Subject subject;
- private Set<String> roles;
-
private boolean systemOp = false;
-
+
public RunAsOperation()
{
principal = new SimplePrincipal(null);
subject = new Subject();
- roles = new HashSet<String>();
}
/**
@@ -54,7 +49,19 @@
public RunAsOperation addRole(String role)
{
- roles.add(role);
+ for ( Group sg : getSubject().getPrincipals(Group.class) )
+ {
+ if ( Identity.ROLES_GROUP.equals( sg.getName() ) )
+ {
+ sg.addMember(new SimplePrincipal(role));
+ break;
+ }
+ }
+
+ SimpleGroup roleGroup = new SimpleGroup(Identity.ROLES_GROUP);
+ roleGroup.addMember(new SimplePrincipal(role));
+ getSubject().getPrincipals().add(roleGroup);
+
return this;
}
@@ -65,22 +72,6 @@
public void run()
{
- for (String role : roles)
- {
- for ( Group sg : getSubject().getPrincipals(Group.class) )
- {
- if ( Identity.ROLES_GROUP.equals( sg.getName() ) )
- {
- sg.addMember(new SimplePrincipal(role));
- break;
- }
- }
-
- SimpleGroup roleGroup = new SimpleGroup(Identity.ROLES_GROUP);
- roleGroup.addMember(new SimplePrincipal(role));
- getSubject().getPrincipals().add(roleGroup);
- }
-
Identity.instance().runAs(this);
}
}
17 years, 5 months
- 1
- 0
Seam SVN: r9541 - branches/enterprise/JBPAPP_4_3_FP01/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-11-10 19:01:50 -0500 (Mon, 10 Nov 2008)
New Revision: 9541
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
Log:
JBPAPP-1368
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2008-11-11 00:01:50 UTC (rev 9541)
@@ -671,7 +671,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
</dependency>
<dependency>
17 years, 5 months
- 1
- 0
Seam SVN: r9540 - in branches/enterprise/JBPAPP_4_3_FP01/build: embedded and 7 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-11-10 18:59:38 -0500 (Mon, 10 Nov 2008)
New Revision: 9540
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/build.properties
branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1
Log:
JBPAPP-1368
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/build.properties
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/build.properties 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/build.properties 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1,7 +1,7 @@
-offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repo
-embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam-fp/build/embedded
+offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repo/maven2
+embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam-EAP-FP/build/embedded
#embedded.dir /home/mnovotny/tmp/export/EMBEDDED_JBOSS_BETA3_SP1/embedded
embedded.dir /home/mnovotny/workspaces/jbossembedded/EMBEDDED_JBOSS_BETA3/embedded
#embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib
#embedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip
-embedded.version beta3.SP2
\ No newline at end of file
+embedded.version beta3.SP3
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -23,7 +23,7 @@
<property name="maven.settings.xml" location="${build.dir}/settings.xml" />
- <property name="embedded.version" value="beta3.SP2" />
+ <property name="embedded.version" value="beta3.SP3" />
<import file="${build.dir}/utilities.build.xml" />
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/hibernate-all.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded-all.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/jboss-embedded.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/hibernate-all.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded-all.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/jboss-embedded.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/shaded/thirdparty-all.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency
of hibernate search</description>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/embedded/thirdparty-all.pom.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP2</version>
+ <version>beta3.SP3</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS.</description>
</project>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar
===================================================================
(Binary files differ)
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.md5 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.md5 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-02f9373bb5f473d70baee1448ae6eaa1
\ No newline at end of file
+1db2193c0a7db56a787766061bb3552b
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.sha1 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.jar.sha1 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-9fd0d1cee2dce91d62e3df9eef22113790b62049
\ No newline at end of file
+fe782efed1111d6b2bb433a5d3dd0cc776489618
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -6,6 +6,6 @@
<versions>
<version>4.0.7-SOA-P</version>
</versions>
- <lastUpdated>20080813111357</lastUpdated>
+ <lastUpdated>20081110115552</lastUpdated>
</versioning>
</metadata>
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.md5 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.md5 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-eca570cddde34237e4b3b67b604c3e3a
\ No newline at end of file
+622d331769b1447800936901b40254e9
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.sha1 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/maven-metadata.xml.sha1 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-c57275d51fb2eb17e92d9a2e255e2329bab17e85
\ No newline at end of file
+487e9106bc6f7d2aa187d1903c96a88f2669706a
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar
===================================================================
(Binary files differ)
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.md5 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.md5 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-b62a93f8b91ac50daf27c5e9a658f9c3
\ No newline at end of file
+8c4dbe8f1e51a41d7216ab27f6196faf
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.sha1 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.jar.sha1 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-3e05bf03fbc0a416c6d041df19f18124a8ed414f
\ No newline at end of file
+c436fcc464e9b04f510e2be6ebcc6dfd73a2e8a6
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -6,6 +6,6 @@
<versions>
<version>4.0.7-SOA-P</version>
</versions>
- <lastUpdated>20080813111354</lastUpdated>
+ <lastUpdated>20081110115543</lastUpdated>
</versioning>
</metadata>
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.md5 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.md5 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-c8f2250789a06c9ab2917d738379d19f
\ No newline at end of file
+62dfb3b2e3248d5f9fcbd9c64e4ee267
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.sha1 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/maven-metadata.xml.sha1 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-625bee91bcb6c1638a4d93d9ebf2b2a211f74351
\ No newline at end of file
+f7495d918384facc01f7b0da941ffa0fa34e5eaf
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar
===================================================================
(Binary files differ)
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.md5 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.md5 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-a44111e3f46752916ff5a543b82c4ef1
\ No newline at end of file
+081be8c0cc3253575d3a958a88e3d0f4
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.sha1 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/3.2.2.GA_SOA-P/jbpm-jpdl-3.2.2.GA_SOA-P.jar.sha1 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-50f9c96147966d9fee975513af87a2ebabd2d9a9
\ No newline at end of file
+3314cf6f4268492fc2851022a1f2e907e41d0650
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml 2008-11-10 23:59:38 UTC (rev 9540)
@@ -6,6 +6,6 @@
<versions>
<version>3.2.2.GA_SOA-P</version>
</versions>
- <lastUpdated>20080813111052</lastUpdated>
+ <lastUpdated>20081110115856</lastUpdated>
</versioning>
</metadata>
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.md5 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-c5394aba9710968ffd97844ff16f6d92
\ No newline at end of file
+6ee44dc666e4cd5f62263d6611c7c1c1
\ No newline at end of file
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1 2008-11-10 23:08:28 UTC (rev 9539)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/jbpm/jbpm-jpdl/maven-metadata.xml.sha1 2008-11-10 23:59:38 UTC (rev 9540)
@@ -1 +1 @@
-0bd21eecda3bfa0093149e7cd1e9f8b5bc600071
\ No newline at end of file
+9cecbe1585afc70fe1c343c96b57f94dca0bc455
\ No newline at end of file
17 years, 5 months
- 1
- 0
Seam SVN: r9539 - trunk/src/main/org/jboss/seam/contexts.
by seam-commits＠lists.jboss.org
Author: youngm
Date: 2008-11-10 18:08:28 -0500 (Mon, 10 Nov 2008)
New Revision: 9539
Modified:
trunk/src/main/org/jboss/seam/contexts/Contexts.java
Log:
JBSEAM-3687
Modified: trunk/src/main/org/jboss/seam/contexts/Contexts.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/Contexts.java 2008-11-10 12:13:16 UTC (rev 9538)
+++ trunk/src/main/org/jboss/seam/contexts/Contexts.java 2008-11-10 23:08:28 UTC (rev 9539)
@@ -159,7 +159,7 @@
Object result = getMethodContext().get(name);
if (result!=null)
{
- log.debug("found in method context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in method context: " + name);
return result;
}
}
@@ -169,7 +169,7 @@
Object result = getEventContext().get(name);
if (result!=null)
{
- log.debug("found in event context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in event context: " + name);
return result;
}
}
@@ -179,7 +179,7 @@
Object result = getPageContext().get(name);
if (result!=null)
{
- log.debug("found in page context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in page context: " + name);
return result;
}
}
@@ -189,7 +189,7 @@
Object result = getConversationContext().get(name);
if (result!=null)
{
- log.debug("found in conversation context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in conversation context: " + name);
return result;
}
}
@@ -199,7 +199,7 @@
Object result = getSessionContext().get(name);
if (result!=null)
{
- log.debug("found in session context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in session context: " + name);
return result;
}
}
@@ -209,7 +209,7 @@
Object result = getBusinessProcessContext().get(name);
if (result!=null)
{
- log.debug("found in business process context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in business process context: " + name);
return result;
}
}
@@ -219,7 +219,7 @@
Object result = getApplicationContext().get(name);
if (result!=null)
{
- log.debug("found in application context: " + name);
+ if ( log.isDebugEnabled() ) log.debug("found in application context: " + name);
return result;
}
}
17 years, 5 months
- 1
- 0
Seam SVN: r9538 - in trunk/src/test/ftest/examples: dvdstore/src/org/jboss/seam/example/dvd/test/selenium and 2 other directories.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2008-11-10 07:13:16 -0500 (Mon, 10 Nov 2008)
New Revision: 9538
Modified:
trunk/src/test/ftest/examples/dvdstore/build.xml
trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties
trunk/src/test/ftest/examples/nestedbooking/build.xml
trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties
Log:
JBSEAM-3553
Modified: trunk/src/test/ftest/examples/dvdstore/build.xml
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/build.xml 2008-11-10 12:12:19 UTC (rev 9537)
+++ trunk/src/test/ftest/examples/dvdstore/build.xml 2008-11-10 12:13:16 UTC (rev 9538)
@@ -25,7 +25,7 @@
<property name="jboss.deploy.target" value="deploy" />
<property name="jboss.undeploy.target" value="undeploy" />
<property name="jboss.deploy.waittime" value="20" />
- <property name="example.ready.check.url" value="seam-dvd/home.seam"/>
+ <property name="example.ready.check.url" value="seam-dvdstore/home.seam"/>
<import file="../build.xml" />
Modified: trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties
===================================================================
--- trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties 2008-11-10 12:12:19 UTC (rev 9537)
+++ trunk/src/test/ftest/examples/dvdstore/src/org/jboss/seam/example/dvd/test/selenium/dvd.properties 2008-11-10 12:13:16 UTC (rev 9538)
@@ -19,7 +19,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-dvd/
+HOME_PAGE /seam-dvdstore/
HOME_PAGE_TITLE JBoss DVD Store
LOGOUT id=LogoutForm:Logout
REGISTRATION id=LoginForm:CreateAccount
@@ -54,7 +54,7 @@
LOGIN_PASSWORD id=LoginForm:Password
LOGIN_SUBMIT id=LoginForm:Login
SHOP id=Shop
-SHOP_URL seam-dvd/browse
+SHOP_URL browse
CART id=Cart
SEARCH_FIELD id=SearchForm:Query
SEARCH_SUBMIT id=SearchForm:Search
@@ -74,5 +74,5 @@
CART_CONFIRM_BUTTON id=orderdetail:ConfirmOrCancelForm:Confirm
CART_NOT_ENOUGH_COPIES_LEFT xpath\=//*[normalize-space(text()) \= "There were not enough copies of {0} in stock to fulfill your order."]
CART_UNABLE_TO_COMPLETE_ORDER_MESSAGE xpath=//*[normalize-space(text()) = 'Your order could not be completed.']
-DVD_URL seam-dvd/dvd
-ADMIN_URL seam-dvd/admin/admin
\ No newline at end of file
+DVD_URL dvd
+ADMIN_URL admin/admin
\ No newline at end of file
Modified: trunk/src/test/ftest/examples/nestedbooking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/build.xml 2008-11-10 12:12:19 UTC (rev 9537)
+++ trunk/src/test/ftest/examples/nestedbooking/build.xml 2008-11-10 12:13:16 UTC (rev 9538)
@@ -25,7 +25,7 @@
<property name="jboss.deploy.target" value="deploy"/>
<property name="jboss.deploy.waittime" value="10"/>
<property name="jboss.undeploy.target" value="undeploy"/>
- <property name="example.ready.check.url" value="seam-nested-booking/home.seam"/>
+ <property name="example.ready.check.url" value="seam-nestedbooking/home.seam"/>
<import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties
===================================================================
--- trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties 2008-11-10 12:12:19 UTC (rev 9537)
+++ trunk/src/test/ftest/examples/nestedbooking/src/org/jboss/seam/example/nestedbooking/test/selenium/nestedbooking.properties 2008-11-10 12:13:16 UTC (rev 9538)
@@ -19,8 +19,8 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-HOME_PAGE /seam-nested-booking/home.seam
-MAIN_PAGE /seam-nested-booking/main.seam
+HOME_PAGE /seam-nestedbooking/home.seam
+MAIN_PAGE /seam-nestedbooking/main.seam
PAGE_TITLE JBoss Suites: Seam Framework
LOGIN_USERNAME_FIELD id=login:username
LOGIN_PASSWORD_FIELD id=login:password
17 years, 5 months
- 1
- 0
Seam SVN: r9537 - in trunk/src: test/unit/org/jboss/seam/test/unit and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-11-10 07:12:19 -0500 (Mon, 10 Nov 2008)
New Revision: 9537
Modified:
trunk/src/remoting/org/jboss/seam/remoting/Call.java
trunk/src/test/unit/org/jboss/seam/test/unit/RemotingTest.java
Log:
fix tests
Modified: trunk/src/remoting/org/jboss/seam/remoting/Call.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/Call.java 2008-11-10 09:54:23 UTC (rev 9536)
+++ trunk/src/remoting/org/jboss/seam/remoting/Call.java 2008-11-10 12:12:19 UTC (rev 9537)
@@ -89,6 +89,16 @@
{
return result;
}
+
+ /**
+ * Required for unit tests
+ *
+ * @param result
+ */
+ public void setResult(Object result)
+ {
+ this.result = result;
+ }
/**
* Returns the id of this call.
@@ -110,6 +120,16 @@
{
return constraints;
}
+
+ /**
+ * Required for unit tests
+ *
+ * @param constraints
+ */
+ public void setConstraints(List<String> constraints)
+ {
+ this.constraints = constraints;
+ }
/**
* Execute this call
Modified: trunk/src/test/unit/org/jboss/seam/test/unit/RemotingTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/RemotingTest.java 2008-11-10 09:54:23 UTC (rev 9536)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/RemotingTest.java 2008-11-10 12:12:19 UTC (rev 9537)
@@ -34,6 +34,7 @@
import org.jboss.seam.contexts.ServletLifecycle;
import org.jboss.seam.init.Initialization;
import org.jboss.seam.mock.MockServletContext;
+import org.jboss.seam.remoting.Call;
import org.jboss.seam.remoting.CallContext;
import org.jboss.seam.remoting.MarshalUtils;
import org.jboss.seam.remoting.client.ParserUtils;
@@ -738,11 +739,12 @@
result.setSecret("bar");
ByteArrayOutputStream out = new ByteArrayOutputStream();
-
+
// Constrain a single field of the result
- List<String> constraints = Arrays.asList(new String[] { "secret" });
- MarshalUtils.marshalResult(null, new CallContext(), out, result,
- constraints);
+ Call c = new Call(null, null, null);
+ c.setConstraints(Arrays.asList(new String[] { "secret" }));
+ c.setResult(result);
+ MarshalUtils.marshalResult(c, out);
SAXReader xmlReader = new SAXReader();
Document doc = xmlReader.read(new StringReader(new String(out
@@ -766,9 +768,8 @@
out.reset();
// Now we're going to constrain result.child's secret field
- constraints = Arrays.asList(new String[] { "child.secret" });
- MarshalUtils.marshalResult(null, new CallContext(), out, result,
- constraints);
+ c.setConstraints(Arrays.asList(new String[] { "child.secret" }));
+ MarshalUtils.marshalResult(c, out);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -789,10 +790,8 @@
// Constrain the "secret" field of the widgetMap map's values (sounds
// confusing, I know...)
- constraints = Arrays
- .asList(new String[] { "widgetMap[value].secret" });
- MarshalUtils.marshalResult(null, new CallContext(), out, result,
- constraints);
+ c.setConstraints(Arrays.asList(new String[] { "widgetMap[value].secret" }));
+ MarshalUtils.marshalResult(c, out);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -812,9 +811,8 @@
result.getWidgetList().add(item);
// Constraint the "secret" field of widgetList
- constraints = Arrays.asList(new String[] { "widgetList.secret" });
- MarshalUtils.marshalResult(null, new CallContext(), out, result,
- constraints);
+ c.setConstraints(Arrays.asList(new String[] { "widgetList.secret" }));
+ MarshalUtils.marshalResult(c, out);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
@@ -827,10 +825,8 @@
out.reset();
// Now constrain all secrets
- constraints = Arrays
- .asList(new String[] { "[" + Widget.class.getName() + "].secret" });
- MarshalUtils.marshalResult(null, new CallContext(), out, result,
- constraints);
+ c.setConstraints(Arrays.asList(new String[] { "[" + Widget.class.getName() + "].secret" }));
+ MarshalUtils.marshalResult(c, out);
doc = xmlReader.read(new StringReader(new String(out.toByteArray())));
widget = (Widget) ParserUtils.unmarshalResult(doc.getRootElement());
17 years, 5 months
- 1
- 0
Seam SVN: r9536 - trunk/src/remoting/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-11-10 04:54:23 -0500 (Mon, 10 Nov 2008)
New Revision: 9536
Modified:
trunk/src/remoting/org/jboss/seam/remoting/Call.java
trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java
trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java
trunk/src/remoting/org/jboss/seam/remoting/remote.js
Log:
JBSEAM-633
Modified: trunk/src/remoting/org/jboss/seam/remoting/Call.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/Call.java 2008-11-10 06:24:00 UTC (rev 9535)
+++ trunk/src/remoting/org/jboss/seam/remoting/Call.java 2008-11-10 09:54:23 UTC (rev 9536)
@@ -1,5 +1,6 @@
package org.jboss.seam.remoting;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -16,214 +17,250 @@
import org.jboss.seam.util.EJB;
/**
- *
+ *
* @author Shane Bryzak
*/
public class Call
{
- private String id;
- private String componentName;
- private String methodName;
- //private String expression;
+ private String id;
+ private String componentName;
+ private String methodName;
+ // private String expression;
+ private Throwable exception;
- private List<Wrapper> params = new ArrayList<Wrapper> ();
+ private List<Wrapper> params = new ArrayList<Wrapper>();
- private Object result;
+ private Object result;
- private CallContext context;
+ private CallContext context;
- private List<String> constraints = null;
+ private List<String> constraints = null;
- /**
- * Constructor.
- *
- * @param componentName String
- * @param methodName String
- */
- public Call(String id, String componentName, String methodName)
- {
- this.id = id;
- this.componentName = componentName;
- this.methodName = methodName;
- this.context = new CallContext();
- }
+ /**
+ * Constructor.
+ *
+ * @param componentName
+ * String
+ * @param methodName
+ * String
+ */
+ public Call(String id, String componentName, String methodName) {
+ this.id = id;
+ this.componentName = componentName;
+ this.methodName = methodName;
+ this.context = new CallContext();
+ }
- /**
- * Return the call context.
- *
- * @return CallContext
- */
- public CallContext getContext()
- {
- return context;
- }
+ /**
+ * Return the call context.
+ *
+ * @return CallContext
+ */
+ public CallContext getContext()
+ {
+ return context;
+ }
+
+ /**
+ * Returns the exception thrown by the invoked method. If no exception was thrown,
+ * will return null.
+ */
+ public Throwable getException()
+ {
+ return exception;
+ }
- /**
- * Add a parameter to this call.
- *
- * @param param BaseWrapper
- */
- public void addParameter(Wrapper param)
- {
- params.add(param);
- }
+ /**
+ * Add a parameter to this call.
+ *
+ * @param param
+ */
+ public void addParameter(Wrapper param)
+ {
+ params.add(param);
+ }
- /**
- * Returns the result of this call.
- *
- * @return Wrapper
- */
- public Object getResult()
- {
- return result;
- }
+ /**
+ * Returns the result of this call.
+ *
+ * @return Wrapper
+ */
+ public Object getResult()
+ {
+ return result;
+ }
- /**
- * Returns the id of this call.
- *
- * @return String
- */
- public String getId()
- {
- return id;
- }
+ /**
+ * Returns the id of this call.
+ *
+ * @return String
+ */
+ public String getId()
+ {
+ return id;
+ }
- /**
- * Returns the object graph constraints annotated on the method that is called.
- *
- * @return List The constraints
- */
- public List<String> getConstraints()
- {
- return constraints;
- }
+ /**
+ * Returns the object graph constraints annotated on the method that is
+ * called.
+ *
+ * @return List The constraints
+ */
+ public List<String> getConstraints()
+ {
+ return constraints;
+ }
- /**
- * Execute this call
- *
- * @throws Exception
- */
- public void execute()
- throws Exception
- {
- if (componentName != null)
- {
- processInvocation();
- }
- }
-
- private void processInvocation()
- throws Exception
- {
- // Find the component we're calling
- Component component = Component.forName(componentName);
+ /**
+ * Execute this call
+ *
+ * @throws Exception
+ */
+ public void execute() throws Exception
+ {
+ if (componentName != null)
+ {
+ processInvocation();
+ }
+ }
- if (component == null)
- throw new RuntimeException("No such component: " + componentName);
+ private void processInvocation() throws Exception
+ {
+ // Find the component we're calling
+ Component component = Component.forName(componentName);
- // Create an instance of the component
- Object instance = Component.getInstance(componentName, true);
-
- if (instance == null)
- {
- throw new RuntimeException(String.format(
- "Could not create instance of component %s", componentName));
- }
+ if (component == null)
+ {
+ throw new RuntimeException("No such component: " + componentName);
+ }
- Class type = null;
+ // Create an instance of the component
+ Object instance = Component.getInstance(componentName, true);
- if (component.getType().isSessionBean() &&
- component.getBusinessInterfaces().size() > 0)
- {
- for (Class c : component.getBusinessInterfaces())
- {
- if (c.isAnnotationPresent(EJB.LOCAL))
+ if (instance == null)
+ {
+ throw new RuntimeException(String.format(
+ "Could not create instance of component %s", componentName));
+ }
+
+ Class type = null;
+
+ if (component.getType().isSessionBean()
+ && component.getBusinessInterfaces().size() > 0)
+ {
+ for (Class c : component.getBusinessInterfaces())
{
- type = c;
- break;
+ if (c.isAnnotationPresent(EJB.LOCAL))
+ {
+ type = c;
+ break;
+ }
}
- }
- if (type == null)
- throw new RuntimeException(String.format(
- "Type cannot be determined for component [%s]. Please ensure that it has a local interface.", component));
- }
+ if (type == null)
+ {
+ throw new RuntimeException(String.format(
+ "Type cannot be determined for component [%s]. Please ensure that it has a local interface.",
+ component));
+ }
+ }
- if (type == null)
- type = component.getBeanClass();
+ if (type == null)
+ {
+ type = component.getBeanClass();
+ }
- // Find the method according to the method name and the parameter classes
- Method m = findMethod(methodName, type);
- if (m == null)
- throw new RuntimeException("No compatible method found.");
+ // Find the method according to the method name and the parameter classes
+ Method m = findMethod(methodName, type);
+ if (m == null)
+ throw new RuntimeException("No compatible method found.");
- if (m.getAnnotation(WebRemote.class).exclude().length > 0)
- constraints = Arrays.asList(m.getAnnotation(WebRemote.class).exclude());
+ if (m.getAnnotation(WebRemote.class).exclude().length > 0)
+ constraints = Arrays
+ .asList(m.getAnnotation(WebRemote.class).exclude());
- // Invoke!
- result = m.invoke(instance, convertParams(m.getGenericParameterTypes()));
- }
+ Object[] params = convertParams(m.getGenericParameterTypes());
- /**
- * Convert our parameter values to an Object array of the specified target
- * types.
- *
- * @param targetTypes Class[] An array containing the target class types.
- * @return Object[] The converted parameter values.
- */
- private Object[] convertParams(Type[] targetTypes)
- throws ConversionException
- {
- Object[] paramValues = new Object[targetTypes.length];
+ // Invoke!
+ try
+ {
+ result = m.invoke(instance, params);
+ }
+ catch (InvocationTargetException e)
+ {
+ this.exception = e.getCause();
+ }
+ }
- for (int i = 0; i < targetTypes.length; i++)
- paramValues[i] = params.get(i).convert(targetTypes[i]);
+ /**
+ * Convert our parameter values to an Object array of the specified target
+ * types.
+ *
+ * @param targetTypes
+ * Class[] An array containing the target class types.
+ * @return Object[] The converted parameter values.
+ */
+ private Object[] convertParams(Type[] targetTypes)
+ throws ConversionException
+ {
+ Object[] paramValues = new Object[targetTypes.length];
- return paramValues;
- }
+ for (int i = 0; i < targetTypes.length; i++)
+ {
+ paramValues[i] = params.get(i).convert(targetTypes[i]);
+ }
- /**
- * Find the best matching method within the specified class according to
- * the parameter types that were provided to the Call.
- *
- * @param name String The name of the method.
- * @param cls Class The Class to search in.
- * @return Method The best matching method.
- */
- private Method findMethod(String name, Class cls)
- {
- Map<Method, Integer> candidates = new HashMap<Method, Integer> ();
+ return paramValues;
+ }
- for (Method m : cls.getDeclaredMethods()) {
- if (m.getAnnotation(WebRemote.class) == null)
- continue;
+ /**
+ * Find the best matching method within the specified class according to the
+ * parameter types that were provided to the Call.
+ *
+ * @param name
+ * String The name of the method.
+ * @param cls
+ * Class The Class to search in.
+ * @return Method The best matching method.
+ */
+ private Method findMethod(String name, Class cls)
+ {
+ Map<Method, Integer> candidates = new HashMap<Method, Integer>();
- if (name.equals(m.getName()) &&
- m.getParameterTypes().length == params.size()) {
- int score = 0;
+ for (Method m : cls.getDeclaredMethods())
+ {
+ if (m.getAnnotation(WebRemote.class) == null) continue;
- for (int i = 0; i < m.getParameterTypes().length; i++) {
- ConversionScore convScore = params.get(i).conversionScore(m.getParameterTypes()[
- i]);
- if (convScore == ConversionScore.nomatch)
- continue;
- score += convScore.getScore();
- }
- candidates.put(m, score);
+ if (name.equals(m.getName())
+ && m.getParameterTypes().length == params.size())
+ {
+ int score = 0;
+
+ for (int i = 0; i < m.getParameterTypes().length; i++)
+ {
+ ConversionScore convScore = params.get(i).conversionScore(
+ m.getParameterTypes()[i]);
+ if (convScore == ConversionScore.nomatch)
+ continue;
+ score += convScore.getScore();
+ }
+ candidates.put(m, score);
+ }
}
- }
- Method bestMethod = null;
- int bestScore = 0;
+ Method bestMethod = null;
+ int bestScore = 0;
- for (Method m : candidates.keySet()) {
- int thisScore = candidates.get(m).intValue();
- if (bestMethod == null || thisScore > bestScore) {
- bestMethod = m;
- bestScore = thisScore;
+ for (Method m : candidates.keySet())
+ {
+ int thisScore = candidates.get(m).intValue();
+ if (bestMethod == null || thisScore > bestScore)
+ {
+ bestMethod = m;
+ bestScore = thisScore;
+ }
}
- }
- return bestMethod;
- }
+ return bestMethod;
+ }
}
Modified: trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java 2008-11-10 06:24:00 UTC (rev 9535)
+++ trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java 2008-11-10 09:54:23 UTC (rev 9536)
@@ -223,8 +223,7 @@
for (Call call : calls)
{
- MarshalUtils.marshalResult(call.getId(), call.getContext(), out,
- call.getResult(), call.getConstraints());
+ MarshalUtils.marshalResult(call, out);
}
out.write(BODY_TAG_CLOSE);
Modified: trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-11-10 06:24:00 UTC (rev 9535)
+++ trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-11-10 09:54:23 UTC (rev 9536)
@@ -361,7 +361,7 @@
}
if (m.getGenericParameterTypes().length > 0) componentSrc.append(", ");
- componentSrc.append("callback) {\n");
+ componentSrc.append("callback, exceptionHandler) {\n");
componentSrc.append(" return Seam.Remoting.execute(this, \"");
componentSrc.append(m.getName());
@@ -374,7 +374,7 @@
componentSrc.append(i);
}
- componentSrc.append("], callback);\n");
+ componentSrc.append("], callback, exceptionHandler);\n");
componentSrc.append(" }\n");
}
Modified: trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java 2008-11-10 06:24:00 UTC (rev 9535)
+++ trunk/src/remoting/org/jboss/seam/remoting/MarshalUtils.java 2008-11-10 09:54:23 UTC (rev 9536)
@@ -20,46 +20,63 @@
private static final byte[] VALUE_TAG_OPEN = "<value>".getBytes();
private static final byte[] VALUE_TAG_CLOSE = "</value>".getBytes();
+
+ private static final byte[] EXCEPTION_TAG_OPEN = "<exception>".getBytes();
+ private static final byte[] EXCEPTION_TAG_CLOSE = "</exception>".getBytes();
+
+ private static final byte[] MESSAGE_TAG_OPEN = "<message>".getBytes();
+ private static final byte[] MESSAGE_TAG_CLOSE = "</message>".getBytes();
- public static void marshalResult(String callId, CallContext ctx, OutputStream out,
- Object result, List<String> constraints)
+ public static void marshalResult(Call call, OutputStream out)
throws IOException
{
- if (callId != null)
+ if (call.getId() != null)
{
out.write(RESULT_TAG_OPEN_START);
- out.write(callId.getBytes());
+ out.write(call.getId().getBytes());
out.write(RESULT_TAG_OPEN_END);
}
else
out.write(RESULT_TAG_OPEN);
- out.write(VALUE_TAG_OPEN);
-
- ctx.createWrapperFromObject(result, "").marshal(out);
-
- out.write(VALUE_TAG_CLOSE);
-
- out.write(RequestHandler.REFS_TAG_OPEN);
-
- // Using a for-loop, because stuff can get added to outRefs as we recurse the object graph
- for (int i = 0; i < ctx.getOutRefs().size(); i++)
+ if (call.getException() != null)
{
- Wrapper wrapper = ctx.getOutRefs().get(i);
-
- out.write(RequestHandler.REF_TAG_OPEN_START);
- out.write(Integer.toString(i).getBytes());
- out.write(RequestHandler.REF_TAG_OPEN_END);
-
- if (wrapper instanceof BeanWrapper && constraints != null)
- ((BeanWrapper) wrapper).serialize(out, constraints);
- else
- wrapper.serialize(out);
-
- out.write(RequestHandler.REF_TAG_CLOSE);
+ out.write(EXCEPTION_TAG_OPEN);
+ out.write(MESSAGE_TAG_OPEN);
+ call.getContext().createWrapperFromObject(call.getException().getMessage(), "").marshal(out);
+ out.write(MESSAGE_TAG_CLOSE);
+ out.write(EXCEPTION_TAG_CLOSE);
}
-
- out.write(RequestHandler.REFS_TAG_CLOSE);
+ else
+ {
+ out.write(VALUE_TAG_OPEN);
+
+ call.getContext().createWrapperFromObject(call.getResult(), "").marshal(out);
+
+ out.write(VALUE_TAG_CLOSE);
+
+ out.write(RequestHandler.REFS_TAG_OPEN);
+
+ // Using a for-loop, because stuff can get added to outRefs as we recurse the object graph
+ for (int i = 0; i < call.getContext().getOutRefs().size(); i++)
+ {
+ Wrapper wrapper = call.getContext().getOutRefs().get(i);
+
+ out.write(RequestHandler.REF_TAG_OPEN_START);
+ out.write(Integer.toString(i).getBytes());
+ out.write(RequestHandler.REF_TAG_OPEN_END);
+
+ if (wrapper instanceof BeanWrapper && call.getConstraints() != null)
+ ((BeanWrapper) wrapper).serialize(out, call.getConstraints());
+ else
+ wrapper.serialize(out);
+
+ out.write(RequestHandler.REF_TAG_CLOSE);
+ }
+
+ out.write(RequestHandler.REFS_TAG_CLOSE);
+ }
+
out.write(RESULT_TAG_CLOSE);
}
}
Modified: trunk/src/remoting/org/jboss/seam/remoting/remote.js
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-11-10 06:24:00 UTC (rev 9535)
+++ trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-11-10 09:54:23 UTC (rev 9536)
@@ -152,7 +152,8 @@
}
}
-Seam.Remoting.__Context = function() {
+Seam.Remoting.__Context = function()
+{
this.conversationId = null;
Seam.Remoting.__Context.prototype.setConversationId = function(conversationId)
@@ -166,6 +167,16 @@
}
}
+Seam.Remoting.Exception = function(msg)
+{
+ this.message = msg;
+
+ Seam.Remoting.Exception.prototype.getMessage = function()
+ {
+ return this.message;
+ }
+}
+
Seam.Remoting.context = new Seam.Remoting.__Context();
Seam.Remoting.getContext = function()
@@ -466,7 +477,7 @@
// call.asyncReq = Seam.Remoting.sendAjaxRequest(envelope, Seam.Remoting.PATH_EXECUTE, Seam.Remoting.processResponse, false);
//}
-Seam.Remoting.createCall = function(component, methodName, params, callback)
+Seam.Remoting.createCall = function(component, methodName, params, callback, exceptionHandler)
{
var callId = "" + Seam.Remoting.__callId++;
if (!callback)
@@ -506,7 +517,7 @@
data += "</call>";
- return {data: data, id: callId, callback: callback};
+ return {data: data, id: callId, callback: callback, exceptionHandler: exceptionHandler};
}
Seam.Remoting.createHeader = function()
@@ -597,9 +608,9 @@
}
}
-Seam.Remoting.execute = function(component, methodName, params, callback)
+Seam.Remoting.execute = function(component, methodName, params, callback, exceptionHandler)
{
- var call = Seam.Remoting.createCall(component, methodName, params, callback);
+ var call = Seam.Remoting.createCall(component, methodName, params, callback, exceptionHandler);
if (Seam.Remoting.inBatch)
{
@@ -765,10 +776,11 @@
var call = Seam.Remoting.pendingCalls.get(callId);
Seam.Remoting.pendingCalls.remove(callId);
- if (call && call.callback)
+ if (call && (call.callback || call.exceptionHandler))
{
var valueNode = null;
var refsNode = null;
+ var exceptionNode = null;
var children = result.childNodes;
for (var i = 0; i < children.length; i++)
@@ -778,15 +790,35 @@
valueNode = children.item(i);
else if (tag == "refs")
refsNode = children.item(i);
+ else if (tag == "exception")
+ exceptionNode = children.item(i);
}
- var refs = new Array();
- if (refsNode)
- Seam.Remoting.unmarshalRefs(refsNode, refs);
-
- var value = Seam.Remoting.unmarshalValue(valueNode.firstChild, refs);
-
- call.callback(value, context, callId);
+ if (exceptionNode != null)
+ {
+ var msgNode = null;
+ var children = exceptionNode.childNodes;
+ for (var i = 0; i < children.length; i++)
+ {
+ var tag = children.item(i).tagName;
+ if (tag == "message")
+ msgNode = children.item(i);
+ }
+
+ var msg = Seam.Remoting.unmarshalValue(msgNode.firstChild);
+ var ex = new Seam.Remoting.Exception(msg);
+ call.exceptionHandler(ex);
+ }
+ else
+ {
+ var refs = new Array();
+ if (refsNode)
+ Seam.Remoting.unmarshalRefs(refsNode, refs);
+
+ var value = Seam.Remoting.unmarshalValue(valueNode.firstChild, refs);
+
+ call.callback(value, context, callId);
+ }
}
}
17 years, 5 months
- 1
- 0