Seam SVN: r9396 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-23 12:41:57 -0400 (Thu, 23 Oct 2008)
New Revision: 9396
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/Filter.java
Log:
JBPAPP-1296
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/Filter.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/Filter.java 2008-10-23 16:36:52 UTC (rev 9395)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/Filter.java 2008-10-23 16:41:57 UTC (rev 9396)
@@ -1,5 +1,6 @@
package org.jboss.seam.persistence;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -21,7 +22,7 @@
*/
@BypassInterceptors
@Scope(ScopeType.APPLICATION)
-public class Filter
+public class Filter implements Serializable
{
private String name;
// default to no parameters
16 years, 1 month
Seam SVN: r9395 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-23 12:36:52 -0400 (Thu, 23 Oct 2008)
New Revision: 9395
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/QuartzDispatcher.java
Log:
JBPAPP-1294
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/QuartzDispatcher.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/QuartzDispatcher.java 2008-10-23 16:19:00 UTC (rev 9394)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/async/QuartzDispatcher.java 2008-10-23 16:36:52 UTC (rev 9395)
@@ -176,7 +176,7 @@
}
else
{
- SimpleTrigger trigger = new SimpleTrigger(triggerName, null, null,
+ SimpleTrigger trigger = new SimpleTrigger(triggerName, null, new Date(),
timerSchedule.getFinalExpiration(),
SimpleTrigger.REPEAT_INDEFINITELY,
timerSchedule.getIntervalDuration());
16 years, 1 month
Seam SVN: r9394 - trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-10-23 12:19:00 -0400 (Thu, 23 Oct 2008)
New Revision: 9394
Modified:
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java
Log:
Fixed maximum length in feed entry body check
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java 2008-10-23 15:28:46 UTC (rev 9393)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/model/FeedEntry.java 2008-10-23 16:19:00 UTC (rev 9394)
@@ -60,7 +60,7 @@
private String descriptionType;
@Column(name = "DESCRIPTION_VALUE", nullable = false)
- @Length(min = 1, max = 32767)
+ @Length(min = 1, max = 131072) // TODO: We don't really know how much we need... so let's go for 128kb
private String descriptionValue;
public FeedEntry() {}
16 years, 1 month
Seam SVN: r9393 - in trunk: examples/excel/src/org/jboss/seam/excel/test and 2 other directories.
by seam-commits＠lists.jboss.org
Author: danielc.roth
Date: 2008-10-23 11:28:46 -0400 (Thu, 23 Oct 2008)
New Revision: 9393
Added:
trunk/examples/excel/src/org/jboss/seam/excel/test/RenderTest.java
trunk/examples/excel/view/simple.xhtml
Modified:
trunk/examples/excel/build.xml
trunk/examples/excel/src/org/jboss/seam/excel/test/testng.xml
trunk/src/main/org/jboss/seam/mock/MockApplication.java
Log:
JBSEAM-3214
Modified: trunk/examples/excel/build.xml
===================================================================
--- trunk/examples/excel/build.xml 2008-10-23 14:28:08 UTC (rev 9392)
+++ trunk/examples/excel/build.xml 2008-10-23 15:28:46 UTC (rev 9393)
@@ -15,14 +15,25 @@
<import file="../build.xml"/>
+ <patternset id="test.view.files">
+ <include name="*.*" />
+ </patternset>
+
+ <patternset id="test.src.files">
+ <include name="**/*.xml" />
+ <include name="**/*.xhtml" />
+ </patternset>
+
+
<path id="test.classpath.extras">
- <fileset refid="seam.excel.jar" />
+ <path location="${lib.dir}/jboss-seam-ui.jar" />
</path>
<path id="build.classpath.extras">
- <fileset refid="seam.excel.jar" />
+ <path location="${lib.dir}/jboss-seam-excel.jar" />
+ <path location="${lib.dir}/jboss-seam-pdf.jar" />
</path>
-
+
</project>
Added: trunk/examples/excel/src/org/jboss/seam/excel/test/RenderTest.java
===================================================================
--- trunk/examples/excel/src/org/jboss/seam/excel/test/RenderTest.java (rev 0)
+++ trunk/examples/excel/src/org/jboss/seam/excel/test/RenderTest.java 2008-10-23 15:28:46 UTC (rev 9393)
@@ -0,0 +1,62 @@
+package org.jboss.seam.excel.test;
+
+import java.io.ByteArrayInputStream;
+import java.util.List;
+
+import jxl.Cell;
+import jxl.Sheet;
+import jxl.Workbook;
+
+import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.document.DocumentData;
+import org.jboss.seam.excel.ExcelTest.Person;
+import org.jboss.seam.faces.Renderer;
+import org.jboss.seam.mock.SeamTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Daniel Roth
+ *
+ * Really small test. Renders an jxl excel file from jsf tags and
+ * verifies the content.
+ *
+ */
+public class RenderTest extends SeamTest {
+
+ @Test
+ public void testSimple() throws Exception {
+
+ new FacesRequest() {
+
+ @Override
+ protected void updateModelValues() throws Exception {
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception {
+
+ Renderer.instance().render("/simple.xhtml");
+
+ DocumentData data = (DocumentData) Contexts.getEventContext().get("testExport");
+ Workbook workbook = Workbook.getWorkbook(new ByteArrayInputStream(data.getData()));
+ Sheet sheet = workbook.getSheet("Developers");
+
+ assert sheet != null;
+
+ assert "Daniel Roth".equals(sheet.getCell(0, 0).getContents());
+ assert "Nicklas Karlsson".equals(sheet.getCell(0, 1).getContents());
+
+ }
+ }.run();
+ }
+
+ public static void main(String[] args) {
+ RenderTest t = new RenderTest();
+ try {
+ t.testSimple();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+}
Modified: trunk/examples/excel/src/org/jboss/seam/excel/test/testng.xml
===================================================================
--- trunk/examples/excel/src/org/jboss/seam/excel/test/testng.xml 2008-10-23 14:28:08 UTC (rev 9392)
+++ trunk/examples/excel/src/org/jboss/seam/excel/test/testng.xml 2008-10-23 15:28:46 UTC (rev 9393)
@@ -4,6 +4,7 @@
<test name="Excel Tests">
<classes>
+ <class name="org.jboss.seam.excel.test.RenderTest"/>
</classes>
</test>
Added: trunk/examples/excel/view/simple.xhtml
===================================================================
--- trunk/examples/excel/view/simple.xhtml (rev 0)
+++ trunk/examples/excel/view/simple.xhtml 2008-10-23 15:28:46 UTC (rev 9393)
@@ -0,0 +1,8 @@
+<e:workbook exportKey="testExport"
+ xmlns:e="http://jboss.com/products/seam/excel"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <e:worksheet name="Developers">
+ <e:cell column="0" row="0" value="Daniel Roth" />
+ <e:cell column="0" row="1" value="Nicklas Karlsson" />
+ </e:worksheet>
+</e:workbook>
Modified: trunk/src/main/org/jboss/seam/mock/MockApplication.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/MockApplication.java 2008-10-23 14:28:08 UTC (rev 9392)
+++ trunk/src/main/org/jboss/seam/mock/MockApplication.java 2008-10-23 15:28:46 UTC (rev 9393)
@@ -250,7 +250,7 @@
public UIComponent createComponent(String name) throws FacesException
{
// Best guess component creation with a dummy component if it can't be found
- if (name.startsWith("org.jboss.seam.mail.ui"))
+ if (name.startsWith("org.jboss.seam.mail.ui") || name.startsWith("org.jboss.seam.excel.ui"))
{
try
{
16 years, 1 month
Seam SVN: r9392 - trunk/seam-gen.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-23 10:28:08 -0400 (Thu, 23 Oct 2008)
New Revision: 9392
Modified:
trunk/seam-gen/build.xml
Log:
enable project filter when copying build*properties files
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-10-23 14:26:24 UTC (rev 9391)
+++ trunk/seam-gen/build.xml 2008-10-23 14:28:08 UTC (rev 9392)
@@ -871,6 +871,7 @@
<fileset dir="${templates.dir}/build-scripts">
<include name="build*.properties"/>
</fileset>
+ <filterset refid="project"/>
</copy>
<mkdir dir="${project.home}/src/${model.dir}"/>
16 years, 1 month
Seam SVN: r9391 - in trunk/seam-gen: ide-project-files/idea and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-23 10:26:24 -0400 (Thu, 23 Oct 2008)
New Revision: 9391
Modified:
trunk/seam-gen/icefaces/ide-project-files/idea/module.iml
trunk/seam-gen/ide-project-files/idea/module.iml
trunk/seam-gen/ide-project-files/idea/project.ipr
Log:
set the "use relative paths" setting to "true" in IDEA project files; a good default
Modified: trunk/seam-gen/icefaces/ide-project-files/idea/module.iml
===================================================================
--- trunk/seam-gen/icefaces/ide-project-files/idea/module.iml 2008-10-23 14:08:01 UTC (rev 9390)
+++ trunk/seam-gen/icefaces/ide-project-files/idea/module.iml 2008-10-23 14:26:24 UTC (rev 9391)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="false" type="JAVA_MODULE" version="4">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
Modified: trunk/seam-gen/ide-project-files/idea/module.iml
===================================================================
--- trunk/seam-gen/ide-project-files/idea/module.iml 2008-10-23 14:08:01 UTC (rev 9390)
+++ trunk/seam-gen/ide-project-files/idea/module.iml 2008-10-23 14:26:24 UTC (rev 9391)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="false" type="JAVA_MODULE" version="4">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
Modified: trunk/seam-gen/ide-project-files/idea/project.ipr
===================================================================
--- trunk/seam-gen/ide-project-files/idea/project.ipr 2008-10-23 14:08:01 UTC (rev 9390)
+++ trunk/seam-gen/ide-project-files/idea/project.ipr 2008-10-23 14:26:24 UTC (rev 9391)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="false" version="4">
+<project relativePaths="true" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
16 years, 1 month
Seam SVN: r9390 - trunk/seam-gen/view.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-10-23 10:08:01 -0400 (Thu, 23 Oct 2008)
New Revision: 9390
Modified:
trunk/seam-gen/view/edit.xhtml.ftl
trunk/seam-gen/view/view.xhtml.ftl
Log:
JBSEAM-3617
Modified: trunk/seam-gen/view/edit.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/edit.xhtml.ftl 2008-10-23 12:49:42 UTC (rev 9389)
+++ trunk/seam-gen/view/edit.xhtml.ftl 2008-10-23 14:08:01 UTC (rev 9390)
@@ -124,7 +124,7 @@
<#else>
<h:column>
<f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
- <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
+ <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
Modified: trunk/seam-gen/view/view.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/view.xhtml.ftl 2008-10-23 12:49:42 UTC (rev 9389)
+++ trunk/seam-gen/view/view.xhtml.ftl 2008-10-23 14:08:01 UTC (rev 9390)
@@ -97,7 +97,7 @@
<#else>
<h:column>
<f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
- <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
+ <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
16 years, 1 month
Seam SVN: r9389 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-23 08:49:42 -0400 (Thu, 23 Oct 2008)
New Revision: 9389
Modified:
trunk/build/ci.build.xml
Log:
add examples to justSnapshot target
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-10-23 12:40:41 UTC (rev 9388)
+++ trunk/build/ci.build.xml 2008-10-23 12:49:42 UTC (rev 9389)
@@ -60,11 +60,14 @@
<target name="justSnapshot">
<build target="cleanall" />
- <build target="build" />
+ <build target="dist" />
<ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
<property name="qualifier" value="-SNAPSHOT" />
</ant>
+ <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
</target>
<target name="snapshotDocumentation">
16 years, 1 month
Seam SVN: r9388 - trunk/src/main/org/jboss/seam/security/permission.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-10-23 08:40:41 -0400 (Thu, 23 Oct 2008)
New Revision: 9388
Modified:
trunk/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
Log:
fixed NPE
Modified: trunk/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2008-10-23 11:57:25 UTC (rev 9387)
+++ trunk/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2008-10-23 12:40:41 UTC (rev 9388)
@@ -12,6 +12,7 @@
import org.jboss.seam.core.Expressions;
import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.persistence.PersistenceProvider;
+import org.jboss.seam.util.Strings;
/**
* An Identifier strategy for entity-based permission checks
@@ -57,7 +58,7 @@
if (cls.isAnnotationPresent(Identifier.class))
{
Identifier identifier = (Identifier) cls.getAnnotation(Identifier.class);
- if (identifier.name() != null && !"".equals(name.trim()))
+ if ( !Strings.isEmpty(identifier.name()) )
{
name = identifier.name();
}
16 years, 1 month
Seam SVN: r9387 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-23 07:57:25 -0400 (Thu, 23 Oct 2008)
New Revision: 9387
Modified:
trunk/build/ci.build.xml
Log:
add a justSnapshot target
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-10-23 11:31:39 UTC (rev 9386)
+++ trunk/build/ci.build.xml 2008-10-23 11:57:25 UTC (rev 9387)
@@ -58,6 +58,15 @@
</ant>
</target>
+ <target name="justSnapshot">
+ <build target="cleanall" />
+ <build target="build" />
+
+ <ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ </target>
+
<target name="snapshotDocumentation">
<build target="cleanall" />
<build target="refdoc">
16 years, 1 month