Seam SVN: r7600 - branches/Seam_1_2_1_AP/examples/itext/lib.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-18 06:13:03 -0400 (Tue, 18 Mar 2008)
New Revision: 7600
Added:
branches/Seam_1_2_1_AP/examples/itext/lib/jcommon.jar
branches/Seam_1_2_1_AP/examples/itext/lib/jfreechart.jar
Removed:
branches/Seam_1_2_1_AP/examples/itext/lib/jcommon-1.0.6.jar
branches/Seam_1_2_1_AP/examples/itext/lib/jfreechart-1.0.3.jar
Log:
JBPAPP-634 - libraries jfreechart.jar and dependent jcommon.jar were upgraded to the versions from EAP
Deleted: branches/Seam_1_2_1_AP/examples/itext/lib/jcommon-1.0.6.jar
===================================================================
(Binary files differ)
Added: branches/Seam_1_2_1_AP/examples/itext/lib/jcommon.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/examples/itext/lib/jcommon.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/Seam_1_2_1_AP/examples/itext/lib/jfreechart-1.0.3.jar
===================================================================
(Binary files differ)
Added: branches/Seam_1_2_1_AP/examples/itext/lib/jfreechart.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/examples/itext/lib/jfreechart.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 1 month
Seam SVN: r7599 - branches/Seam_1_2_1_AP/examples/itext/resources/META-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-18 06:12:21 -0400 (Tue, 18 Mar 2008)
New Revision: 7599
Modified:
branches/Seam_1_2_1_AP/examples/itext/resources/META-INF/application.xml
Log:
JBPAPP-634 - libraries jfreechart.jar and dependent jcommon.jar were upgraded to the versions from EAP
Modified: branches/Seam_1_2_1_AP/examples/itext/resources/META-INF/application.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/itext/resources/META-INF/application.xml 2008-03-18 09:01:46 UTC (rev 7598)
+++ branches/Seam_1_2_1_AP/examples/itext/resources/META-INF/application.xml 2008-03-18 10:12:21 UTC (rev 7599)
@@ -23,9 +23,9 @@
<java>el-ri.jar</java>
</module>
<module>
- <java>jcommon-1.0.6.jar</java>
+ <java>jcommon.jar</java>
</module>
<module>
- <java>jfreechart-1.0.3.jar</java>
+ <java>jfreechart.jar</java>
</module>
</application>
18 years, 1 month
Seam SVN: r7598 - branches/Seam_1_2_1_AP/seam-ui-cdk.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-18 05:01:46 -0400 (Tue, 18 Mar 2008)
New Revision: 7598
Modified:
branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml
Log:
JBPAPP-636 - libraries ajax4jsf-1.1.1.jar and richfaces-3.0.1.jar were upgraded to the stable release versions from SNAPSHOT versions
Modified: branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml
===================================================================
--- branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml 2008-03-18 09:00:28 UTC (rev 7597)
+++ branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml 2008-03-18 09:01:46 UTC (rev 7598)
@@ -94,7 +94,7 @@
<version>transient</version>
<scope>system</scope>
<systemPath>
- ${seam.dir}/lib/ajax4jsf-1.1.1-SNAPSHOT.jar
+ ${seam.dir}/lib/ajax4jsf-1.1.1.jar
</systemPath>
</dependency>
<dependency>
18 years, 1 month
Seam SVN: r7597 - branches/Seam_1_2_1_AP/examples/wiki.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-18 05:00:28 -0400 (Tue, 18 Mar 2008)
New Revision: 7597
Modified:
branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml
Log:
JBPAPP-636 - libraries ajax4jsf-1.1.1.jar and richfaces-3.0.1.jar were upgraded to the stable release versions from SNAPSHOT versions
Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-18 08:56:27 UTC (rev 7596)
+++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-18 09:00:28 UTC (rev 7597)
@@ -494,7 +494,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/ajax4jsf-1.1.1-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../lib/ajax4jsf-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -503,7 +503,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/richfaces-3.0.1-SNAPSHOT.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../lib/richfaces-3.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -623,8 +623,8 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/ajax4jsf-1.1.1-SNAPSHOT.jar" />
- <url>jar://$MODULE_DIR$/../../lib/ajax4jsf-1.1.1-SNAPSHOT.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/ajax4jsf-1.1.1.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/ajax4jsf-1.1.1.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
@@ -778,8 +778,8 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/richfaces-3.0.1-SNAPSHOT.jar" />
- <url>jar://$MODULE_DIR$/../../lib/richfaces-3.0.1-SNAPSHOT.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/richfaces-3.0.1.jar" />
+ <url>jar://$MODULE_DIR$/../../lib/richfaces-3.0.1.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="0" />
18 years, 1 month
Seam SVN: r7596 - branches/Seam_1_2_1_AP/lib.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-18 04:56:27 -0400 (Tue, 18 Mar 2008)
New Revision: 7596
Added:
branches/Seam_1_2_1_AP/lib/ajax4jsf-1.1.1.jar
branches/Seam_1_2_1_AP/lib/richfaces-3.0.1.jar
Log:
JBPAPP-636 - libraries ajax4jsf-1.1.1.jar and richfaces-3.0.1.jar were upgraded to the stable release versions from SNAPSHOT versions
Added: branches/Seam_1_2_1_AP/lib/ajax4jsf-1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/lib/ajax4jsf-1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/Seam_1_2_1_AP/lib/richfaces-3.0.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/Seam_1_2_1_AP/lib/richfaces-3.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 1 month
Seam SVN: r7595 - branches/Seam_1_2_1_AP/lib.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-03-18 04:53:27 -0400 (Tue, 18 Mar 2008)
New Revision: 7595
Modified:
branches/Seam_1_2_1_AP/lib/jsf-facelets.jar
Log:
JBPAPP-637 - library jsf-facelets.jar was upgraded to the stable release version from SNAPSHOT version
Modified: branches/Seam_1_2_1_AP/lib/jsf-facelets.jar
===================================================================
(Binary files differ)
18 years, 1 month
Seam SVN: r7594 - in trunk/src/main/org/jboss/seam: navigation and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-03-17 19:03:59 -0400 (Mon, 17 Mar 2008)
New Revision: 7594
Added:
trunk/src/main/org/jboss/seam/navigation/Header.java
Modified:
trunk/src/main/org/jboss/seam/navigation/Page.java
trunk/src/main/org/jboss/seam/navigation/Pages.java
trunk/src/main/org/jboss/seam/pages-2.1.xsd
Log:
JBSEAM-273
Added: trunk/src/main/org/jboss/seam/navigation/Header.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Header.java (rev 0)
+++ trunk/src/main/org/jboss/seam/navigation/Header.java 2008-03-17 23:03:59 UTC (rev 7594)
@@ -0,0 +1,41 @@
+package org.jboss.seam.navigation;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.seam.core.Expressions.ValueExpression;
+
+public class Header {
+ public String name;
+ public ValueExpression<Object> expression;
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public ValueExpression<Object> getValue() {
+ return expression;
+ }
+ public void setValue(ValueExpression<Object> valueExpression) {
+ this.expression = valueExpression;
+ }
+
+ public void sendHeader(HttpServletResponse response) {
+ response.addHeader(name, evaluateValue());
+ }
+
+ private String evaluateValue() {
+ String result = "";
+
+ if (expression != null) {
+ Object value = expression.getValue();
+
+ if (value != null) {
+ result = value.toString();
+ }
+ }
+
+ return result;
+ }
+}
Modified: trunk/src/main/org/jboss/seam/navigation/Page.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Page.java 2008-03-15 22:54:06 UTC (rev 7593)
+++ trunk/src/main/org/jboss/seam/navigation/Page.java 2008-03-17 23:03:59 UTC (rev 7594)
@@ -7,6 +7,7 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletResponse;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Interpolator;
@@ -39,6 +40,7 @@
private ConversationIdParameter conversationIdParameter;
private String eventType;
private List<Pattern> rewritePatterns = new ArrayList<Pattern>();
+ private List<Header> httpHeaders = new ArrayList<Header>();
/**
* The scheme (http/https) required by this page.
@@ -238,6 +240,8 @@
public boolean preRender(FacesContext facesContext)
{
checkPermission(facesContext, "render");
+
+ sendHeaders(facesContext);
boolean result = false;
@@ -283,6 +287,19 @@
return result;
}
+
+ private void sendHeaders(FacesContext facesContext) {
+ Object value = facesContext.getExternalContext().getResponse();
+
+ if (value == null || !(value instanceof HttpServletResponse)) {
+ return;
+ }
+
+ HttpServletResponse response = (HttpServletResponse) value;
+ for (Header header: httpHeaders) {
+ header.sendHeader(response);
+ }
+ }
public List<Input> getInputs()
{
@@ -378,4 +395,8 @@
return id;
}
+ public List<Header> getHeaders() {
+ return httpHeaders;
+ }
+
}
Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-03-15 22:54:06 UTC (rev 7593)
+++ trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-03-17 23:03:59 UTC (rev 7594)
@@ -1019,6 +1019,11 @@
String expr = restrict.getTextTrim();
if ( !Strings.isEmpty(expr) ) page.setRestriction(expr);
}
+
+ List<Element> headers = element.elements("header");
+ for (Element header: headers) {
+ page.getHeaders().add(parseHeader(header));
+ }
}
public ConversationIdParameter getConversationIdParameter(String conversationName)
@@ -1343,6 +1348,22 @@
return param;
}
+ private static Header parseHeader(Element element)
+ {
+ Header header = new Header();
+
+ String name = element.attributeValue("name");
+ header.setName(name);
+
+ String valueExpression = element.attributeValue("value");
+ if (valueExpression==null) {
+ valueExpression = element.getTextTrim();
+ }
+ header.setValue(Expressions.instance().createValueExpression(valueExpression));
+
+ return header;
+ }
+
/**
* Parse rule
*/
Modified: trunk/src/main/org/jboss/seam/pages-2.1.xsd
===================================================================
--- trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-03-15 22:54:06 UTC (rev 7593)
+++ trunk/src/main/org/jboss/seam/pages-2.1.xsd 2008-03-17 23:03:59 UTC (rev 7594)
@@ -52,6 +52,7 @@
<xs:element ref="pages:restrict"/>
<xs:element ref="pages:description"/>
<xs:element ref="pages:param"/>
+ <xs:element ref="pages:header" />
<xs:element ref="pages:begin-conversation"/>
<xs:element ref="pages:end-conversation"/>
<xs:element ref="pages:start-task"/>
@@ -105,6 +106,7 @@
<xs:attributeGroup ref="pages:attlist.param"/>
</xs:complexType>
</xs:element>
+
<xs:attributeGroup name="attlist.param">
<xs:attribute name="name"/>
<xs:attribute name="value"/>
@@ -114,6 +116,18 @@
<xs:attribute name="validatorId"/>
<xs:attribute name="required" type="xs:boolean"/>
</xs:attributeGroup>
+
+ <xs:element name="header">
+ <xs:complexType mixed="true">
+ <xs:attributeGroup ref="pages:attlist.header"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:attributeGroup name="attlist.header">
+ <xs:attribute name="name" use="required"/>
+ <xs:attribute name="value" />
+ </xs:attributeGroup>
+
<xs:element name="action">
<xs:complexType>
<xs:attributeGroup ref="pages:attlist.action"/>
18 years, 1 month
Seam SVN: r7593 - trunk/src/remoting/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-03-15 18:54:06 -0400 (Sat, 15 Mar 2008)
New Revision: 7593
Modified:
trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
Log:
fixed typo
Modified: trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-03-15 21:41:55 UTC (rev 7592)
+++ trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-03-15 22:54:06 UTC (rev 7593)
@@ -77,7 +77,7 @@
Component[] components = new Component[componentNames.length];
Set<Type> types = new HashSet<Type>();
- response.setContentType("text/javasript");
+ response.setContentType("text/javascript");
for (int i = 0; i < componentNames.length; i++)
{
18 years, 1 month
Seam SVN: r7592 - branches/Seam_2_0/src/main/org/jboss/seam/intercept.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-15 17:41:55 -0400 (Sat, 15 Mar 2008)
New Revision: 7592
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/intercept/Interceptor.java
Log:
Backport r7591, JBSEAM 2667
Modified: branches/Seam_2_0/src/main/org/jboss/seam/intercept/Interceptor.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/intercept/Interceptor.java 2008-03-15 21:41:04 UTC (rev 7591)
+++ branches/Seam_2_0/src/main/org/jboss/seam/intercept/Interceptor.java 2008-03-15 21:41:55 UTC (rev 7592)
@@ -150,7 +150,7 @@
if ( annotation!=null && params.length==1 && params[0]==annotation.annotationType() )
{
annotationInjectorMethod = method;
- Reflections.invokeAndWrap(method, userInterceptorClass, annotation);
+ Reflections.invokeAndWrap(method, statelessUserInterceptorInstance, annotation);
}
//if there is a method that takes the component, call it
if ( params.length==1 && params[0]==Component.class )
18 years, 1 month
Seam SVN: r7591 - trunk/src/main/org/jboss/seam/intercept.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-03-15 17:41:04 -0400 (Sat, 15 Mar 2008)
New Revision: 7591
Modified:
trunk/src/main/org/jboss/seam/intercept/Interceptor.java
Log:
JBSEAM-2667
Modified: trunk/src/main/org/jboss/seam/intercept/Interceptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/intercept/Interceptor.java 2008-03-15 12:13:42 UTC (rev 7590)
+++ trunk/src/main/org/jboss/seam/intercept/Interceptor.java 2008-03-15 21:41:04 UTC (rev 7591)
@@ -150,7 +150,7 @@
if ( annotation!=null && params.length==1 && params[0]==annotation.annotationType() )
{
annotationInjectorMethod = method;
- Reflections.invokeAndWrap(method, userInterceptorClass, annotation);
+ Reflections.invokeAndWrap(method, statelessUserInterceptorInstance, annotation);
}
//if there is a method that takes the component, call it
if ( params.length==1 && params[0]==Component.class )
18 years, 1 month