Seam SVN: r9204 - trunk/src/main/org/jboss/seam/init.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-06 01:13:26 -0400 (Mon, 06 Oct 2008)
New Revision: 9204
Modified:
trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
imports
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-06 05:10:08 UTC (rev 9203)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-06 05:13:26 UTC (rev 9204)
@@ -60,8 +60,6 @@
import org.jboss.seam.util.Strings;
import org.jboss.seam.util.XML;
-import com.sun.org.apache.xerces.internal.impl.xpath.regex.Match;
-
/**
* Builds configuration metadata when Seam first initialized.
*
15 years, 7 months
Seam SVN: r9203 - trunk/examples/seamspace/view.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-06 01:10:08 -0400 (Mon, 06 Oct 2008)
New Revision: 9203
Modified:
trunk/examples/seamspace/view/userdetail.xhtml
Log:
should use h:commandButton, not s:button
Modified: trunk/examples/seamspace/view/userdetail.xhtml
===================================================================
--- trunk/examples/seamspace/view/userdetail.xhtml 2008-10-06 04:59:40 UTC (rev 9202)
+++ trunk/examples/seamspace/view/userdetail.xhtml 2008-10-06 05:10:08 UTC (rev 9203)
@@ -67,7 +67,7 @@
</div>
<div class="formButtons">
- <s:button value="Save" action="#{userAction.save}" styleClass="formButton"/>
+ <h:commandButton value="Save" action="#{userAction.save}" styleClass="formButton"/>
<s:button view="/usermanager.xhtml" value="Cancel" propagation="end" styleClass="formButton"/>
</div>
15 years, 7 months
Seam SVN: r9202 - trunk/examples/seamspace/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-06 00:59:40 -0400 (Mon, 06 Oct 2008)
New Revision: 9202
Modified:
trunk/examples/seamspace/resources/WEB-INF/pages.xml
Log:
add login-required for security manager
Modified: trunk/examples/seamspace/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-10-06 04:58:29 UTC (rev 9201)
+++ trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-10-06 04:59:40 UTC (rev 9202)
@@ -14,6 +14,10 @@
<redirect view-id="/register.xhtml"/>
</navigation>
</page>
+
+ <page view-id="/security.xhtml" login-required="true">
+
+ </page>
<page view-id="/comment.xhtml" login-required="true">
<restrict/>
15 years, 7 months
Seam SVN: r9201 - trunk/examples/seamspace/view.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-06 00:58:29 -0400 (Mon, 06 Oct 2008)
New Revision: 9201
Modified:
trunk/examples/seamspace/view/userdetail.xhtml
Log:
only display grantable roles
Modified: trunk/examples/seamspace/view/userdetail.xhtml
===================================================================
--- trunk/examples/seamspace/view/userdetail.xhtml 2008-10-06 02:55:38 UTC (rev 9200)
+++ trunk/examples/seamspace/view/userdetail.xhtml 2008-10-06 04:58:29 UTC (rev 9201)
@@ -55,7 +55,7 @@
<h:outputLabel for="roles" value="Member of" styleClass="formLabel"/>
<div class="selectMany">
<h:selectManyCheckbox id="roles" value="#{userAction.roles}" layout="pageDirection" styleClass="roles">
- <s:selectItems value="#{identityManager.listRoles()}" var="role" label="#{role}"/>
+ <s:selectItems value="#{identityManager.listGrantableRoles()}" var="role" label="#{role}"/>
</h:selectManyCheckbox>
</div>
<div class="validationError"><h:message for="roles"/></div>
15 years, 7 months
Seam SVN: r9200 - trunk/src/main/org/jboss/seam/faces.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-05 22:55:38 -0400 (Sun, 05 Oct 2008)
New Revision: 9200
Modified:
trunk/src/main/org/jboss/seam/faces/Redirect.java
Log:
JBSEAM-2449
Modified: trunk/src/main/org/jboss/seam/faces/Redirect.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/Redirect.java 2008-10-06 02:31:52 UTC (rev 9199)
+++ trunk/src/main/org/jboss/seam/faces/Redirect.java 2008-10-06 02:55:38 UTC (rev 9200)
@@ -105,6 +105,12 @@
{
FacesContext context = FacesContext.getCurrentInstance();
parameters = Pages.instance().getStringValuesFromPageContext(context);
+
+ if (context.getExternalContext().getRequestParameterMap().containsKey("actionMethod"))
+ {
+ parameters.put("actionMethod", context.getExternalContext().getRequestParameterMap().get("actionMethod"));
+ }
+
viewId = Pages.getViewId(context);
conversationBegun = Conversation.instance().begin(true, false);
setDirty();
15 years, 7 months
Seam SVN: r9199 - trunk/src/main/org/jboss/seam/security/management.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-05 22:31:52 -0400 (Sun, 05 Oct 2008)
New Revision: 9199
Modified:
trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
Log:
JBSEAM-3502
Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-10-06 02:13:52 UTC (rev 9198)
+++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-10-06 02:31:52 UTC (rev 9199)
@@ -579,7 +579,7 @@
}
}
- private String generatePasswordHash(String password, String salt)
+ protected String generatePasswordHash(String password, String salt)
{
String algorithm = userPasswordProperty.getAnnotation().hash();
15 years, 7 months
Seam SVN: r9198 - trunk/src/main/org/jboss/seam/contexts.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-05 22:13:52 -0400 (Sun, 05 Oct 2008)
New Revision: 9198
Modified:
trunk/src/main/org/jboss/seam/contexts/ServerConversationContext.java
Log:
JBSEAM-3512
Modified: trunk/src/main/org/jboss/seam/contexts/ServerConversationContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/ServerConversationContext.java 2008-10-05 23:09:40 UTC (rev 9197)
+++ trunk/src/main/org/jboss/seam/contexts/ServerConversationContext.java 2008-10-06 02:13:52 UTC (rev 9198)
@@ -25,6 +25,7 @@
* may be passivated or replicated.
*
* @author Gavin King
+ * @author Shane Bryzak
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
*/
public class ServerConversationContext implements Context
@@ -291,13 +292,24 @@
removals.clear();
//add new objects
- for (Map.Entry<String, Object> entry: additions.entrySet()) {
- Object attribute = entry.getValue();
-
- passivate(attribute);
- session.put(getKey(entry.getKey()), attribute);
+ while (!additions.isEmpty())
+ {
+ // Copy the additions entries to a temporary variable, then
+ // clear additions - during passivation, further attributes may
+ // be set in the conversation context so we need to re-iterate
+ // through this process until all additions are passivated
+ Set<Map.Entry<String,Object>> entries = new HashSet<Map.Entry<String,Object>>(additions.entrySet());
+ additions.clear();
+
+ for (Map.Entry<String, Object> entry: entries)
+ {
+ Object attribute = entry.getValue();
+
+ passivate(attribute);
+ session.put(getKey(entry.getKey()), attribute);
+ }
}
- additions.clear();
+
}
else
{
15 years, 7 months
Seam SVN: r9197 - trunk/ui/src/main/config/component.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-05 19:09:40 -0400 (Sun, 05 Oct 2008)
New Revision: 9197
Modified:
trunk/ui/src/main/config/component/button.xml
trunk/ui/src/main/config/component/cache.xml
trunk/ui/src/main/config/component/conversationId.xml
trunk/ui/src/main/config/component/conversationName.xml
trunk/ui/src/main/config/component/conversationPropagation.xml
trunk/ui/src/main/config/component/convertDateTime.xml
trunk/ui/src/main/config/component/decorate.xml
trunk/ui/src/main/config/component/div.xml
trunk/ui/src/main/config/component/enumItem.xml
trunk/ui/src/main/config/component/fileUpload.xml
trunk/ui/src/main/config/component/formattedText.xml
trunk/ui/src/main/config/component/formattedTextValidator.xml
trunk/ui/src/main/config/component/fragment.xml
trunk/ui/src/main/config/component/graphicImage.xml
trunk/ui/src/main/config/component/label.xml
trunk/ui/src/main/config/component/link.xml
trunk/ui/src/main/config/component/message.xml
trunk/ui/src/main/config/component/remote.xml
trunk/ui/src/main/config/component/selection.xml
trunk/ui/src/main/config/component/span.xml
trunk/ui/src/main/config/component/taskId.xml
trunk/ui/src/main/config/component/transformImageBlur.xml
trunk/ui/src/main/config/component/transformImageSize.xml
trunk/ui/src/main/config/component/transformImageType.xml
trunk/ui/src/main/config/component/validateAll.xml
Log:
Tidy up the ui config files, including altering parameters to not have the rendered attribute
Modified: trunk/ui/src/main/config/component/button.xml
===================================================================
--- trunk/ui/src/main/config/component/button.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/button.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -12,7 +12,6 @@
<renderer generate="false" override="false">
<name>org.jboss.seam.ui.ButtonRenderer</name>
<classname>org.jboss.seam.ui.renderkit.ButtonRendererBase</classname>
- <!--<template>org/jboss/seam/ui/htmlButton.jspx</template>-->
</renderer>
<tag>
<name>button</name>
@@ -21,13 +20,11 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
&ui_output_attributes;
&html_button_attributes;
&html_universal_attributes;
&html_events;
&ui_command_attributes;
- <!-- &standard_command_button_attributes; -->
<property>
<name>view</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/src/main/config/component/cache.xml
===================================================================
--- trunk/ui/src/main/config/component/cache.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/cache.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -12,8 +12,6 @@
<renderer generate="false" override="false">
<name>org.jboss.seam.ui.CacheRenderer</name>
<classname>org.jboss.seam.ui.renderkit.CacheRendererBase</classname>
- <!--<template>org/jboss/seam/ui/htmlCache.jspx</template>-->
-
</renderer>
<tag>
<name>cache</name>
@@ -22,11 +20,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- <!--
- <taghandler>
- <classname>org.ajax4jsf.tag.TestHandler</classname>
- </taghandler>
- -->
&ui_component_attributes;
<property>
<name>key</name>
Modified: trunk/ui/src/main/config/component/conversationId.xml
===================================================================
--- trunk/ui/src/main/config/component/conversationId.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/conversationId.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,7 +16,7 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
+ &ui_parameter_attributes;
<property hidden="true" el="false" transient="true">
<name>viewId</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/src/main/config/component/conversationName.xml
===================================================================
--- trunk/ui/src/main/config/component/conversationName.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/conversationName.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -24,7 +24,6 @@
<taghandler>
<classname>org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler</classname>
</taghandler>
- &ui_component_attributes;
&ui_parameter_attributes;
</component>
</components>
Modified: trunk/ui/src/main/config/component/conversationPropagation.xml
===================================================================
--- trunk/ui/src/main/config/component/conversationPropagation.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/conversationPropagation.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -6,7 +6,6 @@
<family>org.jboss.seam.ui.ConversationPropagation</family>
<classname>org.jboss.seam.ui.component.html.HtmlConversationPropagation</classname>
<superclass>org.jboss.seam.ui.component.UIConversationPropagation</superclass>
-
<description>
<![CDATA[Customize the conversation propagation for a command link or button (or similar JSF control).]]>
</description>
@@ -21,10 +20,9 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- <taghandler>
- <classname>org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler</classname>
- </taghandler>
- &ui_component_attributes;
+ <taghandler>
+ <classname>org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler</classname>
+ </taghandler>
&ui_parameter_attributes;
<!-- should be el="false" -->
<property>
Modified: trunk/ui/src/main/config/component/convertDateTime.xml
===================================================================
--- trunk/ui/src/main/config/component/convertDateTime.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/convertDateTime.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -46,5 +46,4 @@
<defaultvalue>"date"</defaultvalue>
</property>
</converter>
-
</components>
Modified: trunk/ui/src/main/config/component/decorate.xml
===================================================================
--- trunk/ui/src/main/config/component/decorate.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/decorate.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -28,7 +28,7 @@
</taghandler>
&ui_component_attributes;
- &html_style_attributes;
+ &html_style_attributes;
<property el="false">
<name>for</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/src/main/config/component/div.xml
===================================================================
--- trunk/ui/src/main/config/component/div.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/div.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -12,7 +12,6 @@
<renderer generate="false" override="false">
<name>org.jboss.seam.ui.DivRenderer</name>
<classname>org.jboss.seam.ui.renderkit.DivRendererBase</classname>
- <!--<template>org/jboss/seam/ui/htmlDiv.jspx</template>-->
</renderer>
<tag>
<name>div</name>
Modified: trunk/ui/src/main/config/component/enumItem.xml
===================================================================
--- trunk/ui/src/main/config/component/enumItem.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/enumItem.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,7 +16,7 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
+ &ui_select_item_attributes;
<property>
<name>enumValue</name>
<classname>java.lang.String</classname>
@@ -31,12 +31,5 @@
the label to be used when rendering the SelectItem.
</description>
</property>
- <property>
- <name>itemDisabled</name>
- <classname>boolean</classname>
- <description>
- If true, this component isn't saved during state saving
- </description>
- </property>
</component>
</components>
Modified: trunk/ui/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/src/main/config/component/fileUpload.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/fileUpload.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -47,7 +47,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
&ui_input_attributes;
&html_style_attributes;
&html_input_attributes;
Modified: trunk/ui/src/main/config/component/formattedText.xml
===================================================================
--- trunk/ui/src/main/config/component/formattedText.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/formattedText.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -21,8 +21,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
&ui_output_attributes;
</component>
-
</components>
Modified: trunk/ui/src/main/config/component/formattedTextValidator.xml
===================================================================
--- trunk/ui/src/main/config/component/formattedTextValidator.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/formattedTextValidator.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -2,7 +2,7 @@
<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" >
<components>
<validator generate="false">
- <id>org.jboss.seam.ui.FormattedTextValidator</id>
+ <name>org.jboss.seam.ui.FormattedTextValidator</name>
<classname>org.jboss.seam.ui.validator.FormattedTextValidator</classname>
<description>
<![CDATA[Validate Seam Text input]]>
Modified: trunk/ui/src/main/config/component/fragment.xml
===================================================================
--- trunk/ui/src/main/config/component/fragment.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/fragment.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -12,7 +12,6 @@
<renderer generate="false" override="false">
<name>org.jboss.seam.ui.FragmentRenderer</name>
<classname>org.jboss.seam.ui.renderkit.FragmentRendererBase</classname>
-<!--<template>org/jboss/seam/ui/htmlFragment.jspx</template>-->
</renderer>
<tag>
<name>fragment</name>
Modified: trunk/ui/src/main/config/component/graphicImage.xml
===================================================================
--- trunk/ui/src/main/config/component/graphicImage.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/graphicImage.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -21,11 +21,9 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
&html_style_attributes;
&ui_graphic_attributes;
&ui_output_attributes;
-
<property>
<name>fileName</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/src/main/config/component/label.xml
===================================================================
--- trunk/ui/src/main/config/component/label.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/label.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,8 +16,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
-
- &ui_component_attributes;
&html_label_attributes;
&ui_output_attributes;
&html_style_attributes;
Modified: trunk/ui/src/main/config/component/link.xml
===================================================================
--- trunk/ui/src/main/config/component/link.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/link.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -21,7 +21,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
&ui_output_attributes;
&html_anchor_attributes;
&html_universal_attributes;
Modified: trunk/ui/src/main/config/component/message.xml
===================================================================
--- trunk/ui/src/main/config/component/message.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/message.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,7 +16,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
&ui_message_attributes;
</component>
</components>
Modified: trunk/ui/src/main/config/component/remote.xml
===================================================================
--- trunk/ui/src/main/config/component/remote.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/remote.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -12,7 +12,6 @@
<renderer generate="false" override="false">
<name>org.jboss.seam.ui.RemoteRenderer</name>
<classname>org.jboss.seam.ui.renderkit.RemoteRendererBase</classname>
- <!--<template>org/jboss/seam/ui/htmlSelectDate.jspx</template>-->
</renderer>
<tag>
<name>remote</name>
Modified: trunk/ui/src/main/config/component/selection.xml
===================================================================
--- trunk/ui/src/main/config/component/selection.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/selection.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -26,4 +26,4 @@
<classname>java.lang.String</classname>
</property>
</component>
-</components>
\ No newline at end of file
+</components>
Modified: trunk/ui/src/main/config/component/span.xml
===================================================================
--- trunk/ui/src/main/config/component/span.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/span.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -12,7 +12,6 @@
<renderer generate="false" override="false">
<name>org.jboss.seam.ui.SpanRenderer</name>
<classname>org.jboss.seam.ui.renderkit.SpanRendererBase</classname>
- <!--<template>org/jboss/seam/ui/htmlSpan.jspx</template>-->
</renderer>
<tag>
<name>span</name>
Modified: trunk/ui/src/main/config/component/taskId.xml
===================================================================
--- trunk/ui/src/main/config/component/taskId.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/taskId.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,6 +16,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
+ &ui_parameter_attributes;
</component>
</components>
Modified: trunk/ui/src/main/config/component/transformImageBlur.xml
===================================================================
--- trunk/ui/src/main/config/component/transformImageBlur.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/transformImageBlur.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,7 +16,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
<property>
<name>radius</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/src/main/config/component/transformImageSize.xml
===================================================================
--- trunk/ui/src/main/config/component/transformImageSize.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/transformImageSize.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,7 +16,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
<property>
<name>maintainRatio</name>
<classname>boolean</classname>
Modified: trunk/ui/src/main/config/component/transformImageType.xml
===================================================================
--- trunk/ui/src/main/config/component/transformImageType.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/transformImageType.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -16,7 +16,6 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
<property>
<name>contentType</name>
<classname>java.lang.String</classname>
Modified: trunk/ui/src/main/config/component/validateAll.xml
===================================================================
--- trunk/ui/src/main/config/component/validateAll.xml 2008-10-05 14:56:34 UTC (rev 9196)
+++ trunk/ui/src/main/config/component/validateAll.xml 2008-10-05 23:09:40 UTC (rev 9197)
@@ -20,6 +20,5 @@
org.jboss.seam.ui.util.cdk.UIComponentTagBase
</superclass>
</tag>
- &ui_component_attributes;
</component>
</components>
15 years, 7 months
Seam SVN: r9196 - trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-10-05 10:56:34 -0400 (Sun, 05 Oct 2008)
New Revision: 9196
Modified:
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/WikiPluginMacro.java
Log:
Fixed non-unique macro bug, appeared in macros that render macros
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/WikiPluginMacro.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/WikiPluginMacro.java 2008-10-05 12:24:30 UTC (rev 9195)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/WikiPluginMacro.java 2008-10-05 14:56:34 UTC (rev 9196)
@@ -19,6 +19,8 @@
import java.io.Serializable;
import java.util.Map;
import java.util.HashMap;
+import java.util.UUID;
+import java.util.Date;
/**
* An instance of a macro in wiki text that has an XHTML include/template.
@@ -71,6 +73,7 @@
}
}
+ private String uniqueId = Long.toString(new Date().getTime());
private String clientId;
private MacroPluginModule metadata;
private Map attributes = new HashMap();
@@ -106,8 +109,11 @@
// Some convenience methods that generate Strings used all over the place
+ // This needs to be unique _across_ different wiki texts. So the numeric position and the name is not enough,
+ // the hashCode() is overriden in the superclass to be the name/position combination... so we need the uniqueId.
+ // TODO: We can now actually remove the position and name, but they help us with debugging.
public String getPageVariableName() {
- return PAGE_VARIABLE_PREFIX + getPosition() + PAGE_VARIABLE_SEPARATOR + getName();
+ return PAGE_VARIABLE_PREFIX + getPosition() + PAGE_VARIABLE_SEPARATOR + this.uniqueId + PAGE_VARIABLE_SEPARATOR + getName();
}
public String getCallbackEventName(CallbackEvent event) {
@@ -187,8 +193,25 @@
return hash.hash(builder.toString());
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ if (!super.equals(o)) return false;
+ WikiPluginMacro that = (WikiPluginMacro) o;
+ return uniqueId.equals(that.uniqueId);
+
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + uniqueId.hashCode();
+ return result;
+ }
+
public String toString() {
- return "WikiPluginMacro ClientId '" + getClientId() + "' (" + getPosition() + "): "
+ return "WikiPluginMacro UniqueId '" + this.uniqueId + "' (" + getPosition() + "): "
+ getName() + " Params: " + getParams().size();
}
15 years, 7 months
Seam SVN: r9195 - trunk/build.
by seam-commits＠lists.jboss.org
Author: danielc.roth
Date: 2008-10-05 08:24:30 -0400 (Sun, 05 Oct 2008)
New Revision: 9195
Modified:
trunk/build/classpath.tmpl
Log:
Excel only needed once
Modified: trunk/build/classpath.tmpl
===================================================================
--- trunk/build/classpath.tmpl 2008-10-05 10:57:15 UTC (rev 9194)
+++ trunk/build/classpath.tmpl 2008-10-05 12:24:30 UTC (rev 9195)
@@ -9,7 +9,6 @@
<classpathentry kind="src" path="src/mail"/>
<classpathentry kind="src" path="src/pdf"/>
<classpathentry kind="src" path="src/excel"/>
- <classpathentry kind="src" path="src/excel"/>
<classpathentry kind="src" path="src/rss"/>
<classpathentry kind="src" path="src/gen"/>
<classpathentry kind="src" path="src/interop/jul"/>
15 years, 7 months