Seam SVN: r9164 - trunk/src/main/META-INF.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 14:05:49 -0400 (Wed, 01 Oct 2008)
New Revision: 9164
Modified:
trunk/src/main/META-INF/seam-deployment.properties
Log:
Back this change out, breaks a lot of stuff
Modified: trunk/src/main/META-INF/seam-deployment.properties
===================================================================
--- trunk/src/main/META-INF/seam-deployment.properties 2008-10-01 17:13:25 UTC (rev 9163)
+++ trunk/src/main/META-INF/seam-deployment.properties 2008-10-01 18:05:49 UTC (rev 9164)
@@ -1,2 +1 @@
org.jboss.seam.deployment.deploymentHandlers=org.jboss.seam.bpm.PageflowDeploymentHandler
-org.jboss.seam.init.duplicateJarsPatterns=^(\\S*)(tmp\\d+\\S*.jar)(\\S*)$
\ No newline at end of file
16 years, 2 months
Seam SVN: r9163 - in trunk/src/main: org/jboss/seam/init and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 13:13:25 -0400 (Wed, 01 Oct 2008)
New Revision: 9163
Modified:
trunk/src/main/META-INF/seam-deployment.properties
trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
JBSEAM-3481
Modified: trunk/src/main/META-INF/seam-deployment.properties
===================================================================
--- trunk/src/main/META-INF/seam-deployment.properties 2008-10-01 15:58:12 UTC (rev 9162)
+++ trunk/src/main/META-INF/seam-deployment.properties 2008-10-01 17:13:25 UTC (rev 9163)
@@ -1 +1,2 @@
-org.jboss.seam.deployment.deploymentHandlers=org.jboss.seam.bpm.PageflowDeploymentHandler
\ No newline at end of file
+org.jboss.seam.deployment.deploymentHandlers=org.jboss.seam.bpm.PageflowDeploymentHandler
+org.jboss.seam.init.duplicateJarsPatterns=^(\\S*)(tmp\\d+\\S*.jar)(\\S*)$
\ No newline at end of file
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-01 15:58:12 UTC (rev 9162)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-10-01 17:13:25 UTC (rev 9163)
@@ -43,6 +43,7 @@
import org.jboss.seam.core.Expressions;
import org.jboss.seam.core.Init;
import org.jboss.seam.deployment.HotDeploymentStrategy;
+import org.jboss.seam.deployment.SeamDeploymentProperties;
import org.jboss.seam.deployment.StandardDeploymentStrategy;
import org.jboss.seam.deployment.WarRootDeploymentStrategy;
import org.jboss.seam.exception.Exceptions;
@@ -67,6 +68,8 @@
{
public static final String COMPONENT_NAMESPACE = "http://jboss.com/products/seam/components";
public static final String COMPONENT_SUFFIX = ".component";
+ public static final String DUPLICATE_JARS_PATTERNS = "org.jboss.seam.init.duplicateJarsPatterns";
+
private static final LogProvider log = Logging.getLogProvider(Initialization.class);
private ServletContext servletContext;
@@ -135,17 +138,30 @@
}
Properties replacements = getReplacements();
+ List<String> duplicateJarPatterns = new SeamDeploymentProperties(Thread.currentThread().getContextClassLoader()).getPropertyValues(DUPLICATE_JARS_PATTERNS);
while (resources.hasMoreElements())
{
URL url = resources.nextElement();
- try
+ boolean skip = false;
+ for (String regex : duplicateJarPatterns)
{
- log.info("reading " + url);
- installComponentsFromXmlElements( XML.getRootElement( url.openStream() ), replacements );
+ String path = url.getPath();
+ if (path.matches(regex))
+ {
+ skip = true;
+ }
}
- catch (Exception e)
+ if (!skip)
{
- throw new RuntimeException("error while reading " + url, e);
+ try
+ {
+ log.info("reading " + url);
+ installComponentsFromXmlElements( XML.getRootElement( url.openStream() ), replacements );
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("error while reading " + url, e);
+ }
}
}
16 years, 2 months
Seam SVN: r9162 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 11:58:12 -0400 (Wed, 01 Oct 2008)
New Revision: 9162
Added:
trunk/src/main/org/jboss/seam/deployment/SeamDeploymentProperties.java
Modified:
trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java
trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java
Log:
Factor out the deployment properties reading code
Modified: trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-10-01 13:48:02 UTC (rev 9161)
+++ trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-10-01 15:58:12 UTC (rev 9162)
@@ -1,21 +1,13 @@
package org.jboss.seam.deployment;
-import static org.jboss.seam.util.Strings.split;
-
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
@@ -49,87 +41,9 @@
- /**
- * The resource bundle used to control Seam deployment
- */
- public static final String RESOURCE_BUNDLE = "META-INF/seam-deployment.properties";
- // All resource bundles to use, including legacy names
- private static final String[] RESOURCE_BUNDLES = { RESOURCE_BUNDLE, "META-INF/seam-scanner.properties" };
/**
- * Get a list of possible values for a given key.
- *
- * First, System properties are tried, followed by the specified resource
- * bundle (first in classpath only).
- *
- * Colon (:) deliminated lists are split out.
- *
- */
- protected List<String> getPropertyValues(String key)
- {
- List<String>values = new ArrayList<String>();
- addPropertyFromSystem(key, values);
- addPropertyFromResourceBundle(key, values);
- return values;
- }
-
- private void addPropertyFromSystem(String key, List<String> values)
- {
- addProperty(key, System.getProperty(key), values);
- }
-
- private void addPropertyFromResourceBundle(String key, List<String> values)
- {
- for (String resourceName : RESOURCE_BUNDLES)
- {
- try
- {
- // Hard to cache as we have to get it off the correct classloader
- Enumeration<URL> urlEnum = getClassLoader().getResources(resourceName);
- while ( urlEnum.hasMoreElements() )
- {
- URL url = urlEnum.nextElement();
- Properties properties = new Properties();
- InputStream propertyStream = url.openStream();
- try
- {
- properties.load(propertyStream);
- addProperty(key, properties.getProperty(key), values);
- }
- finally
- {
- if (propertyStream != null)
- {
- propertyStream.close();
- }
- }
- }
- }
- catch (IOException e)
- {
- // No-op, optional file
- }
- }
- }
-
- /*
- * Add the property to the set of properties only if it hasn't already been added
- */
- private void addProperty(String key, String value, List<String> values)
- {
- if (value != null)
- {
- String[] properties = split(value, ":");
- for (String property : properties)
- {
- values.add(property);
- }
-
- }
- }
-
- /**
* Do the scan for resources
*
* Should only be called by Seam
@@ -173,7 +87,8 @@
private void initDeploymentHandlers()
{
this.deploymentHandlers = new HashMap<String, DeploymentHandler>();
- addHandlers(getPropertyValues(getDeploymentHandlersKey()));
+ List<String> deploymentHandlersClassNames = new SeamDeploymentProperties(getClassLoader()).getPropertyValues(getDeploymentHandlersKey());
+ addHandlers(deploymentHandlersClassNames);
}
protected abstract String getDeploymentHandlersKey();
@@ -193,7 +108,7 @@
private void initScanner()
{
- List<String> scanners = getPropertyValues(SCANNERS_KEY);
+ List<String> scanners = new SeamDeploymentProperties(getClassLoader()).getPropertyValues(SCANNERS_KEY);
for ( String className : scanners )
{
Scanner scanner = instantiateScanner(className);
Modified: trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-10-01 13:48:02 UTC (rev 9161)
+++ trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-10-01 15:58:12 UTC (rev 9162)
@@ -50,8 +50,6 @@
private ComponentDeploymentHandler componentDeploymentHandler;
private AnnotationDeploymentHandler annotationDeploymentHandler;
-
- private long timestamp = 0L;
private ClassLoader classLoader;
@@ -70,7 +68,7 @@
initHotDeployClassLoader(classLoader, hotDeployDirectory);
componentDeploymentHandler = new ComponentDeploymentHandler();
getDeploymentHandlers().put(ComponentDeploymentHandler.NAME, componentDeploymentHandler);
- annotationDeploymentHandler = new AnnotationDeploymentHandler(getPropertyValues(AnnotationDeploymentHandler.ANNOTATIONS_KEY), classLoader);
+ annotationDeploymentHandler = new AnnotationDeploymentHandler(new SeamDeploymentProperties(classLoader).getPropertyValues(AnnotationDeploymentHandler.ANNOTATIONS_KEY), classLoader);
getDeploymentHandlers().put(AnnotationDeploymentHandler.NAME, annotationDeploymentHandler);
}
getDeploymentHandlers().put(DotPageDotXmlDeploymentHandler.NAME, new DotPageDotXmlDeploymentHandler());
Added: trunk/src/main/org/jboss/seam/deployment/SeamDeploymentProperties.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/SeamDeploymentProperties.java (rev 0)
+++ trunk/src/main/org/jboss/seam/deployment/SeamDeploymentProperties.java 2008-10-01 15:58:12 UTC (rev 9162)
@@ -0,0 +1,116 @@
+package org.jboss.seam.deployment;
+
+import static org.jboss.seam.util.Strings.split;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+
+import org.jboss.seam.util.EnumerationEnumeration;
+
+public class SeamDeploymentProperties
+{
+
+ private ClassLoader classLoader;
+ private Enumeration<URL> urlEnum;
+
+ public SeamDeploymentProperties(ClassLoader classLoader)
+ {
+ this.classLoader = classLoader;
+ }
+
+ /**
+ * The resource bundle used to control Seam deployment
+ */
+ public static final String RESOURCE_BUNDLE = "META-INF/seam-deployment.properties";
+
+ // All resource bundles to use, including legacy names
+ private static final String[] RESOURCE_BUNDLES = { RESOURCE_BUNDLE, "META-INF/seam-scanner.properties" };
+
+ /**
+ * Get a list of possible values for a given key.
+ *
+ * First, System properties are tried, followed by the specified resource
+ * bundle (first in classpath only).
+ *
+ * Colon (:) deliminated lists are split out.
+ *
+ */
+ public List<String> getPropertyValues(String key)
+ {
+ List<String>values = new ArrayList<String>();
+ addPropertiesFromSystem(key, values);
+ addPropertiesFromResourceBundle(key, values);
+ return values;
+ }
+
+ private void addPropertiesFromSystem(String key, List<String> values)
+ {
+ addProperty(key, System.getProperty(key), values);
+ }
+
+ private void addPropertiesFromResourceBundle(String key, List<String> values)
+ {
+ try
+ {
+ while ( getResources().hasMoreElements() )
+ {
+ URL url = getResources().nextElement();
+ Properties properties = new Properties();
+ InputStream propertyStream = url.openStream();
+ try
+ {
+ properties.load(propertyStream);
+ addProperty(key, properties.getProperty(key), values);
+ }
+ finally
+ {
+ if (propertyStream != null)
+ {
+ propertyStream.close();
+ }
+ }
+ }
+ }
+ catch (IOException e)
+ {
+ // No - op, file is optional
+ }
+ }
+
+ /*
+ * Add the property to the set of properties only if it hasn't already been added
+ */
+ private void addProperty(String key, String value, List<String> values)
+ {
+ if (value != null)
+ {
+ String[] properties = split(value, ":");
+ for (String property : properties)
+ {
+ values.add(property);
+ }
+
+ }
+ }
+
+ private Enumeration<URL> getResources() throws IOException
+ {
+
+ if (urlEnum == null)
+ {
+ Enumeration<URL>[] enumerations = new Enumeration[RESOURCE_BUNDLES.length];
+ for (int i = 0; i < RESOURCE_BUNDLES.length; i ++)
+ {
+ enumerations[i] = classLoader.getResources(RESOURCE_BUNDLES[i]);
+ }
+ urlEnum = new EnumerationEnumeration<URL>(enumerations);
+ }
+ return urlEnum;
+ }
+
+}
Property changes on: trunk/src/main/org/jboss/seam/deployment/SeamDeploymentProperties.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-10-01 13:48:02 UTC (rev 9161)
+++ trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-10-01 15:58:12 UTC (rev 9162)
@@ -54,7 +54,7 @@
getDeploymentHandlers().put(ComponentsXmlDeploymentHandler.NAME, componentsXmlDeploymentHandler);
namespaceDeploymentHandler = new NamespaceDeploymentHandler();
getDeploymentHandlers().put(NamespaceDeploymentHandler.NAME, namespaceDeploymentHandler);
- annotationDeploymentHandler = new AnnotationDeploymentHandler(getPropertyValues(AnnotationDeploymentHandler.ANNOTATIONS_KEY), classLoader);
+ annotationDeploymentHandler = new AnnotationDeploymentHandler(new SeamDeploymentProperties(classLoader).getPropertyValues(AnnotationDeploymentHandler.ANNOTATIONS_KEY), classLoader);
getDeploymentHandlers().put(AnnotationDeploymentHandler.NAME, annotationDeploymentHandler);
}
16 years, 2 months
Seam SVN: r9161 - trunk/src/mail/org/jboss/seam/mail/ui.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 09:48:02 -0400 (Wed, 01 Oct 2008)
New Revision: 9161
Modified:
trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java
Log:
Need to check for null when seeing if attachment is a pdf.
Modified: trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java
===================================================================
--- trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java 2008-10-01 13:44:57 UTC (rev 9160)
+++ trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java 2008-10-01 13:48:02 UTC (rev 9161)
@@ -126,7 +126,7 @@
InputStream is = (InputStream) getValue();
ds = new ByteArrayDataSource(is, getContentType());
}
- else if (Reflections.isInstanceOf(getValue().getClass(), "org.jboss.seam.document.DocumentData"))
+ else if (getValue() != null && Reflections.isInstanceOf(getValue().getClass(), "org.jboss.seam.document.DocumentData"))
{
Method dataGetter = Reflections.getGetterMethod(getValue().getClass(), "data");
Method docTypeGetter = Reflections.getGetterMethod(getValue().getClass(), "documentType");
16 years, 2 months
Seam SVN: r9160 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 09:44:57 -0400 (Wed, 01 Oct 2008)
New Revision: 9160
Modified:
trunk/build/root.pom.xml
Log:
JBSEAM-3462
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-10-01 13:11:35 UTC (rev 9159)
+++ trunk/build/root.pom.xml 2008-10-01 13:44:57 UTC (rev 9160)
@@ -38,7 +38,7 @@
<!-- Externalize some version numbers here -->
<properties>
- <version.richfaces>3.2.2.BETA4</version.richfaces>
+ <version.richfaces>3.2.2.GA</version.richfaces>
<version.wicket>1.3.3</version.wicket>
<version.drools>4.0.4</version.drools>
</properties>
16 years, 2 months
Seam SVN: r9159 - trunk/examples/wicket/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 09:11:35 -0400 (Wed, 01 Oct 2008)
New Revision: 9159
Removed:
trunk/examples/wicket/resources/WEB-INF/pages.xml
Log:
Remove pages.xml, not needed
Deleted: trunk/examples/wicket/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/wicket/resources/WEB-INF/pages.xml 2008-10-01 13:11:11 UTC (rev 9158)
+++ trunk/examples/wicket/resources/WEB-INF/pages.xml 2008-10-01 13:11:35 UTC (rev 9159)
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pages xmlns="http://jboss.com/products/seam/pages"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"
-
- no-conversation-view-id="/main.xhtml"
- login-view-id="/home.xhtml">
-
- <page view-id="/register.xhtml">
-
- <action if="#{validation.failed}"
- execute="#{register.invalid}"/>
-
- <navigation>
- <rule if="#{register.registered}">
- <redirect view-id="/home.xhtml"/>
- </rule>
- </navigation>
-
- </page>
-
- <page view-id="/home.xhtml">
-
- <navigation>
- <rule if="#{identity.loggedIn}">
- <redirect view-id="/main.xhtml"/>
- </rule>
- </navigation>
-
- </page>
-
- <page view-id="/password.xhtml"
- login-required="true">
-
- <navigation>
- <rule if="#{changePassword.changed}">
- <redirect view-id="/main.xhtml"/>
- </rule>
- </navigation>
-
- </page>
-
- <page view-id="/main.xhtml"
- login-required="true">
-
- <navigation from-action="#{hotelBooking.selectHotel(hot)}">
- <redirect view-id="/hotel.xhtml"/>
- </navigation>
-
- <navigation from-action="#{bookingList.cancel}">
- <redirect/>
- </navigation>
-
- </page>
-
- <page view-id="/hotel.xhtml"
- conversation-required="true"
- login-required="true">
-
- <description>View hotel: #{hotel.name}</description>
-
- <navigation from-action="#{hotelBooking.bookHotel}">
- <redirect view-id="/book.xhtml"/>
- </navigation>
-
- </page>
-
- <page view-id="/book.xhtml"
- conversation-required="true"
- login-required="true">
-
- <description>Book hotel: #{hotel.name}</description>
-
- <navigation from-action="#{hotelBooking.setBookingDetails}">
- <rule if="#{hotelBooking.bookingValid}">
- <redirect view-id="/confirm.xhtml"/>
- </rule>
- </navigation>
-
- </page>
-
- <page view-id="/confirm.xhtml"
- conversation-required="true"
- login-required="true">
-
- <description>Confirm booking: #{booking.description}</description>
-
- <navigation from-action="#{hotelBooking.confirm}">
- <redirect view-id="/main.xhtml"/>
- </navigation>
-
- </page>
-
- <page view-id="*">
-
- <navigation from-action="#{identity.logout}">
- <redirect view-id="/home.xhtml"/>
- </navigation>
-
- <navigation from-action="#{hotelBooking.cancel}">
- <redirect view-id="/main.xhtml"/>
- </navigation>
-
- </page>
-
- <exception class="org.jboss.seam.security.NotLoggedInException">
- <redirect view-id="/home.xhtml">
- <message severity="warn">You must be logged in to use this feature</message>
- </redirect>
- </exception>
-
- <exception class="javax.faces.application.ViewExpiredException">
- <redirect view-id="/home.xhtml">
- <message severity="warn">Session expired, please log in again</message>
- </redirect>
- </exception>
-
-</pages>
16 years, 2 months
Seam SVN: r9158 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 09:11:11 -0400 (Wed, 01 Oct 2008)
New Revision: 9158
Modified:
trunk/build/root.pom.xml
trunk/build/ui.pom.xml
Log:
JBSEAM-3463
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-10-01 13:03:19 UTC (rev 9157)
+++ trunk/build/root.pom.xml 2008-10-01 13:11:11 UTC (rev 9158)
@@ -427,18 +427,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified: trunk/build/ui.pom.xml
===================================================================
--- trunk/build/ui.pom.xml 2008-10-01 13:03:19 UTC (rev 9157)
+++ trunk/build/ui.pom.xml 2008-10-01 13:11:11 UTC (rev 9158)
@@ -112,11 +112,7 @@
</dependency>
<!-- Maven's "nearest" dependency resolution doesn't take into account parent dependency management! -->
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <optional>true</optional>
- </dependency>
+
<dependency>
<groupId>javax.faces</groupId>
16 years, 2 months
Seam SVN: r9157 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 09:03:19 -0400 (Wed, 01 Oct 2008)
New Revision: 9157
Modified:
trunk/build/common.build.xml
Log:
add rss module to dependency report
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-10-01 13:02:20 UTC (rev 9156)
+++ trunk/build/common.build.xml 2008-10-01 13:03:19 UTC (rev 9157)
@@ -356,6 +356,7 @@
<outputDependencyReport module="mail" />
<outputDependencyReport module="pdf" />
<outputDependencyReport module="excel" />
+ <outputDependencyReport module="rss" />
<outputDependencyReport module="ioc" />
<outputDependencyReport module="wicket" />
<outputDependencyReport module="resteasy" />
16 years, 2 months
Seam SVN: r9156 - trunk/examples/mail/src/org/jboss/seam/example/mail/test.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-10-01 09:02:20 -0400 (Wed, 01 Oct 2008)
New Revision: 9156
Modified:
trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java
Log:
test env doesn't support ui:repeat :(
Modified: trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java
===================================================================
--- trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java 2008-10-01 12:28:01 UTC (rev 9155)
+++ trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java 2008-10-01 13:02:20 UTC (rev 9156)
@@ -188,14 +188,14 @@
assert "whyseam.pdf".equals(bodyPart.getFileName());
assert "attachment".equals(bodyPart.getDisposition());
- // Attachment 5
- assert attachments.getBodyPart(5) != null;
+ // Attachment 5 -- ui:repeat doesn't work in test env :(
+ /*assert attachments.getBodyPart(5) != null;
assert attachments.getBodyPart(5) instanceof MimeBodyPart;
bodyPart = (MimeBodyPart) attachments.getBodyPart(5);
assert bodyPart.getContent() != null;
assert "Gavin_King.jpg".equals(bodyPart.getFileName());
assert bodyPart.isMimeType("image/jpeg");
- assert "attachment".equals(bodyPart.getDisposition());
+ assert "attachment".equals(bodyPart.getDisposition());*/
}
}.run();
16 years, 2 months
Seam SVN: r9155 - in trunk/examples: messages and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-10-01 08:28:01 -0400 (Wed, 01 Oct 2008)
New Revision: 9155
Modified:
trunk/examples/build.xml
trunk/examples/messages/build.xml
Log:
JBSEAM-3324
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-10-01 00:05:26 UTC (rev 9154)
+++ trunk/examples/build.xml 2008-10-01 12:28:01 UTC (rev 9155)
@@ -146,6 +146,11 @@
<include name="jboss-seam-ui.jar" if="seam.ui.lib" />
<include name="commons-beanutils.jar" if="seam.ui.lib" unless="richfaces.lib" />
</fileset>
+
+ <!-- tomcat needs in messages example jstl.jar -->
+ <fileset dir="${lib.dir}" id="tomcat-standard-tag.jar">
+ <include name="jstl.jar" if="tomcat.standard.tag"/>
+ </fileset>
<!-- Seam pdf, with required dependencies -->
<fileset id="seam.pdf.jar" dir="${lib.dir}">
@@ -546,7 +551,7 @@
<copyInlineDependencies id="elri" scope="runtime" todir="${lib.dir}">
<dependency groupId="javax.el" artifactId="el-ri" version="1.2" />
</copyInlineDependencies>
- </target>
+ </target>
<!-- Use the Eclipse compiler, if it is available -->
<target name="select-compiler">
@@ -595,6 +600,7 @@
<fileset refid="trinidad-impl.jar" />
<fileset refid="jboss-common-core.jar" />
<fileset refid="war.lib.extras" />
+ <fileset refid="tomcat-standard-tag.jar" />
<mapper type="flatten" />
</copy>
<!-- Put properties into the classpath -->
Modified: trunk/examples/messages/build.xml
===================================================================
--- trunk/examples/messages/build.xml 2008-10-01 00:05:26 UTC (rev 9154)
+++ trunk/examples/messages/build.xml 2008-10-01 12:28:01 UTC (rev 9155)
@@ -8,8 +8,15 @@
<!-- Libraries -->
<property name="seam.ui.lib" value="yes"/>
+ <property name="tomcat.standard.tag" value="yes" />
- <import file="../build.xml"/>
+ <import file="../build.xml"/>
+ <target name="copyextradependencies">
+ <copyInlineDependencies id="jstl" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="apache-taglibs" artifactId="jstl" version="1.1.2" />
+ </copyInlineDependencies>
+ </target>
+
</project>
16 years, 2 months