Seam SVN: r8903 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-04 08:35:31 -0400 (Thu, 04 Sep 2008)
New Revision: 8903
Modified:
trunk/build/root.pom.xml
Log:
oops
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-09-04 12:24:45 UTC (rev 8902)
+++ trunk/build/root.pom.xml 2008-09-04 12:35:31 UTC (rev 8903)
@@ -427,6 +427,12 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.7-brew</version>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -524,6 +530,12 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
17 years, 7 months
Seam SVN: r8902 - branches/Seam_2_0_FP/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-04 08:24:45 -0400 (Thu, 04 Sep 2008)
New Revision: 8902
Modified:
branches/Seam_2_0_FP/build/root.pom.xml
Log:
ws
Modified: branches/Seam_2_0_FP/build/root.pom.xml
===================================================================
--- branches/Seam_2_0_FP/build/root.pom.xml 2008-09-04 12:05:10 UTC (rev 8901)
+++ branches/Seam_2_0_FP/build/root.pom.xml 2008-09-04 12:24:45 UTC (rev 8902)
@@ -345,7 +345,7 @@
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>hibernate</artifactId>
</exclusion>
</exclusions>
</dependency>
17 years, 7 months
Seam SVN: r8901 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-04 08:05:10 -0400 (Thu, 04 Sep 2008)
New Revision: 8901
Modified:
trunk/build/core.pom.xml
trunk/build/ui.pom.xml
Log:
JBSEAM-3311
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-09-04 09:03:29 UTC (rev 8900)
+++ trunk/build/core.pom.xml 2008-09-04 12:05:10 UTC (rev 8901)
@@ -20,6 +20,13 @@
<artifactId>hibernate</artifactId>
<optional>true</optional>
</dependency>
+
+ <!-- Maven's "nearest" dependency resolution doesn't take into account parent dependency management! -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hibernate</groupId>
Modified: trunk/build/ui.pom.xml
===================================================================
--- trunk/build/ui.pom.xml 2008-09-04 09:03:29 UTC (rev 8900)
+++ trunk/build/ui.pom.xml 2008-09-04 12:05:10 UTC (rev 8901)
@@ -104,6 +104,18 @@
<optional>true</optional>
</dependency>
+ <!-- Maven's "nearest" dependency resolution doesn't take into account parent dependency management! -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <!-- Maven's "nearest" dependency resolution doesn't take into account parent dependency management! -->
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
17 years, 7 months
Seam SVN: r8900 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-09-04 05:03:29 -0400 (Thu, 04 Sep 2008)
New Revision: 8900
Added:
tags/Seam_FP_GA/
Removed:
tags/Seam_FP_CR3/
Log:
renaming CR3 to GA, CR4 was only rebuild release with the same SVN sources
Copied: tags/Seam_FP_GA (from rev 8899, tags/Seam_FP_CR3)
17 years, 7 months
Seam SVN: r8899 - trunk/doc/Seam_Reference_Guide/en-US.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2008-09-04 03:10:32 -0400 (Thu, 04 Sep 2008)
New Revision: 8899
Modified:
trunk/doc/Seam_Reference_Guide/en-US/Excel.xml
Log:
Minor. Added link to configuring document servlet to serve *.xls files (JBSEAM-3284)
and info on security restrictions on IE (http://seamframework.org/Community/ExportToPdfOrExcelFromRichdataTable#co...)
Modified: trunk/doc/Seam_Reference_Guide/en-US/Excel.xml
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-09-04 05:50:49 UTC (rev 8898)
+++ trunk/doc/Seam_Reference_Guide/en-US/Excel.xml 2008-09-04 07:10:32 UTC (rev 8899)
@@ -66,7 +66,16 @@
own exporter will be used. Default is "jxl", but support for CSV has also been
added, using the type "csv".
</para>
-
+ <para>
+ See <xref linkend="itext.configuration" /> for information on how to configure
+ the document servlet for serving the documents with an .xls extension.
+ </para>
+ <para>
+ If you are having problems accessing the generated file under IE (especially
+ with https), make sure you are not using too strict restrictions in the browser
+ (see <ulink url="http://www.nwnetworks.com/iezones.htm/"/>), too strict security
+ constraint in web.xml or a combination of both.
+ </para>
</section>
<section id="excel.usage">
<title>Creating a simple workbook</title>
17 years, 7 months
Seam SVN: r8898 - in trunk/ui/src/main: config/component and 2 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-04 01:50:49 -0400 (Thu, 04 Sep 2008)
New Revision: 8898
Removed:
trunk/ui/src/main/config/component/selectDate.xml
trunk/ui/src/main/java/org/jboss/seam/ui/component/UISelectDate.java
trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/SelectDateRendererBase.java
trunk/ui/src/main/resources/
Log:
JBSEAM-2732
Deleted: trunk/ui/src/main/config/component/selectDate.xml
===================================================================
--- trunk/ui/src/main/config/component/selectDate.xml 2008-09-04 05:32:00 UTC (rev 8897)
+++ trunk/ui/src/main/config/component/selectDate.xml 2008-09-04 05:50:49 UTC (rev 8898)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" >
-<components>
- <component>
- <name>org.jboss.seam.ui.SelectDate</name>
- <family>org.jboss.seam.ui.SelectDate</family>
- <classname>org.jboss.seam.ui.component.html.HtmlSelectDate</classname>
- <superclass>org.jboss.seam.ui.component.UISelectDate</superclass>
- <description>
- <![CDATA[Deprecated. You should use <rich:calendar /> instead.]]>
- </description>
- <renderer generate="false" override="false">
- <name>org.jboss.seam.ui.SelectDateRenderer</name>
- <classname>org.jboss.seam.ui.renderkit.SelectDateRendererBase</classname>
- </renderer>
- <tag>
- <name>selectDate</name>
- <classname>org.jboss.seam.ui.taglib.SelectDateTag</classname>
- <superclass>
- org.jboss.seam.ui.util.cdk.UIComponentTagBase
- </superclass>
- </tag>
- &ui_component_attributes;
- &html_style_attributes;
- <property>
- <name>for</name>
- <classname>java.lang.String</classname>
- <description></description>
- </property>
- <property>
- <name>dateFormat</name>
- <classname>java.lang.String</classname>
- <description></description>
- <defaultvalue>"MM/dd/yyyy"</defaultvalue>
- </property>
- <!-- should be el="false" -->
- <property transient="true">
- <name>startYear</name>
- <classname>int</classname>
- <description></description>
- <defaultvalue>-1</defaultvalue>
- </property>
- <!-- should be el="false" -->
- <property transient="true">
- <name>endYear</name>
- <classname>int</classname>
- <description></description>
- <defaultvalue>-1</defaultvalue>
- </property>
- <property>
- <name>firstDayOfWeek</name>
- <classname>java.lang.Integer</classname>
- <description>Set to override the default first day of week</description>
- <defaultvalue>null</defaultvalue>
- </property>
- </component>
-</components>
Deleted: trunk/ui/src/main/java/org/jboss/seam/ui/component/UISelectDate.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/component/UISelectDate.java 2008-09-04 05:32:00 UTC (rev 8897)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/UISelectDate.java 2008-09-04 05:50:49 UTC (rev 8898)
@@ -1,29 +0,0 @@
-package org.jboss.seam.ui.component;
-
-import javax.faces.component.UIComponentBase;
-
-@Deprecated
-public abstract class UISelectDate extends UIComponentBase
-{
-
- public abstract String getDateFormat();
-
- public abstract void setDateFormat(String dateFormat);
-
- public abstract String getFor();
-
- public abstract void setFor(String forField);
-
- public abstract int getStartYear();
-
- public abstract void setStartYear(int startYear);
-
- public abstract int getEndYear();
-
- public abstract void setEndYear(int endYear);
-
- public abstract Integer getFirstDayOfWeek();
-
- public abstract void setFirstDayOfWeek(Integer firstDayOfWeek);
-
-}
Deleted: trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/SelectDateRendererBase.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/SelectDateRendererBase.java 2008-09-04 05:32:00 UTC (rev 8897)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/renderkit/SelectDateRendererBase.java 2008-09-04 05:50:49 UTC (rev 8898)
@@ -1,137 +0,0 @@
-package org.jboss.seam.ui.renderkit;
-
-import java.io.IOException;
-import java.text.DateFormatSymbols;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-
-import org.jboss.seam.ui.component.UISelectDate;
-import org.jboss.seam.ui.resource.WebResource;
-import org.jboss.seam.ui.util.cdk.RendererBase;
-
-@Deprecated
-public class SelectDateRendererBase extends RendererBase
-{
-
- @Override
- protected Class getComponentClass()
- {
- return UISelectDate.class;
- }
-
- @Override
- protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
- {
- UISelectDate selectDate = (UISelectDate) component;
-
- UIComponent forComponent = selectDate.findComponent(selectDate.getFor());
- if (forComponent==null)
- {
- throw new IllegalStateException("could not find component with id: " + selectDate.getFor());
- }
- writeScript(context, selectDate);
- writer.startElement("span", selectDate);
- writer.writeAttribute("onclick", "__selectDate('" + forComponent.getClientId(context)
- + "', '" + forComponent.getClientId(context) + "');", null);
- }
-
- @Override
- protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
- {
- writer.endElement("span");
- writer.flush();
- }
-
- public void writeScript(FacesContext context, UISelectDate selectDate) throws IOException
- {
- Map request = context.getExternalContext().getRequestMap();
- if (request.get("SELECTDATE_SCRIPT") != null)
- {
- // already written out
- return;
- }
-
- request.put("SELECTDATE_SCRIPT", null);
-
- ResponseWriter response = context.getResponseWriter();
- writeLocaleInformation(response, context.getViewRoot().getLocale(), selectDate);
-
- response.startElement("script", null);
- response.writeAttribute("type", "text/javascript", null);
- response.writeAttribute("src", context.getExternalContext().getRequestContextPath()
- + WebResource.WEB_RESOURCE_PATH + "/date/calendar.js", null);
- response.endElement("script");
- }
-
- private void writeLocaleInformation(ResponseWriter response, Locale locale, UISelectDate selectDate) throws IOException
- {
- response.startElement("script", null);
- response.writeAttribute("type", "text/javascript", null);
-
- Calendar cal = Calendar.getInstance(locale);
- DateFormatSymbols symbols = new DateFormatSymbols(locale);
-
- // Note: Calendar and DateFormatSymbols use 1 for the first day of the week, not 0.
-
- response.write("\r");
- response.write("var CAL_DAYS_SHORT = '" + commaSeparate(symbols.getShortWeekdays(), 2)
- + "';\r");
- response
- .write("var CAL_DAYS_MEDIUM = '" + commaSeparate(symbols.getShortWeekdays())
- + "';\r");
- response.write("var CAL_DAYS_LONG = '" + commaSeparate(symbols.getWeekdays()) + "';\r");
- response
- .write("var CAL_MONTHS_MEDIUM = '" + commaSeparate(symbols.getShortMonths())
- + "';\r");
- response.write("var CAL_MONTHS_LONG = '" + commaSeparate(symbols.getMonths()) + "';\r");
- response.write("var CAL_FIRST_DAY_OF_WEEK = " + (selectDate.getFirstDayOfWeek() != null ?
- (selectDate.getFirstDayOfWeek().toString() + ";\r") :
- (cal.getFirstDayOfWeek() - 1) + ";\r"));
- response.write("var CAL_DATE_FORMAT = '" + selectDate.getDateFormat() + "';\r");
-
- if (selectDate.getStartYear() != -1 && selectDate.getEndYear() != -1)
- {
- response.write("var CAL_START_YEAR = " + selectDate.getStartYear() + ";\r");
- response.write("var CAL_END_YEAR = " + selectDate.getEndYear() + ";\r");
- }
-
- response.endElement("script");
- }
-
- private String commaSeparate(String[] values)
- {
- return commaSeparate(values, -1);
- }
-
- private String commaSeparate(String[] values, int maxLength)
- {
- StringBuilder sb = new StringBuilder();
- for (String val : values)
- {
- if (!"".equals(val))
- {
- if (sb.length() > 0) sb.append(',');
- sb.append(limitLength(val, maxLength));
- }
- }
- return sb.toString();
- }
-
- private String limitLength(String source, int maxLength)
- {
- if (maxLength < 0 || maxLength > source.length())
- {
- return source;
- }
- else
- {
- return source.substring(0, maxLength);
- }
- }
-
-}
17 years, 7 months
Seam SVN: r8897 - trunk/src/main/org/jboss/seam/security/management.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-04 01:32:00 -0400 (Thu, 04 Sep 2008)
New Revision: 8897
Modified:
trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java
Log:
JBSEAM-3349
Modified: trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-09-04 04:56:15 UTC (rev 8896)
+++ trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-09-04 05:32:00 UTC (rev 8897)
@@ -1078,7 +1078,7 @@
controls.setReturningAttributes(userAttr);
controls.setTimeLimit(getSearchTimeLimit());
- StringBuilder userFilter = new StringBuilder();
+ StringBuilder userFilter = new StringBuilder("(&");
Object[] filterArgs = new Object[getUserObjectClasses().length];
for (int i = 0; i < getUserObjectClasses().length; i++)
@@ -1091,6 +1091,8 @@
filterArgs[i] = getUserObjectClasses()[i];
}
+ userFilter.append(")");
+
NamingEnumeration answer = ctx.search(getUserContextDN(), userFilter.toString(), filterArgs, controls);
while (answer.hasMore())
{
17 years, 7 months
Seam SVN: r8896 - trunk/src/main/org/jboss/seam/util.
by seam-commits＠lists.jboss.org
Author: matt.drees
Date: 2008-09-04 00:56:15 -0400 (Thu, 04 Sep 2008)
New Revision: 8896
Modified:
trunk/src/main/org/jboss/seam/util/Strings.java
Log:
shouldn't assume sep is two characters
Modified: trunk/src/main/org/jboss/seam/util/Strings.java
===================================================================
--- trunk/src/main/org/jboss/seam/util/Strings.java 2008-09-04 04:52:51 UTC (rev 8895)
+++ trunk/src/main/org/jboss/seam/util/Strings.java 2008-09-04 04:56:15 UTC (rev 8896)
@@ -125,7 +125,7 @@
{
builder.append(sep).append( clazz.getName() );
}
- return builder.substring(2);
+ return builder.substring(sep.length());
}
public static String toString(InputStream in) throws IOException {
17 years, 7 months
Seam SVN: r8895 - in branches/Seam_2_0/src: main/org/jboss/seam/core and 2 other directories.
by seam-commits＠lists.jboss.org
Author: matt.drees
Date: 2008-09-04 00:52:51 -0400 (Thu, 04 Sep 2008)
New Revision: 8895
Removed:
branches/Seam_2_0/src/main/org/jboss/seam/CyclicDependencyException.java
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
branches/Seam_2_0/src/main/org/jboss/seam/util/Reflections.java
branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterceptorTest.java
Log:
Remove CyclicDependencyException from 2.0 branch, and replace with warning in log
Deleted: branches/Seam_2_0/src/main/org/jboss/seam/CyclicDependencyException.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/CyclicDependencyException.java 2008-09-04 04:46:09 UTC (rev 8894)
+++ branches/Seam_2_0/src/main/org/jboss/seam/CyclicDependencyException.java 2008-09-04 04:52:51 UTC (rev 8895)
@@ -1,98 +0,0 @@
-package org.jboss.seam;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.seam.core.BijectionInterceptor;
-
-/**
- * An exception that is thrown when {@link BijectionInterceptor} detects that a
- * component's dependencies cannot be injected due to a cyclic dependency. As
- * the exception is passed up the stack, the call sequence is recorded so that a
- * useful exception message can be constructed.
- *
- * @author Matt Drees
- *
- */
-public class CyclicDependencyException extends IllegalStateException
-{
-
- /**
- * stores the invocations in reverse call order
- */
- private final List<String> invocations = new ArrayList<String>();
- private String tailComponentName;
- private boolean cycleComplete;
-
- /**
- * Records this invocation's component name and method to be displayed in
- * {@link #getMessage()}, unless this invocation is not part of the detected
- * cycle. This method will be successively called as the exception is
- * propagated up the stack.
- *
- * @param componentName
- * @param method
- */
- public void addInvocation(String componentName, Method method)
- {
- if (cycleComplete)
- {
- return;
- }
-
- if (invocations.isEmpty())
- {
- tailComponentName = componentName;
- }
- else
- {
- if (tailComponentName.equals(componentName))
- {
- cycleComplete = true;
- }
- }
- invocations.add(createInvocationLabel(componentName, method));
- }
-
- /**
- * returns e.g. "foo.doSomething()"
- */
- private String createInvocationLabel(String componentName, Method method)
- {
- String invocationLabel = componentName + "." + method.getName() + "(";
- int i = 1;
- for (Class<?> parameterType : method.getParameterTypes())
- {
- invocationLabel += parameterType.getSimpleName();
- if (i < method.getParameterTypes().length)
- {
- invocationLabel += ", ";
- }
- i++;
- }
- invocationLabel += ")";
- return invocationLabel;
- }
-
- @Override
- public String getMessage()
- {
- if (!cycleComplete)
- {
- return "Cyclic dependency found";
- }
- else
- {
- String message = "Injection into " + tailComponentName + " resulted in a dependency cycle, requiring the invocation of " + invocations.get(0) + ". The complete cycle: ";
- for (int i = invocations.size() - 1; i >= 0; i--)
- {
- message += invocations.get(i);
- if (i != 0)
- message += " -> ";
- }
- return message;
- }
- }
-
-}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java 2008-09-04 04:46:09 UTC (rev 8894)
+++ branches/Seam_2_0/src/main/org/jboss/seam/core/BijectionInterceptor.java 2008-09-04 04:52:51 UTC (rev 8895)
@@ -1,15 +1,17 @@
//$Id$
package org.jboss.seam.core;
+import java.lang.reflect.Method;
import java.util.concurrent.locks.ReentrantLock;
import org.jboss.seam.Component;
-import org.jboss.seam.CyclicDependencyException;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.AbstractInterceptor;
import org.jboss.seam.intercept.InvocationContext;
-import org.jboss.seam.util.EJB;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.util.Reflections;
/**
* Before invoking the component, inject all dependencies. After
@@ -22,6 +24,8 @@
public class BijectionInterceptor extends AbstractInterceptor
{
private static final long serialVersionUID = 4686458105931528659L;
+
+ private static final LogProvider log = Logging.getLogProvider(BijectionInterceptor.class);
private boolean injected;
@@ -31,11 +35,14 @@
private ReentrantLock lock = new ReentrantLock();
+ private String initialMethod;
+
@AroundInvoke
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
Component component = getComponent();
- boolean enforceRequired = !component.isLifecycleMethod( invocation.getMethod() );
+ Method method = invocation.getMethod();
+ boolean enforceRequired = !component.isLifecycleMethod( method );
try
{
@@ -44,20 +51,26 @@
{
if (!injected)
{
- if (injecting == true)
+ if (injecting)
{
- throw new CyclicDependencyException();
+ log.warn("Injecting dependencies into " + component.getName() + " for the invocation of "
+ + initialMethod + " caused the invocation of a reentrant method: " + Reflections.toString(method)
+ + ". Some injected dependencies may not be available for the duration of this method invocation.");
}
-
- injecting = true;
- try
+ else
{
- component.inject(invocation.getTarget(), enforceRequired);
+ injecting = true;
+ try
+ {
+ initialMethod = Reflections.toString(method);
+ component.inject(invocation.getTarget(), enforceRequired);
+ }
+ finally
+ {
+ injecting = false;
+ initialMethod = null;
+ }
}
- finally
- {
- injecting = false;
- }
injected = true;
}
@@ -99,20 +112,6 @@
return result;
}
- catch (Exception e)
- {
- Exception root = e;
- while (EJB.getCause(root) != null)
- {
- root = EJB.getCause(root);
- }
- if (root instanceof CyclicDependencyException)
- {
- CyclicDependencyException cyclicDependencyException = (CyclicDependencyException) root;
- cyclicDependencyException.addInvocation(getComponent().getName(), invocation.getMethod());
- }
- throw e;
- }
finally
{
if (injected)
Modified: branches/Seam_2_0/src/main/org/jboss/seam/util/Reflections.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/util/Reflections.java 2008-09-04 04:46:09 UTC (rev 8894)
+++ branches/Seam_2_0/src/main/org/jboss/seam/util/Reflections.java 2008-09-04 04:52:51 UTC (rev 8895)
@@ -137,7 +137,7 @@
}
}
- private static String toString(Method method)
+ public static String toString(Method method)
{
return Strings.unqualify( method.getDeclaringClass().getName() ) +
'.' +
Modified: branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterceptorTest.java
===================================================================
--- branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterceptorTest.java 2008-09-04 04:46:09 UTC (rev 8894)
+++ branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterceptorTest.java 2008-09-04 04:52:51 UTC (rev 8895)
@@ -7,7 +7,6 @@
import javax.faces.event.PhaseId;
import org.jboss.seam.Component;
-import org.jboss.seam.CyclicDependencyException;
import org.jboss.seam.NoConversationException;
import org.jboss.seam.RequiredException;
import org.jboss.seam.Seam;
@@ -79,7 +78,14 @@
return bar;
}
+ Method method = Foo.class.getMethod("foo");
@Override
+ public Method getMethod()
+ {
+ return method;
+ }
+
+ @Override
public Object proceed() throws Exception
{
assert bar.otherFoo==foo;
@@ -236,7 +242,7 @@
}
@Test
- public void testCyclicDependencyThowsException() throws Exception
+ public void testCyclicDependencyDoesNotStackOverflow() throws Exception
{
MockServletContext servletContext = new MockServletContext();
ServletLifecycle.beginApplication(servletContext);
@@ -357,12 +363,7 @@
appContext.set("cyclicFoo", cyclicFooProxy);
appContext.set("cyclicBar", cyclicBarProxy);
- try
- {
- cyclicFooProxy.getFooBar();
- assert false : "cyclic dependency not detected";
- }
- catch (CyclicDependencyException e) {}
+ cyclicFooProxy.getFooBar();
}
17 years, 7 months
Seam SVN: r8894 - branches/Seam_2_0/src/main/org/jboss/seam/util.
by seam-commits＠lists.jboss.org
Author: matt.drees
Date: 2008-09-04 00:46:09 -0400 (Thu, 04 Sep 2008)
New Revision: 8894
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/util/Strings.java
Log:
shouldn't assume sep is two characters
Modified: branches/Seam_2_0/src/main/org/jboss/seam/util/Strings.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/util/Strings.java 2008-09-04 02:28:46 UTC (rev 8893)
+++ branches/Seam_2_0/src/main/org/jboss/seam/util/Strings.java 2008-09-04 04:46:09 UTC (rev 8894)
@@ -125,7 +125,7 @@
{
builder.append(sep).append( clazz.getName() );
}
- return builder.substring(2);
+ return builder.substring(sep.length());
}
public static String toString(InputStream in) throws IOException {
17 years, 7 months