[richfaces-svn-commits] JBoss Rich Faces SVN: r2278 - in trunk: framework/impl/src/main/java/org/ajax4jsf/webapp and 25 other directories.

Author: alexsmirnov Date: 2007-08-15 15:09:33 -0400 (Wed, 15 Aug 2007) New Revision: 2278 Added: trunk/samples/seamEAR/ trunk/samples/seamEAR/ear/ trunk/samples/seamEAR/ear/pom.xml trunk/samples/seamEAR/ejbs/ trunk/samples/seamEAR/ejbs/pom.xml trunk/samples/seamEAR/ejbs/src/ trunk/samples/seamEAR/ejbs/src/main/ trunk/samples/seamEAR/ejbs/src/main/resources/ trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml trunk/samples/seamEAR/pom.xml trunk/samples/seamEAR/primary-source/ trunk/samples/seamEAR/primary-source/pom.xml trunk/samples/seamEAR/projects/ trunk/samples/seamEAR/projects/logging/ trunk/samples/seamEAR/projects/logging/pom.xml trunk/samples/seamEAR/projects/pom.xml trunk/samples/seamEAR/src/ trunk/samples/seamEAR/src/main/ trunk/samples/seamEAR/src/main/resources/ trunk/samples/seamEAR/wars/ trunk/samples/seamEAR/wars/pom.xml trunk/samples/seamEAR/wars/seamWebapp/ trunk/samples/seamEAR/wars/seamWebapp/pom.xml trunk/samples/seamEAR/wars/seamWebapp/src/ trunk/samples/seamEAR/wars/seamWebapp/src/main/ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp trunk/ui/scrollableDataTable/ trunk/ui/separator/src/main/java/META-INF/ trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF Removed: trunk/ui/scrollable-grid/ Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/ui/pom.xml trunk/ui/scrollableDataTable/pom.xml trunk/ui/scrollableDataTable/src/main/config/component/scrollable-grid.xml Log: rename scrollable-grid int scrollableDataTable. Add ear seam project. Fix memory leak in IE Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2007-08-15 19:00:14 UTC (rev 2277) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2007-08-15 19:09:33 UTC (rev 2278) @@ -390,7 +390,7 @@ } // context.setHeader("Content-Type",getContentType()); context.setContentType(getContentType(null)); - if (getContentLength(context) > 0) { + if (!cached && getContentLength(context) > 0) { context.setIntHeader("Content-Length", getContentLength(context)); } else { // context.setHeader("Transfer-Encoding", "chunked"); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2007-08-15 19:00:14 UTC (rev 2277) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/CacheContent.java 2007-08-15 19:09:33 UTC (rev 2278) @@ -44,234 +44,238 @@ * */ public class CacheContent implements Serializable { - /** - * - */ - private static final long serialVersionUID = 8120940486890871177L; - - private static final Log _log = LogFactory.getLog(CacheContent.class); + /** + * + */ + private static final long serialVersionUID = 8120940486890871177L; - // private transient ByteArrayOutputStream outputStream ; - private transient FastBufferOutputStream outputStream; + private static final Log _log = LogFactory.getLog(CacheContent.class); - private transient FastBufferWriter stringOutputWriter; + // private transient ByteArrayOutputStream outputStream ; + private transient FastBufferOutputStream outputStream; - private transient PrintWriter servletWriter; + private transient FastBufferWriter stringOutputWriter; - private transient ServletOutputStream servletStream; + private transient PrintWriter servletWriter; - // content to send. - private byte[] content = null; + private transient ServletOutputStream servletStream; - private String writerContent = null; + // content to send. + private byte[] content = null; - boolean filledOutputStream = false; + private String writerContent = null; - boolean filledOutputWriter = false; + boolean filledOutputStream = false; - private Map headers = new HashMap(); + boolean filledOutputWriter = false; - private String contentType; + private Map headers = new HashMap(); - /** - * Send saved content to http responce - * - * @param response - * @throws IOException - */ - public void send(HttpServletResponse response) throws IOException { - if (filledOutputStream) { - OutputStream out = response.getOutputStream(); - if (content != null) { - out.write(content); - } else { - this.outputStream.writeTo(out); - } - // out.flush(); - // out.close(); - } else if (filledOutputWriter) { - Writer out = response.getWriter(); - if (null != writerContent) { - out.write(writerContent); - } else { - stringOutputWriter.writeTo(out); - } - // out.flush(); - // out.close(); + private String contentType; + + /** + * Send saved content to http responce + * + * @param response + * @throws IOException + */ + public void send(HttpServletResponse response) throws IOException { + if (filledOutputStream) { + OutputStream out = response.getOutputStream(); + if (content != null) { + out.write(content); + } else { + this.outputStream.writeTo(out); + } + // out.flush(); + // out.close(); + } else if (filledOutputWriter) { + Writer out = response.getWriter(); + if (null != writerContent) { + out.write(writerContent); + } else { + stringOutputWriter.writeTo(out); + } + // out.flush(); + // out.close(); + } } - } - /** - * Send saved headers to http responce. - * - * @param response - */ - public void sendHeaders(HttpServletResponse response) { - for (Iterator iter = headers.entrySet().iterator(); iter.hasNext();) { - Map.Entry element = (Map.Entry) iter.next(); - String header = (String) element.getKey(); - Object headerValue = element.getValue(); - try { - if (headerValue instanceof Long) { - Long time = (Long) headerValue; - response.setDateHeader(header, time.longValue()); - } else if (headerValue instanceof Integer) { - Integer value = (Integer) headerValue; - response.setIntHeader(header, value.intValue()); - } else { - response.setHeader(header, (String) headerValue); + /** + * Send saved headers to http responce. + * + * @param response + */ + public void sendHeaders(HttpServletResponse response) { + for (Iterator iter = headers.entrySet().iterator(); iter.hasNext();) { + Map.Entry element = (Map.Entry) iter.next(); + String header = (String) element.getKey(); + Object headerValue = element.getValue(); + try { + if (headerValue instanceof Long) { + Long time = (Long) headerValue; + response.setDateHeader(header, time.longValue()); + } else if (headerValue instanceof Integer) { + Integer value = (Integer) headerValue; + response.setIntHeader(header, value.intValue()); + } else { + response.setHeader(header, (String) headerValue); + } + + } catch (Exception e) { + _log.error("Error set response header " + header + "for value " + + headerValue, e); + } + // set real content-length. + // / if (null != content) { + if (filledOutputStream) { + if (null != content && content.length > 0) { + response.setIntHeader("Content-Length", content.length); + } else if (null != outputStream && outputStream.getLength() > 0) { + response.setIntHeader("Content-Length", outputStream + .getLength()); + } + } // TODO - calculate content-lenght for writer ? + if (null != contentType) { + response.setContentType(this.contentType); + } } + } - } catch (Exception e) { - _log.error("Error set response header "+header+"for value "+headerValue, e); - } - // set real content-length. - // / if (null != content) { - if (filledOutputStream) { - // / response.setIntHeader("Content-Length", content.length); - response.setIntHeader("Content-Length", outputStream - .getLength()); - } // TODO - calculate content-lenght for writer ? - if (null != contentType) { - response.setContentType(this.contentType); - } + public void setDateHeader(String name, long value) { + // Expires not stored in cache - must be re-calculated for every + // response. + if (!"Expires".equals(name)) { + headers.put(name, new Long(value)); + } } - } - public void setDateHeader(String name, long value) { - // Expires not stored in cache - must be re-calculated for every - // response. - if (!"Expires".equals(name)) { - headers.put(name, new Long(value)); + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, + * java.lang.String) + */ + public void setHeader(String name, String value) { + headers.put(name, value); } - } - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.framework.resource.ResourceContext#setHeader(java.lang.String, - * java.lang.String) - */ - public void setHeader(String name, String value) { - headers.put(name, value); - } + /* + * (non-Javadoc) + * + * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, + * int) + */ + public void setIntHeader(String name, int value) { + headers.put(name, new Integer(value)); + } - /* - * (non-Javadoc) - * - * @see org.ajax4jsf.framework.resource.ResourceContext#setIntHeader(java.lang.String, - * int) - */ - public void setIntHeader(String name, int value) { - headers.put(name, new Integer(value)); - } + /** + * Create UNIX command 'tee' like stream - send all data to servlet + * + * @param responseStream + * @return + */ + public OutputStream getOutputStream() { + if (null == servletStream) { + outputStream = new FastBufferOutputStream(1024); + servletStream = new ServletOutputStream() { - /** - * Create UNIX command 'tee' like stream - send all data to servlet - * - * @param responseStream - * @return - */ - public OutputStream getOutputStream() { - if (null == servletStream) { - outputStream = new FastBufferOutputStream(1024); - servletStream = new ServletOutputStream() { + /* + * (non-Javadoc) + * + * @see java.io.OutputStream#close() + */ + public void close() throws IOException { + filledOutputStream = true; + // / content = outputStream.toByteArray(); + content = null; + } - /* - * (non-Javadoc) - * - * @see java.io.OutputStream#close() - */ - public void close() throws IOException { - filledOutputStream = true; - // / content = outputStream.toByteArray(); - content = null; - } + /* + * (non-Javadoc) + * + * @see java.io.OutputStream#flush() + */ + public void flush() throws IOException { + } - /* - * (non-Javadoc) - * - * @see java.io.OutputStream#flush() - */ - public void flush() throws IOException { - } + /* + * (non-Javadoc) + * + * @see java.io.OutputStream#write(byte[], int, int) + */ + public void write(byte[] b, int off, int len) + throws IOException { + outputStream.write(b, off, len); + } - /* - * (non-Javadoc) - * - * @see java.io.OutputStream#write(byte[], int, int) - */ - public void write(byte[] b, int off, int len) - throws IOException { - outputStream.write(b, off, len); - } + /* + * (non-Javadoc) + * + * @see java.io.OutputStream#write(byte[]) + */ + public void write(byte[] b) throws IOException { + outputStream.write(b); + } - /* - * (non-Javadoc) - * - * @see java.io.OutputStream#write(byte[]) - */ - public void write(byte[] b) throws IOException { - outputStream.write(b); - } + public void write(int b) throws IOException { + outputStream.write(b); + } - public void write(int b) throws IOException { - outputStream.write(b); + }; } - - }; + return servletStream; } - return servletStream; - } - public PrintWriter getWriter() { - if (null == servletWriter) { - stringOutputWriter = new FastBufferWriter(1024); - Writer out = new Writer() { + public PrintWriter getWriter() { + if (null == servletWriter) { + stringOutputWriter = new FastBufferWriter(1024); + Writer out = new Writer() { - public void write(char[] cbuf, int off, int len) - throws IOException { - stringOutputWriter.write(cbuf, off, len); - } + public void write(char[] cbuf, int off, int len) + throws IOException { + stringOutputWriter.write(cbuf, off, len); + } - public void flush() throws IOException { - } + public void flush() throws IOException { + } - public void close() throws IOException { - // / writerContent = stringOutputWriter.toString(); - filledOutputWriter = true; - writerContent = null; + public void close() throws IOException { + // / writerContent = stringOutputWriter.toString(); + filledOutputWriter = true; + writerContent = null; + } + + }; + servletWriter = new PrintWriter(out); } - - }; - servletWriter = new PrintWriter(out); + return servletWriter; } - return servletWriter; - } - public void setContentType(String contentType) { - this.contentType = contentType; + public void setContentType(String contentType) { + this.contentType = contentType; - } + } - /** - * @return Returns the contentType. - */ - public String getContentType() { - return contentType; - } + /** + * @return Returns the contentType. + */ + public String getContentType() { + return contentType; + } - private void writeObject(java.io.ObjectOutputStream s) throws IOException { - if (filledOutputStream) { - if (outputStream != null) { - content = outputStream.toByteArray(); - } - } else if (filledOutputWriter) { - if (stringOutputWriter != null) { - char[] cs = stringOutputWriter.toCharArray(); - writerContent = new String(cs); - } + private void writeObject(java.io.ObjectOutputStream s) throws IOException { + if (filledOutputStream) { + if (outputStream != null) { + content = outputStream.toByteArray(); + } + } else if (filledOutputWriter) { + if (stringOutputWriter != null) { + char[] cs = stringOutputWriter.toCharArray(); + writerContent = new String(cs); + } + } + s.defaultWriteObject(); } - s.defaultWriteObject(); - } } Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-15 19:00:14 UTC (rev 2277) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-15 19:09:33 UTC (rev 2278) @@ -707,7 +707,7 @@ A4J.AJAX.replaceViewState(inputs,newinputs); } - if (typeof Event != "undefined") { + if (typeof Event.unloadElementsCache === "function") { Event.unloadElementsCache(); } Added: trunk/samples/seamEAR/ear/pom.xml =================================================================== --- trunk/samples/seamEAR/ear/pom.xml (rev 0) +++ trunk/samples/seamEAR/ear/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,91 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>ear</artifactId> + <packaging>ear</packaging> + <version>3.1.0-SNAPSHOT</version> + <name>ear assembly</name> + <parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamEAR</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core</artifactId> + <version>3.1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>ejbs</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR.wars</groupId> + <artifactId>seamWebapp</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>primary-source</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + <!-- + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-seam-core</artifactId> + <version>2.0.0.BETA</version> + </dependency> + --> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-seam-core</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam.jar</systemPath> + <scope>system</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <modules> + <jarModule> + <groupId>jboss</groupId> + <artifactId>jboss-seam-core</artifactId> + <includeInApplicationXml> + true + </includeInApplicationXml> + </jarModule> + </modules> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + <version>5</version> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/samples/seamEAR/ear/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/ejbs/pom.xml =================================================================== --- trunk/samples/seamEAR/ejbs/pom.xml (rev 0) +++ trunk/samples/seamEAR/ejbs/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,38 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>ejbs</artifactId> + <packaging>ejb</packaging> + <version>3.1.0-SNAPSHOT</version> + <name>enterprise java beans</name> + <parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamEAR</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <dependencies> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>primary-source</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <ejbVersion>3.0</ejbVersion> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/samples/seamEAR/ejbs/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml =================================================================== Property changes on: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/pom.xml =================================================================== --- trunk/samples/seamEAR/pom.xml (rev 0) +++ trunk/samples/seamEAR/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,71 @@ +<project> + <parent> + <artifactId>samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples</groupId> + <version>3.1.0-SNAPSHOT</version> + <artifactId>seamEAR</artifactId> + <packaging>pom</packaging> + <name>seam EAR project</name> + <modules> + <module>projects</module> + <module>primary-source</module> + <module>wars</module> + <module>ejbs</module> + <module>ear</module> + </modules> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <unzipCommand> + /usr/bin/unzip -o > err.txt + </unzipCommand> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <dependencyManagement> + <dependencies> + <dependency> + <groupId> + org.richfaces.samples.seamEAR.projects + </groupId> + <artifactId>logging</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>primary-source</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR.wars</groupId> + <artifactId>seamWebapp</artifactId> + <version>3.1.0-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>ejbs</artifactId> + <version>3.1.0-SNAPSHOT</version> + <type>ejb</type> + </dependency> + </dependencies> + </dependencyManagement> +</project> Property changes on: trunk/samples/seamEAR/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/primary-source/pom.xml =================================================================== --- trunk/samples/seamEAR/primary-source/pom.xml (rev 0) +++ trunk/samples/seamEAR/primary-source/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,36 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>primary-source</artifactId> + <packaging>jar</packaging> + <name>core project classes</name> + <parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamEAR</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <dependencies> + <dependency> + <groupId>org.richfaces.samples.seamEAR.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>iso-8859-1</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <minmemory>128m</minmemory> + <maxmemory>512m</maxmemory> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/samples/seamEAR/primary-source/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/projects/logging/pom.xml =================================================================== --- trunk/samples/seamEAR/projects/logging/pom.xml (rev 0) +++ trunk/samples/seamEAR/projects/logging/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,12 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR.projects</groupId> + <artifactId>logging</artifactId> + <packaging>jar</packaging> + <name>logging</name> + <parent> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>projects</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> +</project> Property changes on: trunk/samples/seamEAR/projects/logging/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/projects/pom.xml =================================================================== --- trunk/samples/seamEAR/projects/pom.xml (rev 0) +++ trunk/samples/seamEAR/projects/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,16 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR</groupId> + <version>3.1.0-SNAPSHOT</version> + <artifactId>projects</artifactId> + <packaging>pom</packaging> + <name>sub projects</name> + <parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamEAR</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modules> + <module>logging</module> + </modules> +</project> Property changes on: trunk/samples/seamEAR/projects/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/pom.xml =================================================================== --- trunk/samples/seamEAR/wars/pom.xml (rev 0) +++ trunk/samples/seamEAR/wars/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,17 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>wars</artifactId> + <packaging>pom</packaging> + <name>wars</name> + <version>3.1.0-SNAPSHOT</version> + <parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamEAR</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <modules> + <module>seamWebapp</module> + </modules> +</project> + Property changes on: trunk/samples/seamEAR/wars/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/pom.xml (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,125 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR.wars</groupId> + <artifactId>seamWebapp</artifactId> + <packaging>war</packaging> + <name>seam web client</name> + <parent> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>wars</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <!-- this is relative to the pom.xml directory --> + <directory>${seamHome}</directory> + <!-- override the destination directory for this resource --> + <targetPath>WEB-INF/lib</targetPath> + <includes> + <include>jboss-seam-ui.jar</include> + <include>jboss-seam-debug.jar</include> + </includes> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>primary-source</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.3.0.ga</version> + <scope>provided</scope> + </dependency> + <!-- + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.0.ga</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>3.2.4.ga</version> + </dependency> + --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>3.0.0.ga</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>seam-core</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>seam-ui</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam-ui.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-el</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/lib/jboss-el.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>seam-debug</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam-debug.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>seam-ioc</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam-ioc.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + <version>3.4.ga</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + </dependencies> +</project> Property changes on: trunk/samples/seamEAR/wars/seamWebapp/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS ENTITY="JSFProcess"/> Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:mail="http://jboss.com/products/seam/mail" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd"> + + <core:init debug="@debug@" jndi-pattern="seamIntegration/#{ejbName}/local"/> + + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" + conversation-id-parameter="cid"/> + + <persistence:managed-persistence-context name="entityManager" + auto-create="true" + entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/> + + <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory" + persistence-unit-name="seamIntegration"/> + + <drools:rule-base name="securityRules"> + <drools:rule-files><value>/security.drl</value></drools:rule-files> + </drools:rule-base> + + <security:identity authenticate-method="#{authenticator.authenticate}" + security-rules="#{securityRules}" + remember-me="true"/> + + <event type="org.jboss.seam.notLoggedIn"> + <action expression="#{redirect.captureCurrentView}"/> + </event> + <event type="org.jboss.seam.postAuthenticate"> + <action expression="#{redirect.returnToCapturedView}"/> + </event> + + <mail:mail-session host="localhost" port="2525" username="test" password="test" /> + + <!-- For use with jBPM pageflow or process management --> + <!-- + <bpm:jbpm> + <bpm:process-definitions></bpm:process-definitions> + <bpm:pageflow-definitions></bpm:pageflow-definitions> + </bpm:jbpm> + --> + +</components> Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,18 @@ +<?xml version='1.0' encoding='UTF-8'?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + + <application> + <message-bundle>messages</message-bundle> + <locale-config> + <default-locale>en</default-locale> + </locale-config> + <!-- Disabled when using Ajax4JSF --> + <!-- + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + --> + </application> + +</faces-config> Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,12 @@ + <!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> + +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository> + seam.jboss.org:loader=seamIntegration + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> +</jboss-web> Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,54 @@ +<?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.0.xsd" + + no-conversation-view-id="/home.xhtml" + login-view-id="/login.xhtml"> + + <page view-id="*"> + <navigation> + <rule if-outcome="home"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + </page> + + <exception class="org.jboss.seam.framework.EntityNotFoundException"> + <redirect view-id="/error.xhtml"> + <message>Not found</message> + </redirect> + </exception> + + <exception class="javax.persistence.EntityNotFoundException"> + <redirect view-id="/error.xhtml"> + <message>Not found</message> + </redirect> + </exception> + + <exception class="javax.persistence.OptimisticLockException"> + <end-conversation/> + <redirect view-id="/error.xhtml"> + <message>Another user changed the same data, please try again</message> + </redirect> + </exception> + + <exception class="org.jboss.seam.security.AuthorizationException"> + <redirect> + <message>You don't have permission to do this</message> + </redirect> + </exception> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/login.xhtml"> + <message>Please log in first</message> + </redirect> + </exception> + + <exception> + <redirect view-id="/error.xhtml"> + <message>Unexpected error, please try again</message> + </redirect> + </exception> + +</pages> Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/pages.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml =================================================================== Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp (rev 0) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,5 @@ +<html> +<body> +<h2>Hello World!</h2> +</body> +</html> Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ui/pom.xml =================================================================== --- trunk/ui/pom.xml 2007-08-15 19:00:14 UTC (rev 2277) +++ trunk/ui/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -86,7 +86,7 @@ <module>calendar</module> <module>treeModel</module> <module>message</module> - <!--module>scrollable-grid</module--> + <module>scrollableDataTable</module> <module>insert</module> </modules> <dependencies> Copied: trunk/ui/scrollableDataTable (from rev 2276, trunk/ui/scrollable-grid) Modified: trunk/ui/scrollableDataTable/pom.xml =================================================================== --- trunk/ui/scrollable-grid/pom.xml 2007-08-15 17:09:03 UTC (rev 2276) +++ trunk/ui/scrollableDataTable/pom.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -27,7 +27,7 @@ <library> <prefix>org.richfaces</prefix> <taglib> - <shortName>scrollable-grid</shortName> + <shortName>scrollableDataTable</shortName> </taglib> </library> </configuration> Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-grid.xml =================================================================== --- trunk/ui/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-08-15 17:09:03 UTC (rev 2276) +++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-grid.xml 2007-08-15 19:09:33 UTC (rev 2278) @@ -15,7 +15,7 @@ </test> --> <description> - <![CDATA[ Scrollable Grid ]]> + <![CDATA[ Scrollable Data Table ]]> </description> <renderer generate="true" override="true"> @@ -23,7 +23,7 @@ <template>org/richfaces/scrollable-grid.jspx</template> </renderer> <tag> - <name>scrollable-grid</name> + <name>scrollableDataTable</name> <classname>org.richfaces.taglib.ScrollableGridTag</classname> <superclass> org.ajax4jsf.webapp.taglib.HtmlComponentTagBase Added: trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF =================================================================== --- trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF 2007-08-15 19:09:33 UTC (rev 2278) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/ui/separator/src/main/java/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain