Seam SVN: r7338 - in trunk/examples/seamdiscs: resources and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-02 19:04:21 -0500 (Sat, 02 Feb 2008)
New Revision: 7338
Removed:
trunk/examples/seamdiscs/resources/WEB-INF/lib/trinidad-impl-1.2.1.jar
trunk/examples/seamdiscs/resources/ear-lib/
Modified:
trunk/examples/seamdiscs/
trunk/examples/seamdiscs/build.xml
Log:
Use maven to pull in trinidad for example
Property changes on: trunk/examples/seamdiscs
___________________________________________________________________
Name: svn:ignore
+ lib
exploded-archives
dist
test-build
Modified: trunk/examples/seamdiscs/build.xml
===================================================================
--- trunk/examples/seamdiscs/build.xml 2008-02-03 00:04:08 UTC (rev 7337)
+++ trunk/examples/seamdiscs/build.xml 2008-02-03 00:04:21 UTC (rev 7338)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="Seamdiscs" default="restart" basedir=".">
+<project name="Seamdiscs" default="restart" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<!-- Example name -->
<property name="Name" value="Seamdiscs"/>
@@ -13,24 +13,56 @@
<property name="richfaces.lib" value="yes"/>
<import file="../build.xml"/>
+
+ <property name="example.tmp.lib.dir" value="${basedir}/lib" />
- <fileset id="ear.lib.extras" dir="resources/ear-lib">
- <include name="*.jar"/>
+ <fileset id="ear.lib.extras" dir="${example.tmp.lib.dir}">
+ <include name="trinidad-api.jar"/>
</fileset>
- <fileset id="war.extras" dir="resources">
+ <fileset id="war.lib.extras" dir="${example.tmp.lib.dir}">
+ <include name="trinidad-impl.jar"/>
+ </fileset>
+
+ <fileset id="war.extras" dir="${resources.dir}">
<include name="WEB-INF/lib/*.jar"/>
</fileset>
<path id="build.classpath.extras">
- <fileset dir="resources/ear-lib">
- <include name="*.jar"/>
+ <fileset dir="${example.tmp.lib.dir}">
+ <include name="trinidad-api.jar"/>
</fileset>
</path>
<patternset id="test.resources.files">
<exclude name="import.sql" />
</patternset>
+
+ <target name="copyextradependencies">
+
+ <artifact:dependencies filesetId="trinidad.fileset" versionsId="trinidad.versions" sourcesfilesetid="trinidad.sources">
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.1">
+ <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
+ <exclusion groupId="javax.servlet" artifactId="servlet-api" />
+ <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
+ <exclusion groupId="javax.faces" artifactId="jsf-api"/>
+ </dependency>
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.1">
+ <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
+ <exclusion groupId="javax.servlet" artifactId="servlet-api" />
+ <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
+ <exclusion groupId="portlet-api" artifactId="portlet-api"/>
+ <exclusion groupId="jstl" artifactId="jstl"/>
+ <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/>
+ <exclusion groupId="javax.faces" artifactId="jsf-api"/>
+ <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/>
+ </dependency>
+ </artifact:dependencies>
+ <copy todir="${example.tmp.lib.dir}">
+ <fileset refid="trinidad.fileset" />
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${trinidad.versions}" to="flatten" />
+ </copy>
+ </target>
</project>
Deleted: trunk/examples/seamdiscs/resources/WEB-INF/lib/trinidad-impl-1.2.1.jar
===================================================================
(Binary files differ)
16 years, 3 months
Seam SVN: r7337 - in trunk/examples: booking and 16 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-02 19:04:08 -0500 (Sat, 02 Feb 2008)
New Revision: 7337
Modified:
trunk/examples/blog/
trunk/examples/booking/
trunk/examples/contactlist/
trunk/examples/drools/
trunk/examples/dvdstore/
trunk/examples/hibernate/
trunk/examples/itext/
trunk/examples/jpa/
trunk/examples/mail/
trunk/examples/messages/
trunk/examples/nestedbooking/
trunk/examples/numberguess/
trunk/examples/quartz/
trunk/examples/registration/
trunk/examples/seambay/
trunk/examples/seampay/
trunk/examples/todo/
trunk/examples/wiki/
Log:
more ignores
Property changes on: trunk/examples/blog
___________________________________________________________________
Name: svn:ignore
- build
test-output
exploded-archives
dist
+ build
test-output
exploded-archives
dist
test-build
Property changes on: trunk/examples/booking
___________________________________________________________________
Name: svn:ignore
- build
test-output
dist
exploded-archives
+ build
test-output
dist
exploded-archives
test-build
Property changes on: trunk/examples/contactlist
___________________________________________________________________
Name: svn:ignore
- output
build
test-output
+ output
build
test-output
exploded-archives
test-build
dist
Property changes on: trunk/examples/drools
___________________________________________________________________
Name: svn:ignore
- build
test-output
+ build
test-output
test-build
dist
exploded-archives
Property changes on: trunk/examples/dvdstore
___________________________________________________________________
Name: svn:ignore
- build
+ build
test-build
dist
exploded-archives
Property changes on: trunk/examples/hibernate
___________________________________________________________________
Name: svn:ignore
- build
test-output
+ build
test-output
test-build
dist-jboss
exploded-archives-jboss
Property changes on: trunk/examples/itext
___________________________________________________________________
Name: svn:ignore
+ exploded-archives
dist
test-build
Property changes on: trunk/examples/jpa
___________________________________________________________________
Name: svn:ignore
+ test-build
dist-jboss
exploded-archives-jboss
Property changes on: trunk/examples/mail
___________________________________________________________________
Name: svn:ignore
+ test-build
dist
exploded-archives
Property changes on: trunk/examples/messages
___________________________________________________________________
Name: svn:ignore
- build
test-output
+ build
test-output
dist
exploded-archives
test-build
Property changes on: trunk/examples/nestedbooking
___________________________________________________________________
Name: svn:ignore
+ dist
exploded-archives
test-build
Property changes on: trunk/examples/numberguess
___________________________________________________________________
Name: svn:ignore
- build
test-output
+ build
test-output
exploded-archives
dist
test-build
Property changes on: trunk/examples/quartz
___________________________________________________________________
Name: svn:ignore
+ exploded-archives
dist
test-build
Property changes on: trunk/examples/registration
___________________________________________________________________
Name: svn:ignore
- output
build
test-output
+ output
build
test-output
dist
exploded-archives
test-build
Property changes on: trunk/examples/seambay
___________________________________________________________________
Name: svn:ignore
- build
+ build
exploded-archives
test-build
dist
Property changes on: trunk/examples/seampay
___________________________________________________________________
Name: svn:ignore
+ exploded-archives
test-build
dist
Property changes on: trunk/examples/todo
___________________________________________________________________
Name: svn:ignore
- build
test-output
+ build
test-output
test-build
exploded-archives
dist
Property changes on: trunk/examples/wiki
___________________________________________________________________
Name: svn:ignore
+ build
16 years, 3 months
Seam SVN: r7336 - in branches/Seam_2_0/src: test/unit/org/jboss/seam/test/unit and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 19:33:16 -0500 (Fri, 01 Feb 2008)
New Revision: 7336
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/core/Interpolator.java
branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java
Log:
JBSEAM-2566
Modified: branches/Seam_2_0/src/main/org/jboss/seam/core/Interpolator.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/core/Interpolator.java 2008-02-02 00:31:44 UTC (rev 7335)
+++ branches/Seam_2_0/src/main/org/jboss/seam/core/Interpolator.java 2008-02-02 00:33:16 UTC (rev 7336)
@@ -32,12 +32,9 @@
public static Interpolator instance()
{
- if ( Contexts.isApplicationContextActive() )
- {
+ if (Contexts.isApplicationContextActive()) {
return (Interpolator) Component.getInstance(Interpolator.class, ScopeType.APPLICATION);
- }
- else
- {
+ } else {
return new Interpolator(); //for unit testing
}
}
@@ -51,18 +48,15 @@
*/
public String interpolate(String string, Object... params)
{
- if (params == null)
- {
+ if (params == null) {
params = new Object[0];
}
- if ( params.length>10 )
- {
+ if (params.length>10) {
throw new IllegalArgumentException("more than 10 parameters");
}
- if (string.indexOf('#')>=0 || string.indexOf('{')>=0)
- {
+ if (string.indexOf('#')>=0 || string.indexOf('{')>=0) {
string = interpolateExpressions(string, params);
}
@@ -74,75 +68,63 @@
StringTokenizer tokens = new StringTokenizer(string, "#{}", true);
StringBuilder builder = new StringBuilder(string.length());
try {
- while ( tokens.hasMoreTokens() )
- {
+ while (tokens.hasMoreTokens()) {
String tok = tokens.nextToken();
- if ( "#".equals(tok) && tokens.hasMoreTokens() )
- {
+
+ if ("#".equals(tok) && tokens.hasMoreTokens()) {
String nextTok = tokens.nextToken();
- if ( "{".equals(nextTok) )
- {
+
+ while (nextTok.equals("#") && tokens.hasMoreTokens()) {
+ builder.append(tok);
+ nextTok = tokens.nextToken();
+ }
+
+ if ("{".equals(nextTok)) {
String expression = "#{" + tokens.nextToken() + "}";
- try
- {
+ try {
Object value = Expressions.instance().createValueExpression(expression).getValue();
if (value!=null) builder.append(value);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.warn("exception interpolating string: " + string, e);
}
- tokens.nextToken(); //the }
- }
- else
- {
+ tokens.nextToken(); // the trailing "}"
+
+ } else if (nextTok.equals("#")) {
+ // could be trailing #
+ builder.append("#");
+
+ } else {
int index;
- try
- {
- index = Integer.parseInt( nextTok.substring(0, 1) );
- if (index>=params.length)
- {
+ try {
+ index = Integer.parseInt(nextTok.substring(0, 1));
+ if (index>=params.length) {
//log.warn("parameter index out of bounds: " + index + " in: " + string);
builder.append("#").append(nextTok);
+ } else {
+ builder.append(params[index]).append(nextTok.substring(1));
}
- else
- {
- builder.append( params[index] ).append( nextTok.substring(1) );
- }
- }
- catch (NumberFormatException nfe)
- {
+ } catch (NumberFormatException nfe) {
builder.append("#").append(nextTok);
}
}
- }
- else if ("{".equals(tok))
- {
+ } else if ("{".equals(tok)) {
StringBuilder expr = new StringBuilder();
expr.append(tok);
int level = 1;
- while (tokens.hasMoreTokens())
- {
+ while (tokens.hasMoreTokens()) {
String nextTok = tokens.nextToken();
expr.append(nextTok);
- if (nextTok.equals("{"))
- {
+ if (nextTok.equals("{")) {
++level;
- }
- else if (nextTok.equals("}"))
- {
- if (--level == 0)
- {
- try
- {
+ } else if (nextTok.equals("}")) {
+ if (--level == 0) {
+ try {
String value = new MessageFormat(expr.toString(), Locale.instance()).format(params);
builder.append(value);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
// if it is a bad message, use the expression itself
builder.append(expr);
}
@@ -152,19 +134,17 @@
}
}
- if (expr != null)
- {
+ if (expr != null) {
builder.append(expr);
}
- }
- else
- {
+ } else {
builder.append(tok);
}
}
} catch (Exception e) {
log.warn("exception interpolating string: " + string, e);
}
+
return builder.toString();
}
Modified: branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java
===================================================================
--- branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java 2008-02-02 00:31:44 UTC (rev 7335)
+++ branches/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java 2008-02-02 00:33:16 UTC (rev 7336)
@@ -27,6 +27,11 @@
Assert.assertEquals("There are no files.", interpolator.interpolate(CHOICE_EXPR, 0));
Assert.assertEquals("There is one file.", interpolator.interpolate(CHOICE_EXPR, 1));
Assert.assertEquals("There are 2 files.", interpolator.interpolate(CHOICE_EXPR, 2));
+
+ // test sequences of multiple #
+ Assert.assertEquals("2", interpolator.interpolate("#0",2));
+ Assert.assertEquals("#2", interpolator.interpolate("##0",2));
+ Assert.assertEquals("##2", interpolator.interpolate("###0",2));
Date date = new Date(0);
16 years, 3 months
Seam SVN: r7335 - in trunk/src: test/unit/org/jboss/seam/test/unit and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 19:31:44 -0500 (Fri, 01 Feb 2008)
New Revision: 7335
Modified:
trunk/src/main/org/jboss/seam/core/Interpolator.java
trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java
Log:
JBSEAM-2566
Modified: trunk/src/main/org/jboss/seam/core/Interpolator.java
===================================================================
--- trunk/src/main/org/jboss/seam/core/Interpolator.java 2008-02-02 00:31:20 UTC (rev 7334)
+++ trunk/src/main/org/jboss/seam/core/Interpolator.java 2008-02-02 00:31:44 UTC (rev 7335)
@@ -32,12 +32,9 @@
public static Interpolator instance()
{
- if ( Contexts.isApplicationContextActive() )
- {
+ if (Contexts.isApplicationContextActive()) {
return (Interpolator) Component.getInstance(Interpolator.class, ScopeType.APPLICATION);
- }
- else
- {
+ } else {
return new Interpolator(); //for unit testing
}
}
@@ -51,18 +48,15 @@
*/
public String interpolate(String string, Object... params)
{
- if (params == null)
- {
+ if (params == null) {
params = new Object[0];
}
- if ( params.length>10 )
- {
+ if (params.length>10) {
throw new IllegalArgumentException("more than 10 parameters");
}
- if (string.indexOf('#')>=0 || string.indexOf('{')>=0)
- {
+ if (string.indexOf('#')>=0 || string.indexOf('{')>=0) {
string = interpolateExpressions(string, params);
}
@@ -74,75 +68,63 @@
StringTokenizer tokens = new StringTokenizer(string, "#{}", true);
StringBuilder builder = new StringBuilder(string.length());
try {
- while ( tokens.hasMoreTokens() )
- {
+ while (tokens.hasMoreTokens()) {
String tok = tokens.nextToken();
- if ( "#".equals(tok) && tokens.hasMoreTokens() )
- {
+
+ if ("#".equals(tok) && tokens.hasMoreTokens()) {
String nextTok = tokens.nextToken();
- if ( "{".equals(nextTok) )
- {
+
+ while (nextTok.equals("#") && tokens.hasMoreTokens()) {
+ builder.append(tok);
+ nextTok = tokens.nextToken();
+ }
+
+ if ("{".equals(nextTok)) {
String expression = "#{" + tokens.nextToken() + "}";
- try
- {
+ try {
Object value = Expressions.instance().createValueExpression(expression).getValue();
if (value!=null) builder.append(value);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.warn("exception interpolating string: " + string, e);
}
- tokens.nextToken(); //the }
- }
- else
- {
+ tokens.nextToken(); // the trailing "}"
+
+ } else if (nextTok.equals("#")) {
+ // could be trailing #
+ builder.append("#");
+
+ } else {
int index;
- try
- {
- index = Integer.parseInt( nextTok.substring(0, 1) );
- if (index>=params.length)
- {
+ try {
+ index = Integer.parseInt(nextTok.substring(0, 1));
+ if (index>=params.length) {
//log.warn("parameter index out of bounds: " + index + " in: " + string);
builder.append("#").append(nextTok);
+ } else {
+ builder.append(params[index]).append(nextTok.substring(1));
}
- else
- {
- builder.append( params[index] ).append( nextTok.substring(1) );
- }
- }
- catch (NumberFormatException nfe)
- {
+ } catch (NumberFormatException nfe) {
builder.append("#").append(nextTok);
}
}
- }
- else if ("{".equals(tok))
- {
+ } else if ("{".equals(tok)) {
StringBuilder expr = new StringBuilder();
expr.append(tok);
int level = 1;
- while (tokens.hasMoreTokens())
- {
+ while (tokens.hasMoreTokens()) {
String nextTok = tokens.nextToken();
expr.append(nextTok);
- if (nextTok.equals("{"))
- {
+ if (nextTok.equals("{")) {
++level;
- }
- else if (nextTok.equals("}"))
- {
- if (--level == 0)
- {
- try
- {
+ } else if (nextTok.equals("}")) {
+ if (--level == 0) {
+ try {
String value = new MessageFormat(expr.toString(), Locale.instance()).format(params);
builder.append(value);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
// if it is a bad message, use the expression itself
builder.append(expr);
}
@@ -152,19 +134,17 @@
}
}
- if (expr != null)
- {
+ if (expr != null) {
builder.append(expr);
}
- }
- else
- {
+ } else {
builder.append(tok);
}
}
} catch (Exception e) {
log.warn("exception interpolating string: " + string, e);
}
+
return builder.toString();
}
Modified: trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java
===================================================================
--- trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java 2008-02-02 00:31:20 UTC (rev 7334)
+++ trunk/src/test/unit/org/jboss/seam/test/unit/InterpolatorTest.java 2008-02-02 00:31:44 UTC (rev 7335)
@@ -27,6 +27,11 @@
Assert.assertEquals("There are no files.", interpolator.interpolate(CHOICE_EXPR, 0));
Assert.assertEquals("There is one file.", interpolator.interpolate(CHOICE_EXPR, 1));
Assert.assertEquals("There are 2 files.", interpolator.interpolate(CHOICE_EXPR, 2));
+
+ // test sequences of multiple #
+ Assert.assertEquals("2", interpolator.interpolate("#0",2));
+ Assert.assertEquals("#2", interpolator.interpolate("##0",2));
+ Assert.assertEquals("##2", interpolator.interpolate("###0",2));
Date date = new Date(0);
16 years, 3 months
Seam SVN: r7334 - trunk/src/main/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 19:31:20 -0500 (Fri, 01 Feb 2008)
New Revision: 7334
Modified:
trunk/src/main/org/jboss/seam/Component.java
Log:
improve error message
Modified: trunk/src/main/org/jboss/seam/Component.java
===================================================================
--- trunk/src/main/org/jboss/seam/Component.java 2008-02-01 19:54:19 UTC (rev 7333)
+++ trunk/src/main/org/jboss/seam/Component.java 2008-02-02 00:31:20 UTC (rev 7334)
@@ -1882,7 +1882,9 @@
if ( !component.isInstance(result) )
{
if ( component.hasUnwrapMethod() ) return result; ///best way???
- throw new IllegalArgumentException( "value of context variable is not an instance of the component bound to the context variable: " + name );
+ throw new IllegalArgumentException( "value of context variable is not an instance of the component bound to the context variable: " + name +
+ ". If you are using hot deploy, you may have attempted to hot deploy a session or " +
+ "application-scoped component definition while using an old instance in the session.");
}
result = component.unwrap(result);
}
16 years, 3 months
Seam SVN: r7333 - trunk/src/main/org/jboss/seam/jsf.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-01 14:54:19 -0500 (Fri, 01 Feb 2008)
New Revision: 7333
Modified:
trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
JBSEAM-2505, thanks to Jacob Orshalick
Modified: trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-02-01 19:50:56 UTC (rev 7332)
+++ trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-02-01 19:54:19 UTC (rev 7333)
@@ -21,6 +21,7 @@
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
+import javax.servlet.http.HttpServletRequest;
import org.jboss.seam.Seam;
import org.jboss.seam.contexts.Context;
@@ -43,6 +44,7 @@
import org.jboss.seam.persistence.PersistenceContexts;
import org.jboss.seam.transaction.Transaction;
import org.jboss.seam.util.Reflections;
+import org.jboss.seam.web.ServletContexts;
/**
* Manages the Seam contexts associated with a JSF request
@@ -134,6 +136,7 @@
if ( event.getPhaseId() == RESTORE_VIEW )
{
beforeRestoreView( event.getFacesContext() );
+ ServletContexts.instance().setRequest((HttpServletRequest) event.getFacesContext().getExternalContext().getRequest());
}
handleTransactionsBeforePhase(event);
16 years, 3 months
Seam SVN: r7332 - trunk/src/pdf/org/jboss/seam/pdf/ui.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 14:50:56 -0500 (Fri, 01 Feb 2008)
New Revision: 7332
Modified:
trunk/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java
Log:
typo
Modified: trunk/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java
===================================================================
--- trunk/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java 2008-02-01 19:49:56 UTC (rev 7331)
+++ trunk/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java 2008-02-01 19:50:56 UTC (rev 7332)
@@ -78,7 +78,7 @@
}
public int joinValue(String join) {
- if (cap == null || cap.equalsIgnoreCase("mite")) {
+ if (cap == null || cap.equalsIgnoreCase("miter")) {
return BasicStroke.JOIN_MITER;
} else if (cap.equalsIgnoreCase("round")) {
return BasicStroke.JOIN_ROUND;
16 years, 3 months
Seam SVN: r7331 - branches/Seam_2_0/src/pdf/org/jboss/seam/pdf.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 14:49:56 -0500 (Fri, 01 Feb 2008)
New Revision: 7331
Modified:
branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java
Log:
serializable
Modified: branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java
===================================================================
--- branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java 2008-02-01 19:49:37 UTC (rev 7330)
+++ branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/DocumentData.java 2008-02-01 19:49:56 UTC (rev 7331)
@@ -41,7 +41,9 @@
return disposition;
}
- static public class DocumentType {
+ static public class DocumentType
+ implements Serializable
+ {
private String mimeType;
private String extension;
16 years, 3 months
Seam SVN: r7330 - branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/ui.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 14:49:37 -0500 (Fri, 01 Feb 2008)
New Revision: 7330
Modified:
branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java
Log:
typo
Modified: branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java
===================================================================
--- branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java 2008-02-01 19:42:32 UTC (rev 7329)
+++ branches/Seam_2_0/src/pdf/org/jboss/seam/pdf/ui/UIStroke.java 2008-02-01 19:49:37 UTC (rev 7330)
@@ -78,7 +78,7 @@
}
public int joinValue(String join) {
- if (cap == null || cap.equalsIgnoreCase("mite")) {
+ if (cap == null || cap.equalsIgnoreCase("miter")) {
return BasicStroke.JOIN_MITER;
} else if (cap.equalsIgnoreCase("round")) {
return BasicStroke.JOIN_ROUND;
16 years, 3 months
Seam SVN: r7329 - trunk/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-01 14:42:32 -0500 (Fri, 01 Feb 2008)
New Revision: 7329
Modified:
trunk/doc/reference/en/modules/itext.xml
Log:
fix bad servlet reference
Modified: trunk/doc/reference/en/modules/itext.xml
===================================================================
--- trunk/doc/reference/en/modules/itext.xml 2008-02-01 19:41:48 UTC (rev 7328)
+++ trunk/doc/reference/en/modules/itext.xml 2008-02-01 19:42:32 UTC (rev 7329)
@@ -48,7 +48,6 @@
<emphasis>Attributes</emphasis>
</para>
-
<itemizedlist>
<listitem>
<para>
@@ -1466,19 +1465,9 @@
<para> The default implementation serves PDF documents from a generic URL,
<literal>/seam-doc.seam</literal>. Many browsers (and users) would prefer to see URLs that contain the
actual PDF name like <literal>/myDocument.pdf</literal>. This capability requires some configuration. To
- serve PDF files, all *.pdf resources should be mapped to the Seam Servlet Filter and to the
- DocumentStoreServlet:</para>
+ serve PDF files, all *.pdf resources should be mapped to the DocumentStoreServlet:</para>
- <programlisting><filter>
- <filter-name>Seam Servlet Filter</filter-name>
- <filter-class>org.jboss.seam.servlet.SeamServletFilter</filter-class>
-</filter>
-
-<filter-mapping>
- <filter-name>Seam Servlet Filter</filter-name>
- <url-pattern>*.pdf</url-pattern>
-</filter-mapping>
-
+ <programlisting>
<servlet>
<servlet-name>Document Store Servlet</servlet-name>
<servlet-class>org.jboss.seam.pdf.DocumentStoreServlet</servlet-class>
16 years, 3 months