Author: nbelaevski Date: 2007-05-21 18:12:23 -0400 (Mon, 21 May 2007) New Revision: 827 Added: trunk/richfaces-samples/separator-sample/pom.xml Modified: trunk/richfaces-samples/pom.xml trunk/richfaces-samples/separator-sample/ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java trunk/richfaces/separator/src/main/templates/separator.jspx Log: RF-200 fixed Modified: trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java =================================================================== --- trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2007-05-21 15:39:52 UTC (rev 826) +++ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2007-05-21 22:12:23 UTC (rev 827) @@ -24,6 +24,7 @@ import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.framework.util.style.CSSFormat; import org.richfaces.component.UISeparator; import org.richfaces.renderkit.html.images.BevelSeparatorImage; import org.richfaces.renderkit.html.images.SimpleSeparatorImage; @@ -98,6 +99,11 @@ } else { uri = getResource(SimpleSeparatorImage.class.getName()).getUri(context, component); } + + if (uri != null) { + uri = CSSFormat.url(uri); + } + return uri; } Modified: trunk/richfaces/separator/src/main/templates/separator.jspx =================================================================== --- trunk/richfaces/separator/src/main/templates/separator.jspx 2007-05-21 15:39:52 UTC (rev 826) +++ trunk/richfaces/separator/src/main/templates/separator.jspx 2007-05-21 22:12:23 UTC (rev 827) @@ -13,7 +13,7 @@ <div id="#{clientId}" align="#{component.attributes['align']}" style="font-size: 0px;" x:passThruWithExclusions="id,width,height,style,class"> <div style="width: #{this:getWidth(context, component)}; height: #{this:getHeight(context, component)}; - background-image: url(#{this:backgroundImage(context, component)}); background-repeat: repeat-x; + background-image: #{this:backgroundImage(context, component)}; background-repeat: repeat-x; background-position:center; #{component.attributes['style']}" class="rich-separator #{component.attributes['styleClass']}"/> </div> Modified: trunk/richfaces-samples/pom.xml =================================================================== --- trunk/richfaces-samples/pom.xml 2007-05-21 15:39:52 UTC (rev 826) +++ trunk/richfaces-samples/pom.xml 2007-05-21 22:12:23 UTC (rev 827) @@ -1,285 +1,286 @@ -<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</groupId> - <artifactId>richfaces-samples</artifactId> - <packaging>pom</packaging> - <name>RichFaces Components Examples</name> - <version>3.0.1-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossrichfaces/samples</url> - <properties> - <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version> - </properties> - <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default --> - <build> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${org.ajax4jsf.version}</version> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</conne... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/<... - <url>http://anonsvn.jboss.org/repos/richfaces/</url> - </scm> - - <distributionManagement> - <downloadUrl>http://labs.jboss.com/portal/jbossrichfaces/downloads</... - <repository> - <id>release-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>snap-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - <site> - <id>richfaces-samples-site</id> - <url>richfaces-samples/</url> - </site> - </distributionManagement> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url> - https://maven-repository.dev.java.net/nonav/repository - </url> - <layout>legacy</layout> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven.exadel.com</id> - <name>Jboss Repository for Maven Snapshots</name> - <url>http://maven.exadel.com/</url> - </repository> - </repositories> - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <build> - <defaultGoal>jetty:run</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>myfaces</id> - <properties> - <myfaces>1.1.5</myfaces> - <tomahawk>1.1.5</tomahawk> - </properties> - <build> - <plugins /> - </build> - <dependencies> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${org.ajax4jsf.version}</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces}</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>${myfaces}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <modules> - <module>panel-sample</module> - <module>gmap-sample</module> - <module>togglePanel-sample</module> - <module>tabPanelDemo</module> - <module>simpleTogglePanel-sample</module> - <module>inputNumberSpinnerDemo</module> - <module>inputNumberSliderDemo</module> - <module>panelbar-sample</module> - <module>toolBarDemo</module> - <module>tree-demo</module> - <module>dataFilterSliderDemo</module> - <module>suggestionbox-sample</module> - <module>dragDropDemo</module> - <module>dataTableDemo</module> - <module>skins</module> - <module>modalpanel-sample</module> - <module>datascroller-sample</module> - <module>richfaces-demo</module> - <module>dropdownmenu-sample</module> - </modules> +<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</groupId> + <artifactId>richfaces-samples</artifactId> + <packaging>pom</packaging> + <name>RichFaces Components Examples</name> + <version>3.0.1-SNAPSHOT</version> + <url>http://labs.jboss.com/jbossrichfaces/samples</url> + <properties> + <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version> + </properties> + <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default --> + <build> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${org.ajax4jsf.version}</version> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</conne... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/<... + <url>http://anonsvn.jboss.org/repos/richfaces/</url> + </scm> + + <distributionManagement> + <downloadUrl>http://labs.jboss.com/portal/jbossrichfaces/downloads</... + <repository> + <id>release-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snap-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + <site> + <id>richfaces-samples-site</id> + <url>richfaces-samples/</url> + </site> + </distributionManagement> + <repositories> + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url> + https://maven-repository.dev.java.net/nonav/repository + </url> + <layout>legacy</layout> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>maven.exadel.com</id> + <name>Jboss Repository for Maven Snapshots</name> + <url>http://maven.exadel.com/</url> + </repository> + </repositories> + <profiles> + <profile> + <id>jsf1_1</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.1</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <build> + <defaultGoal>jetty:run</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>myfaces</id> + <properties> + <myfaces>1.1.5</myfaces> + <tomahawk>1.1.5</tomahawk> + </properties> + <build> + <plugins /> + </build> + <dependencies> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${org.ajax4jsf.version}</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>${myfaces}</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>${myfaces}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <modules> + <module>separator-sample</module> + <module>panel-sample</module> + <module>gmap-sample</module> + <module>togglePanel-sample</module> + <module>tabPanelDemo</module> + <module>simpleTogglePanel-sample</module> + <module>inputNumberSpinnerDemo</module> + <module>inputNumberSliderDemo</module> + <module>panelbar-sample</module> + <module>toolBarDemo</module> + <module>tree-demo</module> + <module>dataFilterSliderDemo</module> + <module>suggestionbox-sample</module> + <module>dragDropDemo</module> + <module>dataTableDemo</module> + <module>skins</module> + <module>modalpanel-sample</module> + <module>datascroller-sample</module> + <module>richfaces-demo</module> + <module>dropdownmenu-sample</module> + </modules> </project> \ No newline at end of file Property changes on: trunk/richfaces-samples/separator-sample ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Added: trunk/richfaces-samples/separator-sample/pom.xml =================================================================== --- trunk/richfaces-samples/separator-sample/pom.xml (rev 0) +++ trunk/richfaces-samples/separator-sample/pom.xml 2007-05-21 22:12:23 UTC (rev 827) @@ -0,0 +1,32 @@ +<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"> + <parent> + <artifactId>richfaces-samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>separator-sample</artifactId> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>separator-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>separator</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>skins</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> \ No newline at end of file