Seam SVN: r9033 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-09-20 01:01:29 -0400 (Sat, 20 Sep 2008)
New Revision: 9033
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Security.xml
Log:
<core:servlet-session> should be <web:session>
Modified: trunk/doc/Seam_Reference_Guide/en-US/Security.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Security.xml 2008-09-19 20:29:18 UTC (rev 9032)
+++ trunk/doc/Seam_Reference_Guide/en-US/Security.xml 2008-09-20 05:01:29 UTC (rev 9033)
@@ -4640,7 +4640,7 @@
changes. Just add this line to <literal>components.xml</literal>:
</para>
- <programlisting role="XML"><![CDATA[<core:servlet-session invalidate-on-scheme-change="true"/>]]></programlisting>
+ <programlisting role="XML"><![CDATA[<web:session invalidate-on-scheme-change="true"/>]]></programlisting>
<para>
This option helps make your system less vulnerable to sniffing of the session id or leakage of
16 years, 2 months
Seam SVN: r9032 - in trunk: src/excel/org/jboss/seam/excel/jxl and 1 other directories.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-09-19 16:29:18 -0400 (Fri, 19 Sep 2008)
New Revision: 9032
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Excel.xml
trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java
trunk/src/excel/org/jboss/seam/excel/ui/UIImage.java
Log:
Fixed trunc error in image row/colspan. Changed corresponding ui-attributes to double. Updated documentation.
Modified: trunk/doc/Seam_Reference_Guide/en-US/Excel.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-09-19 12:41:28 UTC (rev 9031)
+++ trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-09-19 20:29:18 UTC (rev 9032)
@@ -1552,8 +1552,7 @@
<literal>columnSpan</literal>
—The column span of the image. The default
is one resulting in the default width of the
- image. The value is a number. Note that the value
- is 0-based.
+ image. The value is a float.
</para>
</listitem>
<listitem>
@@ -1561,8 +1560,7 @@
<literal>rowSpan</literal>
—The row span of the image. The default is
the one resulting in the default height of the
- image. The value is a number. Note that the value
- is 0-based.
+ image. The value is a float.
</para>
</listitem>
<listitem>
Modified: trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java
===================================================================
--- trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-09-19 12:41:28 UTC (rev 9031)
+++ trunk/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-09-19 20:29:18 UTC (rev 9032)
@@ -449,8 +449,8 @@
int useStartColumn = uiImage.getStartColumn() == null ? currentColumnIndex : uiImage.getStartRow();
int useStartRow = uiImage.getStartRow() == null ? currentRowIndex : uiImage.getStartRow();
- int useColumnSpan = uiImage.getColumnSpan() == null ? (image.getWidth() / CELL_DEFAULT_WIDTH) : uiImage.getColumnSpan();
- int useRowSpan = uiImage.getRowSpan() == null ? (image.getWidth() / CELL_DEFAULT_HEIGHT) : uiImage.getRowSpan();
+ double useColumnSpan = uiImage.getColumnSpan() == null ? ((double)(image.getWidth() / CELL_DEFAULT_WIDTH)) : uiImage.getColumnSpan();
+ double useRowSpan = uiImage.getRowSpan() == null ? ((double)(image.getWidth() / CELL_DEFAULT_HEIGHT)) : uiImage.getRowSpan();
worksheet.addImage(new WritableImage(useStartColumn, useStartRow, useColumnSpan, useRowSpan, pngStream.toByteArray()));
}
Modified: trunk/src/excel/org/jboss/seam/excel/ui/UIImage.java
===================================================================
--- trunk/src/excel/org/jboss/seam/excel/ui/UIImage.java 2008-09-19 12:41:28 UTC (rev 9031)
+++ trunk/src/excel/org/jboss/seam/excel/ui/UIImage.java 2008-09-19 20:29:18 UTC (rev 9032)
@@ -9,8 +9,8 @@
private String URI;
private Integer startColumn;
private Integer startRow;
- private Integer columnSpan;
- private Integer rowSpan;
+ private Double columnSpan;
+ private Double rowSpan;
public String getURI()
{
@@ -42,22 +42,22 @@
this.startColumn = startColumn;
}
- public Integer getRowSpan()
+ public Double getRowSpan()
{
- return (Integer) valueOf("rowSpan", rowSpan);
+ return (Double) valueOf("rowSpan", rowSpan);
}
- public void setRowSpan(Integer rowSpan)
+ public void setRowSpan(Double rowSpan)
{
this.rowSpan = rowSpan;
}
- public Integer getColumnSpan()
+ public Double getColumnSpan()
{
- return (Integer) valueOf("columnSpan", columnSpan);
+ return (Double) valueOf("columnSpan", columnSpan);
}
- public void setColumnSpan(Integer columnSpan)
+ public void setColumnSpan(Double columnSpan)
{
this.columnSpan = columnSpan;
}
16 years, 2 months
Seam SVN: r9031 - trunk/src/main/org/jboss/seam/init.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-19 08:41:28 -0400 (Fri, 19 Sep 2008)
New Revision: 9031
Modified:
trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
JBSEAM-3413
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-09-19 12:10:35 UTC (rev 9030)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-09-19 12:41:28 UTC (rev 9031)
@@ -645,7 +645,7 @@
// TODO Hack
hotDeploymentStrategy.getFiles().add(warRootDirectory);
init.setHotDeployPaths( hotDeploymentStrategy.getHotDeploymentPaths() );
- }
+ }
installComponents(init);
@@ -682,7 +682,10 @@
hotDeploymentStrategy = createHotDeployment(Thread.currentThread().getContextClassLoader());
addWarRoot(hotDeploymentStrategy);
hotDeploymentStrategy.scan();
- installHotDeployableComponents();
+ if (hotDeploymentStrategy.isHotDeployClasslLoaderEnabled())
+ {
+ installHotDeployableComponents();
+ }
Contexts.getEventContext().set(HotDeploymentStrategy.NAME, hotDeploymentStrategy);
Pages.instance().setHotDotPageDotXmlFileNames(DotPageDotXmlDeploymentHandler.hotInstance().getFiles());
init.setTimestamp( System.currentTimeMillis() );
16 years, 2 months
Seam SVN: r9030 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-19 08:10:35 -0400 (Fri, 19 Sep 2008)
New Revision: 9030
Modified:
trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java
Log:
Fix testsuite
Modified: trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java 2008-09-19 11:58:50 UTC (rev 9029)
+++ trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java 2008-09-19 12:10:35 UTC (rev 9030)
@@ -34,13 +34,17 @@
public GroovyHotDeploymentStrategy(ClassLoader classLoader, File hotDeployDirectory, boolean enabled)
{
super(classLoader, hotDeployDirectory, enabled);
- groovyDeploymentHandler = new GroovyDeploymentHandler(DEFAULT_SCRIPT_EXTENSION);
- getDeploymentHandlers().put(GroovyDeploymentHandler.NAME, groovyDeploymentHandler);
+ if (enabled)
+ {
+ groovyDeploymentHandler = new GroovyDeploymentHandler(DEFAULT_SCRIPT_EXTENSION);
+ getDeploymentHandlers().put(GroovyDeploymentHandler.NAME, groovyDeploymentHandler);
+ }
}
@Override
public ClassLoader getClassLoader()
{
+ System.out.println(classLoader + "/" + super.getClassLoader());
if (classLoader == null && super.getClassLoader() != null)
{
this.classLoader = new GroovyClassLoader(super.getClassLoader());
16 years, 2 months
Seam SVN: r9029 - in trunk/examples/dvdstore/view: WEB-INF/incl and 1 other directories.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2008-09-19 07:58:50 -0400 (Fri, 19 Sep 2008)
New Revision: 9029
Modified:
trunk/examples/dvdstore/view/WEB-INF/incl/admin_nav.xhtml
trunk/examples/dvdstore/view/WEB-INF/incl/cart.xhtml
trunk/examples/dvdstore/view/WEB-INF/incl/login.xhtml
trunk/examples/dvdstore/view/WEB-INF/incl/processmenu.xhtml
trunk/examples/dvdstore/view/WEB-INF/incl/searchbox.xhtml
trunk/examples/dvdstore/view/WEB-INF/incl/stats.xhtml
trunk/examples/dvdstore/view/WEB-INF/incl/store_nav.xhtml
trunk/examples/dvdstore/view/confirm.xhtml
trunk/examples/dvdstore/view/newuser/card.xhtml
Log:
JBSEAM-3431 Added ids for dvdstore example.
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/admin_nav.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/admin_nav.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/admin_nav.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -1,9 +1,9 @@
<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib">
- <ul>
- <li id="page_admin"><s:link view="/admin/admin.xhtml" value="Manage Orders" propagation="none"/></li>
- <li id="page_process"><s:link view="/admin/process.xhtml" value="Process Status" propagation="none"/></li>
+ <ul id="AdminNavigation">
+ <li id="page_admin"><s:link id="ManageOrders" view="/admin/admin.xhtml" value="Manage Orders" propagation="none"/></li>
+ <li id="page_process"><s:link id="ProcessStatus" view="/admin/process.xhtml" value="Process Status" propagation="none"/></li>
</ul>
<script type="text/javascript" language="JavaScript">
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/cart.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/cart.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/cart.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -30,14 +30,14 @@
<dd>
<h:outputText value="#{messages.checkoutTotal}" />
- <h:outputText value="#{cart.total}">
+ <h:outputText id="CartTotal" value="#{cart.total}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</dd>
- <h:form>
+ <h:form id="Cart">
<dd>
- <h:commandButton action="checkout" value="#{messages.checkoutButton}"
+ <h:commandButton id="Checkout" action="checkout" value="#{messages.checkoutButton}"
styleClass="formButton" style="width: 166px;" />
</dd>
</h:form>
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/login.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/login.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/login.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -5,18 +5,18 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
- <h:form rendered="#{not identity.loggedIn}">
+ <h:form id="LoginForm" rendered="#{not identity.loggedIn}">
<dl>
<dt class="menuHeader">#{messages.loginPagePrompt}</dt>
<dd class="menuForm">
<dl>
<dt><h:outputText value="#{messages.loginUser}" /></dt>
- <dd><h:inputText value="#{identity.username}" size="16" /></dd>
+ <dd><h:inputText id="Username" value="#{identity.username}" size="16" /></dd>
<dt><h:outputText value="#{messages.loginPass}" /></dt>
- <dd><h:inputSecret value="#{identity.password}" size="16"/></dd>
+ <dd><h:inputSecret id="Password" value="#{identity.password}" size="16"/></dd>
<dd>
- <h:commandButton action="#{identity.login}" value="#{messages.loginPrompt}"
+ <h:commandButton id="Login" action="#{identity.login}" value="#{messages.loginPrompt}"
styleClass="formButton" style="width: 166px;"/>
</dd>
@@ -25,19 +25,19 @@
</dl>
<dl>
<dt class="menuFooter">
- <h:commandLink action="#{editCustomer.startEdit}">Create Account</h:commandLink>
+ <h:commandLink id="CreateAccount" action="#{editCustomer.startEdit}">Create Account</h:commandLink>
</dt>
</dl>
</h:form>
- <h:form rendered="#{identity.loggedIn}">
+ <h:form id="LogoutForm" rendered="#{identity.loggedIn}">
<dl>
<dt class="menuHeader">Welcome, #{currentUser.firstName}</dt>
<dd class="menuForm">
<dl>
<dd>Thank you for choosing the DVD Store</dd>
<dd>
- <h:commandButton action="#{identity.logout}" value="Logout"
+ <h:commandButton id="Logout" action="#{identity.logout}" value="Logout"
styleClass="formButton" style="width: 166px;"/>
</dd>
</dl>
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/processmenu.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/processmenu.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/processmenu.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -13,12 +13,12 @@
<dl>
<dt>Process Management</dt>
<dd>
- <h:selectOneMenu value="#{processDefinitionSwitcher.currentProcessDefinition}">
+ <h:selectOneMenu id="Menu" value="#{processDefinitionSwitcher.currentProcessDefinition}">
<f:selectItems value="#{processDefinitionSwitcher.processDefinitions}"/>
</h:selectOneMenu>
</dd>
<dd>
- <h:commandButton action="#{processDefinitionSwitcher.switchProcess}"
+ <h:commandButton id="Switch" action="#{processDefinitionSwitcher.switchProcess}"
value="Switch Order Process"
styleClass="formButton" style="width: 166px;"/>
</dd>
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/searchbox.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/searchbox.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/searchbox.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -6,7 +6,7 @@
xmlns:h="http://java.sun.com/jsf/html">
<dl>
<dt class="menuHeader">#{messages.browseSearchHeader}</dt>
- <dd class="menuForm"><h:form>
+ <dd class="menuForm"><h:form id="SearchForm">
<dl>
<ui:remove>
<dt><h:outputText value="#{messages.searchCategory}"/></dt>
@@ -20,18 +20,18 @@
</dd>
</ui:remove>
- <dt><h:outputText value="#{messages.searchTerm}" /></dt>
- <dd><h:inputText value="#{search.searchQuery}" size="15" /></dd>
+ <dt><h:outputText id="QueryLabel" value="#{messages.searchTerm}" /></dt>
+ <dd><h:inputText id="Query" value="#{search.searchQuery}" size="15" /></dd>
- <dt><h:outputText value="#{messages.searchPageSize}" /></dt>
- <dd><h:selectOneMenu value="#{search.pageSize}">
+ <dt><h:outputText id="PageSizeLabel" value="#{messages.searchPageSize}" /></dt>
+ <dd><h:selectOneMenu id="PageSize" value="#{search.pageSize}">
<f:selectItem itemLabel="10" itemValue="10" />
<f:selectItem itemLabel="15" itemValue="15" />
<f:selectItem itemLabel="20" itemValue="20" />
<f:selectItem itemLabel="30" itemValue="30" />
</h:selectOneMenu></dd>
- <dd><h:commandButton action="#{search.doSearch}"
+ <dd><h:commandButton id="Search" action="#{search.doSearch}"
value="#{messages.searchButton}" styleClass="formButton"
style="width: 166px;" /></dd>
</dl>
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/stats.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/stats.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/stats.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -11,10 +11,15 @@
<dd class="menuSection">
<dl>
<dt>Inventory</dt>
- <dd>#{stats.unitsSold} sold, #{stats.totalInventory} in stock</dd>
+ <dd>
+ <h:outputText id="TotalSold" value="#{stats.unitsSold}" />
+ sold,
+ <h:outputText id="TotalInventory" value="#{stats.totalInventory}" />
+ in stock
+ </dd>
<dt>Sales</dt>
<dd>
- <h:outputText value="#{stats.totalSales}">
+ <h:outputText id="TotalSales" value="#{stats.totalSales}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
from #{stats.numberOrders} orders
Modified: trunk/examples/dvdstore/view/WEB-INF/incl/store_nav.xhtml
===================================================================
--- trunk/examples/dvdstore/view/WEB-INF/incl/store_nav.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/WEB-INF/incl/store_nav.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -4,13 +4,13 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
- <ul>
- <li id="page_home"><s:link view="/home.xhtml" value="Home" propagation="none"/></li>
- <li id="page_shop"><s:link view="/browse.xhtml" value="Shop" propagation="none"/></li>
- <f:subview id="my_orders_link" rendered="#{identity.loggedIn}">
- <li id="page_orders"><s:link view="/showorders.xhtml" value="My Orders" propagation="none"/></li>
+ <ul id="Navigation">
+ <li id="page_home"><s:link id="Home" view="/home.xhtml" value="Home" propagation="none"/></li>
+ <li id="page_shop"><s:link id="Shop" view="/browse.xhtml" value="Shop" propagation="none"/></li>
+ <f:subview rendered="#{identity.loggedIn}">
+ <li id="page_orders"><s:link id="MyOrders" view="/showorders.xhtml" value="My Orders" propagation="none"/></li>
</f:subview>
- <li id="page_cart"><s:link view="/checkout.xhtml" value="Cart" propagation="none"/></li>
+ <li id="page_cart"><s:link id="Cart" view="/checkout.xhtml" value="Cart" propagation="none"/></li>
</ul>
<script type="text/javascript" language="JavaScript">
Modified: trunk/examples/dvdstore/view/confirm.xhtml
===================================================================
--- trunk/examples/dvdstore/view/confirm.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/confirm.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -81,9 +81,9 @@
</h:panelGrid>
<h:form id="ConfirmOrCancelForm">
- <h:commandButton action="purchase" value="Confirm" />
+ <h:commandButton id="Confirm" action="purchase" value="Confirm" />
 
- <h:commandButton action="cancel" value="Cancel" />
+ <h:commandButton id="Cancel" action="cancel" value="Cancel" />
</h:form>
</div>
</div>
Modified: trunk/examples/dvdstore/view/newuser/card.xhtml
===================================================================
--- trunk/examples/dvdstore/view/newuser/card.xhtml 2008-09-19 11:21:18 UTC (rev 9028)
+++ trunk/examples/dvdstore/view/newuser/card.xhtml 2008-09-19 11:58:50 UTC (rev 9029)
@@ -22,7 +22,7 @@
<p><em><h:outputText id="NewCustomerInfoText" value="#{messages.newCustomerInfo}" /></em></p>
- <h:form>
+ <h:form id="NewAccountForm">
<table border="0">
<tr>
<td>#{messages.newCustomerCCT}</td>
16 years, 2 months
Seam SVN: r9028 - trunk/ui/src/main/java/org/jboss/seam/ui/converter.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-19 07:21:18 -0400 (Fri, 19 Sep 2008)
New Revision: 9028
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java
Log:
JBSEAM-3430
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java 2008-09-19 11:20:31 UTC (rev 9027)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java 2008-09-19 11:21:18 UTC (rev 9028)
@@ -85,11 +85,14 @@
FacesContext facesContext = FacesContext.getCurrentInstance();
if (valueExpression != null)
{
- Converter converter = facesContext.getApplication().createConverter(
- valueExpression.getType(facesContext.getELContext()));
- if (converter != null)
+ Class<?> type = valueExpression.getType(facesContext.getELContext());
+ if (type != null)
{
- addConverterToChain(converter);
+ Converter converter = facesContext.getApplication().createConverter(type);
+ if (converter != null)
+ {
+ addConverterToChain(converter);
+ }
}
}
}
16 years, 2 months
Seam SVN: r9027 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-19 07:20:31 -0400 (Fri, 19 Sep 2008)
New Revision: 9027
Modified:
trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
Log:
JBSEAM-3399
Modified: trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-09-19 10:42:22 UTC (rev 9026)
+++ trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-09-19 11:20:31 UTC (rev 9027)
@@ -63,9 +63,9 @@
if (enabled)
{
this.classLoader = Thread.currentThread().getContextClassLoader();
- initHotDeployClassLoader(classLoader, hotDeployDirectory);
if (hotDeployDirectory != null && hotDeployDirectory.exists())
{
+ initHotDeployClassLoader(classLoader, hotDeployDirectory);
componentDeploymentHandler = new ComponentDeploymentHandler();
getDeploymentHandlers().put(ComponentDeploymentHandler.NAME, componentDeploymentHandler);
annotationDeploymentHandler = new AnnotationDeploymentHandler(getPropertyValues(AnnotationDeploymentHandler.ANNOTATIONS_KEY), classLoader);
@@ -79,13 +79,10 @@
{
try
{
- if (hotDeployDirectory != null)
- {
- URL url = hotDeployDirectory.toURL();
- URL[] urls = { url };
- hotDeployClassLoader = new URLClassLoader(urls, classLoader);
- getFiles().add(hotDeployDirectory);
- }
+ URL url = hotDeployDirectory.toURL();
+ URL[] urls = { url };
+ hotDeployClassLoader = new URLClassLoader(urls, classLoader);
+ getFiles().add(hotDeployDirectory);
}
catch (MalformedURLException mue)
{
16 years, 2 months
Seam SVN: r9025 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-19 06:39:48 -0400 (Fri, 19 Sep 2008)
New Revision: 9025
Modified:
trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
Clasify EL expressions
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-09-18 22:18:19 UTC (rev 9024)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-09-19 10:39:48 UTC (rev 9025)
@@ -166,7 +166,7 @@
</xs:element>
<xs:attributeGroup name="attlist.rewrite">
- <xs:attribute name="pattern" use="required" type="xs:normalizedString" />
+ <xs:attribute name="pattern" use="required" type="xs:token" />
</xs:attributeGroup>
<xs:element name="action">
@@ -178,11 +178,11 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.action">
- <xs:attribute name="if" type="xs:normalizedString" />
- <xs:attribute name="execute" use="required" type="xs:normalizedString" />
+ <xs:attribute name="if" type="pages:boolean-value-expression" />
+ <xs:attribute name="execute" use="required" type="pages:method-expression" />
</xs:attributeGroup>
- <xs:element name="restrict" type="xs:string">
+ <xs:element name="restrict" type="pages:value-expression">
<xs:annotation>
<xs:documentation>Security restrictions</xs:documentation>
</xs:annotation>
@@ -217,8 +217,8 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.navigation">
- <xs:attribute name="from-action" type="xs:normalizedString" />
- <xs:attribute name="evaluate" type="xs:normalizedString" />
+ <xs:attribute name="from-action" type="pages:method-expression" />
+ <xs:attribute name="evaluate" type="pages:method-expression" />
</xs:attributeGroup>
<xs:element name="rule">
@@ -244,8 +244,8 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.rule">
- <xs:attribute name="if-outcome" type="xs:normalizedString" />
- <xs:attribute name="if" type="xs:normalizedString" />
+ <xs:attribute name="if-outcome" type="pages:value-expression" />
+ <xs:attribute name="if" type="pages:boolean-value-expression" />
</xs:attributeGroup>
<xs:element name="raise-event">
@@ -257,7 +257,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.raise-event">
- <xs:attribute name="type" use="required" type="xs:normalizedString" />
+ <xs:attribute name="type" use="required" type="xs:token" />
</xs:attributeGroup>
<xs:element name="begin-conversation">
@@ -271,9 +271,9 @@
<xs:attributeGroup name="attlist.begin-conversation">
<xs:attribute name="join" default="false" type="pages:tf-boolean"/>
<xs:attribute name="nested" default="false" type="pages:tf-boolean"/>
- <xs:attribute name="pageflow" type="xs:normalizedString" />
+ <xs:attribute name="pageflow" type="xs:token" />
<xs:attribute name="flush-mode" type="pages:flush-modes" />
- <xs:attribute name="if" type="xs:normalizedString" />
+ <xs:attribute name="if" type="pages:boolean-value-expression" />
<xs:attribute name="conversation" type="xs:token" />
</xs:attributeGroup>
@@ -287,7 +287,7 @@
</xs:element>
<xs:attributeGroup name="attlist.end-conversation">
<xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/>
- <xs:attribute name="if" type="xs:normalizedString" />
+ <xs:attribute name="if" type="pages:boolean-value-expression" />
</xs:attributeGroup>
<xs:element name="begin-task">
@@ -300,7 +300,7 @@
</xs:element>
<xs:attributeGroup name="attlist.begin-task">
<xs:attribute name="task-id" type="xs:token" />
- <xs:attribute name="pageflow" type="xs:normalizedString" />
+ <xs:attribute name="pageflow" type="xs:token" />
<xs:attribute name="flush-mode" type="pages:flush-modes" />
</xs:attributeGroup>
@@ -314,7 +314,7 @@
</xs:element>
<xs:attributeGroup name="attlist.start-task">
<xs:attribute name="task-id" type="xs:token" />
- <xs:attribute name="pageflow" type="xs:normalizedString" />
+ <xs:attribute name="pageflow" type="xs:token" />
<xs:attribute name="flush-mode" type="pages:flush-modes" />
</xs:attributeGroup>
@@ -366,7 +366,7 @@
<xs:attributeGroup name="attlist.in">
<xs:attribute name="name" use="required" type="xs:token" />
<xs:attribute name="scope" type="pages:allowed-scopes" />
- <xs:attribute name="value" use="required" type="xs:normalizedString" />
+ <xs:attribute name="value" use="required" type="xs:token" />
</xs:attributeGroup>
<xs:element name="out">
@@ -592,4 +592,20 @@
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="method-expression">
+ <xs:restriction base="xs:token">
+ <xs:pattern value="#\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="value-expression">
+ <xs:restriction base="xs:token"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="boolean-value-expression">
+ <xs:restriction base="xs:token">
+ <xs:pattern value="true|false|#\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+
</xs:schema>
16 years, 2 months
Seam SVN: r9024 - trunk/src/ioc/org/jboss/seam/ioc/spring.
by seam-commits＠lists.jboss.org
Author: youngm
Date: 2008-09-18 18:18:19 -0400 (Thu, 18 Sep 2008)
New Revision: 9024
Modified:
trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
Log:
JBSEAM-3151 I specified the wrong issue number before.
Modified: trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
===================================================================
--- trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-09-18 22:14:41 UTC (rev 9023)
+++ trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-09-18 22:18:19 UTC (rev 9024)
@@ -155,7 +155,7 @@
{
transaction = currentTransaction;
}
- // If SynchronizationManager things it has an active transaction but
+ // If SynchronizationManager thinks it has an active transaction but
// our transaction is a new one
// then we must be in the middle of committing
if (transaction.isCompleted())
16 years, 2 months
Seam SVN: r9023 - trunk/src/ioc/org/jboss/seam/ioc/spring.
by seam-commits＠lists.jboss.org
Author: youngm
Date: 2008-09-18 18:14:41 -0400 (Thu, 18 Sep 2008)
New Revision: 9023
Modified:
trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
Log:
STACK-1118
Modified: trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java
===================================================================
--- trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-09-18 21:26:10 UTC (rev 9022)
+++ trunk/src/ioc/org/jboss/seam/ioc/spring/SpringTransaction.java 2008-09-18 22:14:41 UTC (rev 9023)
@@ -22,13 +22,12 @@
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.transaction.AbstractUserTransaction;
+import org.jboss.seam.transaction.Synchronizations;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -53,25 +52,20 @@
private Boolean joinTransaction;
@Override
- public void registerSynchronization(final Synchronization sync)
+ public void registerSynchronization(Synchronization sync)
{
- if (TransactionSynchronizationManager.isSynchronizationActive())
- {
- TransactionSynchronizationManager.registerSynchronization(new JtaSpringSynchronizationAdapter(sync));
- }
- else
- {
- throw new IllegalStateException("TransactionSynchronization not available with this Spring Transaction Manager");
- }
+ getSynchronizations().registerSynchronization(sync);
}
public void begin() throws NotSupportedException, SystemException
{
+ log.debug("beginning Spring transaction");
if (TransactionSynchronizationManager.isActualTransactionActive())
{
throw new NotSupportedException("A Spring transaction is already active.");
}
currentTransaction = getPlatformTransactionManagerRequired().getTransaction(definition);
+ getSynchronizations().afterTransactionBegin();
}
/**
@@ -98,7 +92,8 @@
return ptm;
}
- private PlatformTransactionManager getPlatformTransactionManagerRequired() {
+ private PlatformTransactionManager getPlatformTransactionManagerRequired()
+ {
PlatformTransactionManager ptm = getPlatformTransactionManager();
if (ptm == null)
{
@@ -119,14 +114,20 @@
public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException
{
+ log.debug("committing Spring transaction");
assertActive();
+ boolean success = false;
+ Synchronizations synchronizations = getSynchronizations();
+ synchronizations.beforeTransactionCommit();
try
{
getPlatformTransactionManagerRequired().commit(currentTransaction);
+ success = true;
}
finally
{
currentTransaction = null;
+ synchronizations.afterTransactionCommit(success);
}
}
@@ -187,6 +188,7 @@
public void rollback() throws IllegalStateException, SecurityException, SystemException
{
+ log.debug("rolling back Spring transaction");
assertActive();
try
{
@@ -195,6 +197,7 @@
finally
{
currentTransaction = null;
+ getSynchronizations().afterTransactionRollback();
}
}
@@ -307,45 +310,4 @@
{
this.joinTransaction = joinTransaction;
}
-
- public class JtaSpringSynchronizationAdapter extends TransactionSynchronizationAdapter
- {
- @Override
- public int getOrder()
- {
- return SeamLifecycleUtils.SEAM_LIFECYCLE_SYNCHRONIZATION_ORDER - 1;
- }
-
- private final Synchronization sync;
-
- public JtaSpringSynchronizationAdapter(Synchronization sync)
- {
- this.sync = sync;
- }
-
- @Override
- public void afterCompletion(int status)
- {
- sync.afterCompletion(convertSpringStatus(status));
- }
-
- @Override
- public void beforeCompletion()
- {
- sync.beforeCompletion();
- }
-
- private int convertSpringStatus(int springStatus)
- {
- switch (springStatus)
- {
- case TransactionSynchronization.STATUS_COMMITTED:
- return Status.STATUS_COMMITTED;
- case TransactionSynchronization.STATUS_ROLLED_BACK:
- return Status.STATUS_ROLLEDBACK;
- default:
- return Status.STATUS_UNKNOWN;
- }
- }
- }
-}
+}
\ No newline at end of file
16 years, 2 months