February 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r5936 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: cluts Date: 2008-02-08 05:23:44 -0500 (Fri, 08 Feb 2008) New Revision: 5936 Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml Log: http://jira.jboss.com/jira/browse/RF-2158 - inputNumberSpinner Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml 2008-02-08 10:23:29 UTC (rev 5935) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml 2008-02-08 10:23:44 UTC (rev 5936) @@ -14,7 +14,7 @@ attribute. When arrow controls are pressed, the cursor can be moved in any way without losing a dragged state.</para> <figure> - <title><rich:InputNumberSpinner> component</title> + <title><emphasis role="bold"><property><rich:InputNumberSpinner></property></emphasis> component</title> <mediaobject> <imageobject> <imagedata fileref="images/inputNumberSpinnerMain.png"/>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5935 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: cluts Date: 2008-02-08 05:23:29 -0500 (Fri, 08 Feb 2008) New Revision: 5935 Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml Log: http://jira.jboss.com/jira/browse/RF-2158 - inputNumberSlider Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2008-02-08 10:22:59 UTC (rev 5934) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2008-02-08 10:23:29 UTC (rev 5935) @@ -87,7 +87,7 @@ <para>It generates on a page:</para> <figure> - <title>Generated <rich:inputNumberSlider></title> + <title>Generated <emphasis role="bold"><property><rich:InputNumberSlider></property></emphasis></title> <mediaobject> <imageobject> <imagedata fileref="images/slider2.png"/> @@ -407,7 +407,7 @@ <para>This is a result:</para> <figure> - <title>Redefinition styles with own classes and styleClass attributes</title> + <title>Redefinition styles with own classes and <emphasis><property>styleClass</property></emphasis> attributes</title> <mediaobject> <imageobject> <imagedata fileref="images/inputNumberSlider_CS1.png"/>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5934 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: cluts Date: 2008-02-08 05:22:59 -0500 (Fri, 08 Feb 2008) New Revision: 5934 Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml Log: http://jira.jboss.com/jira/browse/RF-2158 - inputNumberSlider Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml 2008-02-08 10:22:39 UTC (rev 5933) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml 2008-02-08 10:22:59 UTC (rev 5934) @@ -12,7 +12,7 @@ field is possible (optional). Also it's possible to see the current value in the toolTip above a dragged handle control.</para> <figure> - <title><rich:inputNumberSlider> component</title> + <title><emphasis role="bold"><property><rich:InputNumberSlider></property></emphasis> component</title> <mediaobject> <imageobject> <imagedata fileref="images/slider.png"/>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5933 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: cluts Date: 2008-02-08 05:22:39 -0500 (Fri, 08 Feb 2008) New Revision: 5933 Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.xml Log: http://jira.jboss.com/jira/browse/RF-2158 - gmap Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2008-02-08 10:22:11 UTC (rev 5932) +++ trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2008-02-08 10:22:39 UTC (rev 5933) @@ -105,7 +105,7 @@ <property>"zoom"</property> </emphasis>= 5.</para> <figure> - <title><rich:gmap> initial rendering</title> + <title><emphasis role="bold"><property><rich:gmap></property></emphasis> initial rendering</title> <mediaobject> <imageobject> <imagedata fileref="images/gmap1.png"/> @@ -130,7 +130,7 @@ rendered </listitem> </itemizedlist> <figure> - <title><rich:gmap> accessible controls</title> + <title><emphasis role="bold"><property><rich:gmap></property></emphasis> accessible controls</title> <mediaobject> <imageobject> <imagedata fileref="images/gmap3.png"/>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5932 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: cluts Date: 2008-02-08 05:22:11 -0500 (Fri, 08 Feb 2008) New Revision: 5932 Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml Log: http://jira.jboss.com/jira/browse/RF-2158 - done for gmap Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml 2008-02-07 21:14:58 UTC (rev 5931) +++ trunk/docs/userguide/en/src/main/docbook/included/gmap.desc.xml 2008-02-08 10:22:11 UTC (rev 5932) @@ -9,7 +9,7 @@ <title>Description</title> <para>Component that presents the Google <property>map</property> in the JSF applications.</para> <figure> - <title><rich:gmap> component</title> + <title><emphasis role="bold"><property><rich:gmap></property></emphasis> component</title> <mediaobject> <imageobject> <imagedata fileref="images/gmap.png"/>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5931 - in trunk/samples: richfaces-ear-demo/richfacesEAR and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2008-02-07 16:14:58 -0500 (Thu, 07 Feb 2008) New Revision: 5931 Added: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml Modified: trunk/samples/pom.xml trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml trunk/samples/seamEAR/ear/pom.xml trunk/samples/seamEAR/ejbs/pom.xml trunk/samples/seamEAR/pom.xml trunk/samples/seamEAR/wars/seamWebapp/pom.xml Log: restore builds of the Ear samples Modified: trunk/samples/pom.xml =================================================================== --- trunk/samples/pom.xml 2008-02-07 21:08:41 UTC (rev 5930) +++ trunk/samples/pom.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -452,9 +452,8 @@ <module>panelmenu-sample</module> <module>rich-message-demo</module> <module>scrollableDataTableDemo</module> -  + <module>richfaces-ear-demo</module> + <module>seamEAR</module> <module>contextMenuDemo</module> <module>orderingListDemo</module> Modified: trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml =================================================================== --- trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-02-07 21:08:41 UTC (rev 5930) +++ trunk/samples/richfaces-ear-demo/richfacesEAR/pom.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -34,6 +34,7 @@ </dependency> </dependencies> <build> + <finalName>richfacesEAR</finalName> <plugins> <plugin> <artifactId>maven-ear-plugin</artifactId> Modified: trunk/samples/seamEAR/ear/pom.xml =================================================================== --- trunk/samples/seamEAR/ear/pom.xml 2008-02-07 21:08:41 UTC (rev 5930) +++ trunk/samples/seamEAR/ear/pom.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -14,18 +14,11 @@ <version>3.2.0-SNAPSHOT</version> </parent> <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + </dependency> <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>3.2.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>ejbs</artifactId> <type>ejb</type> @@ -43,35 +36,6 @@ <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> - <systemPath>${seamHome}/jboss-seam.jar</systemPath> - <scope>system</scope> - <type>ejb</type> - </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>jbpm-jpdl</artifactId> - <version>3.2.1-GA</version> - <systemPath>${seamHome}/lib/jbpm-jpdl.jar</systemPath> - <scope>system</scope> - </dependency> </dependencies> <build> <finalName>seamEAR</finalName> @@ -82,8 +46,8 @@ <defaultLibBundleDir>lib</defaultLibBundleDir> <modules> <ejbModule> - <groupId>jboss</groupId> - <artifactId>jboss-seam-core</artifactId> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId>  - <version>5</version> + <artifactTypeMappings> + <artifactTypeMapping type="jar" mapping="ejb" /> + </artifactTypeMappings> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + <jboss> + <version>4.2</version> + <loader-repository> + seam.jboss.org:loader=seamEAR + </loader-repository> + </jboss> + <version>5</version> </configuration> </plugin> </plugins> Modified: trunk/samples/seamEAR/ejbs/pom.xml =================================================================== --- trunk/samples/seamEAR/ejbs/pom.xml 2008-02-07 21:08:41 UTC (rev 5930) +++ trunk/samples/seamEAR/ejbs/pom.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -23,11 +23,9 @@ <artifactId>logging</artifactId> </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> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> Added: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml =================================================================== --- trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml (rev 0) +++ trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE datasources + PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" + "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> + +<datasources> + + <local-tx-datasource> + <jndi-name>seamEARDatasource</jndi-name> + <connection-url>jdbc:hsqldb:.</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + + </local-tx-datasource> + +</datasources> + Property changes on: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/seamEAR-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Modified: trunk/samples/seamEAR/pom.xml =================================================================== --- trunk/samples/seamEAR/pom.xml 2008-02-07 21:08:41 UTC (rev 5930) +++ trunk/samples/seamEAR/pom.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -15,6 +15,9 @@ <artifactId>seamEAR</artifactId> <packaging>pom</packaging> <name>seam EAR project</name> + <properties> + <seam>2.0.0.GA</seam> + </properties> <modules> <module>projects</module> <module>primary-source</module> @@ -77,6 +80,65 @@ <version>3.2.0-SNAPSHOT</version> <type>ejb</type> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>3.0.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.0.ga</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.3.1.ga</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${seam}</version> + <exclusions> + <exclusion><groupId>javax.el</groupId><artifactId>el-api</artifactId></exclusion> + <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${seam}</version> + <exclusions> + <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + <version>${seam}</version> + <exclusions> + <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${seam}</version> + <exclusions> + <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-remoting</artifactId> + <version>${seam}</version> + <exclusions> + <exclusion><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> </project> Modified: trunk/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2008-02-07 21:08:41 UTC (rev 5930) +++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2008-02-07 21:14:58 UTC (rev 5931) @@ -18,23 +18,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> -  - <directory>${seamHome}</directory> -  - <targetPath>WEB-INF/lib</targetPath> - <includes> - <include>jboss-seam-ui.jar</include> - <include>jboss-seam-debug.jar</include> - <include> - jboss-seam-remoting.jar - </include> - </includes> - </resource> - </webResources> - </configuration> </plugin> </plugins> </build> @@ -58,7 +41,7 @@ <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> + <version>1.1.14</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -75,13 +58,13 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> + <version>1.2_07</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_04</version> + <version>1.2_07</version> <scope>provided</scope> </dependency> <dependency> @@ -115,54 +98,27 @@ <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> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <scope>provided</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> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> </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> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> </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> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> </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> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-remoting</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> - <artifactId>seam-remoting</artifactId> - <version>2.0.0.BETA</version> - <systemPath>${seamHome}/jboss-seam-remoting.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>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5930 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-07 16:08:41 -0500 (Thu, 07 Feb 2008) New Revision: 5930 Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js Log: http://jira.jboss.com/jira/browse/RF-2160 Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js =================================================================== --- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2008-02-07 20:25:29 UTC (rev 5929) +++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2008-02-07 21:08:41 UTC (rev 5930) @@ -4,7 +4,7 @@ this.tree = tree; this.eventKeyPress = this.processKeyDown.bindAsEventListener(this); - Event.observe(document, "keypress", this.eventKeyPress); + Event.observe(document, "keydown", this.eventKeyPress); this.eventLostFocus = this.processLostFocus.bindAsEventListener(this); Event.observe(document, "click", this.eventLostFocus);

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5929 - in branches/3.1.x/framework: api/src/main/java/org/ajax4jsf/resource and 11 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-07 15:25:29 -0500 (Thu, 07 Feb 2008) New Revision: 5929 Added: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/ branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java Removed: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/util/ Modified: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java branches/3.1.x/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java branches/3.1.x/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-1284 Modified: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java =================================================================== --- branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -14,6 +14,7 @@ import javax.faces.el.VariableResolver; import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.util.URLToStreamHelper; public abstract class AjaxContext { @@ -126,8 +127,8 @@ String factoryClassName = DEFAULT_CONTEXT_CLASS; // Pluggable factories. InputStream input = null; // loader.getResourceAsStream(SERVICE_RESOURCE); - input = contextClassLoader - .getResourceAsStream(SERVICE_RESOURCE); + input = URLToStreamHelper.urlToStreamSafe(contextClassLoader + .getResource(SERVICE_RESOURCE)); // have services file. if (input != null) { try { @@ -189,4 +190,4 @@ public abstract String getSubmittedRegionClientId(FacesContext context); public abstract void saveViewState(FacesContext context) throws IOException; -} \ No newline at end of file +} Modified: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java =================================================================== --- branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/InternetResourceBuilder.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -32,6 +32,7 @@ import javax.faces.context.FacesContext; import javax.servlet.ServletException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -137,7 +138,8 @@ try { String resource = "META-INF/services/" + InternetResourceBuilder.class.getName(); - InputStream in = loader.getResourceAsStream(resource); + InputStream in = URLToStreamHelper.urlToStreamSafe( + loader.getResource(resource)); BufferedReader reader = new BufferedReader( new InputStreamReader(in)); String serviceClassName = reader.readLine(); Copied: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util (from rev 5924, trunk/framework/api/src/main/java/org/ajax4jsf/resource/util) Deleted: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2008-02-07 17:03:07 UTC (rev 5924) +++ branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -1,82 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.resource.util; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Utility class to solve JAR locking issue using {@link URLConnection#setUseCaches(boolean)} method. - * Contains one utility method that gets {@link InputStream} from {@link URL} with caching disabled. - * - * Created 07.02.2008 - * @author Nick Belaevski - * @since 3.2 - */ - -public final class URLToStreamHelper { - - private static final Log log = LogFactory.getLog(URLToStreamHelper.class); - - private URLToStreamHelper() { - super(); - } - - /** - * Returns {@link InputStream} corresponding to argument {@link URL} - * but with caching disabled - * - * @param url {@link URL} of the resource - * @return {@link InputStream} instance or <code>null</code> - * @throws IOException - */ - public static final InputStream urlToStream(URL url) throws IOException { - if (url != null) { - URLConnection connection = url.openConnection(); - try { - connection.setUseCaches(false); - } catch (IllegalArgumentException e) { - log.error(e.getLocalizedMessage(), e); - } - - return connection.getInputStream(); - } else { - return null; - } - } - - public static final InputStream urlToStreamSafe(URL url) { - try { - return urlToStream(url); - } catch (IOException e) { - // do nothing - } - - return null; - } - -} Copied: branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java (from rev 5924, trunk/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java) =================================================================== --- branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java (rev 0) +++ branches/3.1.x/framework/api/src/main/java/org/ajax4jsf/resource/util/URLToStreamHelper.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -0,0 +1,82 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.resource.util; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Utility class to solve JAR locking issue using {@link URLConnection#setUseCaches(boolean)} method. + * Contains one utility method that gets {@link InputStream} from {@link URL} with caching disabled. + * + * Created 07.02.2008 + * @author Nick Belaevski + * @since 3.2 + */ + +public final class URLToStreamHelper { + + private static final Log log = LogFactory.getLog(URLToStreamHelper.class); + + private URLToStreamHelper() { + super(); + } + + /** + * Returns {@link InputStream} corresponding to argument {@link URL} + * but with caching disabled + * + * @param url {@link URL} of the resource + * @return {@link InputStream} instance or <code>null</code> + * @throws IOException + */ + public static final InputStream urlToStream(URL url) throws IOException { + if (url != null) { + URLConnection connection = url.openConnection(); + try { + connection.setUseCaches(false); + } catch (IllegalArgumentException e) { + log.error(e.getLocalizedMessage(), e); + } + + return connection.getInputStream(); + } else { + return null; + } + } + + public static final InputStream urlToStreamSafe(URL url) { + try { + return urlToStream(url); + } catch (IOException e) { + // do nothing + } + + return null; + } + +} Modified: branches/3.1.x/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java =================================================================== --- branches/3.1.x/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -33,6 +33,7 @@ import javax.faces.context.FacesContext; import org.ajax4jsf.Messages; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,7 +75,8 @@ if (instance == null) { // Pluggable factories. InputStream input = null; // loader.getResourceAsStream(SERVICE_RESOURCE); - input = loader.getResourceAsStream(SERVICE_RESOURCE); + input = URLToStreamHelper.urlToStreamSafe( + loader.getResource(SERVICE_RESOURCE)); // have services file. if (input != null) { try { Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/cache/CacheManager.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Properties; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -109,7 +110,8 @@ // try to find services in CLASSPATH try { ClassLoader cl = findClassLoader(); - InputStream is = cl.getResourceAsStream("META-INF/services/" + factoryId); + InputStream is = URLToStreamHelper.urlToStreamSafe( + cl.getResource("META-INF/services/" + factoryId)); if (is != null) { BufferedReader r = new BufferedReader(new InputStreamReader(is, "UTF-8")); try { Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/renderkit/compiler/HtmlCompiler.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -36,6 +36,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.renderkit.RendererBase; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import org.apache.commons.digester.RulesBase; @@ -272,7 +273,7 @@ public static PreparedTemplate compileResource(String resource) { HtmlCompiler compiler = new HtmlCompiler(); ClassLoader loader = Thread.currentThread().getContextClassLoader(); - InputStream input = loader.getResourceAsStream(resource); + InputStream input = URLToStreamHelper.urlToStreamSafe(loader.getResource(resource)); // Since parsing exceptions handled by compiler, we can not check parameter. PreparedTemplate compile = compiler.compile(input, resource); if(null != input){ Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceService.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -47,10 +47,7 @@ import org.ajax4jsf.cache.CacheLoader; import org.ajax4jsf.cache.CacheManager; import org.ajax4jsf.cache.ServletContextInitMap; -import org.ajax4jsf.resource.InternetResource; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.resource.ResourceContext; -import org.ajax4jsf.resource.ResourceNotFoundException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.BaseFilter; import org.ajax4jsf.webapp.CacheContent; import org.ajax4jsf.webapp.WebXml; @@ -265,7 +262,7 @@ */ protected Properties getProperties(String name) { Properties properties = new Properties(); - InputStream props = BaseFilter.class.getResourceAsStream(name); + InputStream props = URLToStreamHelper.urlToStreamSafe(BaseFilter.class.getResource(name)); if (null != props) { try { properties.load(props); Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/JarResource.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -21,13 +21,9 @@ package org.ajax4jsf.resource; -import java.io.IOException; import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.Date; -import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.resource.util.URLToStreamHelper; /** @@ -61,7 +57,7 @@ */ public InputStream getResourceAsStream(ResourceContext context) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); - return loader.getResourceAsStream(path); + return URLToStreamHelper.urlToStreamSafe(loader.getResource(path)); } public String getPath() { Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/resource/cached/CachedResourceBuilder.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -32,6 +32,7 @@ import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.ResourceNotFoundException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -174,8 +175,8 @@ */ protected Properties getProperties(String name) { Properties properties = new Properties(); - InputStream props = CachedResourceBuilder.class - .getResourceAsStream(name); + InputStream props = URLToStreamHelper.urlToStreamSafe(CachedResourceBuilder.class + .getResource(name)); if (null != props) { try { properties.load(props); Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/util/ServicesUtils.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -30,6 +30,7 @@ import javax.faces.FacesException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -108,7 +109,7 @@ Class serviceClass; try { String resource = "META-INF/services/" + name; - InputStream in = loader.getResourceAsStream(resource); + InputStream in = URLToStreamHelper.urlToStreamSafe(loader.getResource(resource)); BufferedReader reader = new BufferedReader( new InputStreamReader(in)); String serviceClassName = reader.readLine(); Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/ConfigurableXMLFilter.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -15,6 +15,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.nekko.NekkoParser; import org.ajax4jsf.webapp.tidy.TidyParser; import org.apache.commons.collections.ArrayStack; @@ -197,8 +198,8 @@ InputStream defaultprops = null; InputStream props = null; try { - defaultprops = TidyParser.class - .getResourceAsStream("tidy.properties"); + defaultprops = URLToStreamHelper.urlToStreamSafe(TidyParser.class + .getResource("tidy.properties")); if (null != defaultprops) { _tidyProperties.load(defaultprops); if (log.isDebugEnabled()) { @@ -209,8 +210,8 @@ } // Second part - user-defined properties. - props = Thread.currentThread().getContextClassLoader() - .getResourceAsStream("tidy.properties"); + props = URLToStreamHelper.urlToStreamSafe(Thread.currentThread().getContextClassLoader() + .getResource("tidy.properties")); if (null != props) { _tidyProperties.load(props); if (log.isDebugEnabled()) { Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/webapp/tidy/TidyXMLFilter.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -27,6 +27,7 @@ import org.ajax4jsf.Messages; import org.ajax4jsf.io.parser.FastHtmlParser; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.BaseXMLFilter; import org.ajax4jsf.webapp.HtmlParser; import org.apache.commons.collections.ArrayStack; @@ -94,12 +95,14 @@ _tidyProperties = new Properties(); InputStream props = null; try { - props = TidyXMLFilter.class.getResourceAsStream("tidy.properties"); + props = URLToStreamHelper.urlToStreamSafe( + TidyXMLFilter.class.getResource("tidy.properties")); if (null != props) { _tidyProperties.load(props); } // Second part - user-defined properties. - props = Thread.currentThread().getContextClassLoader().getResourceAsStream("tidy.properties"); + props = URLToStreamHelper.urlToStreamSafe( + Thread.currentThread().getContextClassLoader().getResource("tidy.properties")); if (null != props) { _tidyProperties.load(props); } Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/CharInfo.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -53,6 +53,7 @@ import javax.xml.transform.TransformerException; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.xml.serializer.utils.MsgKey; import org.ajax4jsf.xml.serializer.utils.SystemIDResolver; import org.ajax4jsf.xml.serializer.utils.Utils; @@ -219,13 +220,15 @@ // requires a valid URI as parameter try { if (internal) { - is = CharInfo.class.getResourceAsStream(entitiesResource); + is = URLToStreamHelper.urlToStreamSafe( + CharInfo.class.getResource(entitiesResource)); } else { ClassLoader cl = ObjectFactory.findClassLoader(); if (cl == null) { - is = ClassLoader.getSystemResourceAsStream(entitiesResource); + is = URLToStreamHelper.urlToStreamSafe( + ClassLoader.getSystemResource(entitiesResource)); } else { - is = cl.getResourceAsStream(entitiesResource); + is = URLToStreamHelper.urlToStreamSafe(cl.getResource(entitiesResource)); } if (is == null) { Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/OutputPropertiesFactory.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -49,6 +49,7 @@ import javax.xml.transform.OutputKeys; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.xml.serializer.utils.MsgKey; import org.ajax4jsf.xml.serializer.utils.Utils; import org.ajax4jsf.xml.serializer.utils.WrappedRuntimeException; @@ -401,16 +402,16 @@ .doPrivileged(new PrivilegedAction() { public Object run() { - return OutputPropertiesFactory.class - .getResourceAsStream(resourceName); + return URLToStreamHelper.urlToStreamSafe(OutputPropertiesFactory.class + .getResource(resourceName)); } }); } else { // User may be using older JDK ( JDK < 1.2 ) - is = OutputPropertiesFactory.class - .getResourceAsStream(resourceName); + is = URLToStreamHelper.urlToStreamSafe(OutputPropertiesFactory.class + .getResource(resourceName)); } bis = new BufferedInputStream(is); Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -45,6 +45,8 @@ import java.io.FileNotFoundException; import java.io.InputStream; +import org.ajax4jsf.resource.util.URLToStreamHelper; + /** * This class is duplicated for each Xalan-Java subpackage so keep it in sync. * It is package private and therefore is not exposed as part of the Xalan-Java @@ -125,9 +127,9 @@ InputStream getResourceAsStream(ClassLoader cl, String name) { InputStream ris; if (cl == null) { - ris = ClassLoader.getSystemResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(ClassLoader.getSystemResource(name)); } else { - ris = cl.getResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(cl.getResource(name)); } return ris; } Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/xml/serializer/SecuritySupport12.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -49,6 +49,8 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import org.ajax4jsf.resource.util.URLToStreamHelper; + /** * This class is duplicated for each Xalan-Java subpackage so keep it in sync. * It is package private and therefore is not exposed as part of the Xalan-Java @@ -132,9 +134,9 @@ public Object run() { InputStream ris; if (cl == null) { - ris = ClassLoader.getSystemResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(ClassLoader.getSystemResource(name)); } else { - ris = cl.getResourceAsStream(name); + ris = URLToStreamHelper.urlToStreamSafe(cl.getResource(name)); } return ris; } Modified: branches/3.1.x/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java =================================================================== --- branches/3.1.x/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2008-02-07 19:02:45 UTC (rev 5928) +++ branches/3.1.x/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2008-02-07 20:25:29 UTC (rev 5929) @@ -24,6 +24,7 @@ import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; +import org.ajax4jsf.resource.util.URLToStreamHelper; import org.ajax4jsf.webapp.tidy.TidyParser; import org.ajax4jsf.webapp.tidy.TidyXMLFilter; import org.richfaces.component.TemplateComponent; @@ -59,7 +60,8 @@ Properties tidyProperties = new Properties(); InputStream propertiesStream = null; try { - propertiesStream = TidyXMLFilter.class.getResourceAsStream("tidy.properties"); + propertiesStream = URLToStreamHelper.urlToStreamSafe( + TidyXMLFilter.class.getResource("tidy.properties")); tidyProperties.load(propertiesStream); } finally { if (propertiesStream != null) {

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5928 - trunk/samples/combobox-sample.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-07 14:02:45 -0500 (Thu, 07 Feb 2008) New Revision: 5928 Modified: trunk/samples/combobox-sample/pom.xml Log: combobox-sample/pom.xml updated Modified: trunk/samples/combobox-sample/pom.xml =================================================================== --- trunk/samples/combobox-sample/pom.xml 2008-02-07 19:01:50 UTC (rev 5927) +++ trunk/samples/combobox-sample/pom.xml 2008-02-07 19:02:45 UTC (rev 5928) @@ -9,40 +9,9 @@ <artifactId>combobox-sample</artifactId> <packaging>war</packaging> <name>JSF Maven Webapp</name> - <version>1.0-SNAPSHOT</version> <build> <finalName>combobox-sample</finalName> - - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.1</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> - <pluginRepositories> - <pluginRepository> - <id>mortbay-repo</id> - <name>mortbay-repo</name> - <url>http://www.mortbay.org/maven2/snapshot</url> - </pluginRepository> - <pluginRepository> - <id>repository.jboss.com</id> - <name>Jboss Repository for Maven Artifacts</name> - <url>http://repository.jboss.com/maven2</url> - </pluginRepository> - </pluginRepositories> <dependencies> <dependency> <groupId>org.richfaces.samples</groupId>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r5927 - trunk/samples/pickList-sample.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-07 14:01:50 -0500 (Thu, 07 Feb 2008) New Revision: 5927 Modified: trunk/samples/pickList-sample/pom.xml Log: pickList-sample/pom.xml updated Modified: trunk/samples/pickList-sample/pom.xml =================================================================== --- trunk/samples/pickList-sample/pom.xml 2008-02-07 18:36:49 UTC (rev 5926) +++ trunk/samples/pickList-sample/pom.xml 2008-02-07 19:01:50 UTC (rev 5927) @@ -9,38 +9,6 @@ <artifactId>pickList-sample</artifactId> <packaging>war</packaging> <name>JSF Maven Webapp</name> - <version>1.0-SNAPSHOT</version> - <build> - <finalName>webapp</finalName> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.1</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> - <pluginRepositories> - <pluginRepository> - <id>mortbay-repo</id> - <name>mortbay-repo</name> - <url>http://www.mortbay.org/maven2/snapshot</url> - </pluginRepository> - <pluginRepository> - <id>repository.jboss.com</id> - <name>Jboss Repository for Maven Artifacts</name> - <url>http://repository.jboss.com/maven2</url> - </pluginRepository> - </pluginRepositories> <dependencies> <dependency> <groupId>org.richfaces.samples</groupId>

18 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2008