May 2007 - ajax4jsf-svn-commits - Jboss List Archives

JBoss Ajax4JSF SVN: r204 - in trunk: a4j-portlet and 8 other directories.

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

Author: alexsmirnov Date: 2007-05-16 19:55:00 -0400 (Wed, 16 May 2007) New Revision: 204 Modified: trunk/a4j-portlet/pom.xml trunk/cdk/compiler/pom.xml trunk/cdk/generator/pom.xml trunk/cdk/maven-archetype-jsf-component/pom.xml trunk/cdk/maven-archetype-jsfwebapp/pom.xml trunk/cdk/maven-cdk-plugin/pom.xml trunk/cdk/pom.xml trunk/framework/pom.xml trunk/pom.xml trunk/test/pom.xml Log: [maven-release-plugin] prepare release 1_1_1_rc4 Modified: trunk/a4j-portlet/pom.xml =================================================================== --- trunk/a4j-portlet/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/a4j-portlet/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,70 +1,67 @@ -<?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"> - <parent> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>a4j-portlet</artifactId> - <name>ajax4jsf portlet brige</name> +<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>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>a4j-portlet</artifactId> + <name>ajax4jsf portlet brige</name> <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>portlet-api</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04</version> - <scope>provided</scope> - </dependency> + <dependencies> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>portlet-api</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> <version>1.2_04</version> <scope>provided</scope> </dependency> - <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> + <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>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.11</version> <optional>true</optional> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> - </dependency> + </dependency> <dependency> <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>1.1.1-rc4</version> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> <artifactId>test</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc4</version> <scope>test</scope> </dependency> - </dependencies> + </dependencies> </project> \ No newline at end of file Modified: trunk/cdk/compiler/pom.xml =================================================================== --- trunk/cdk/compiler/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/cdk/compiler/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,63 +1,63 @@ -<?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"> - <parent> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>compiler</artifactId> - <name>JSF Renderers templates complier</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/compiler</url> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - </dependencies> +<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>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>compiler</artifactId> + <name>JSF Renderers templates complier</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/compiler</url> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/cdk/generator/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,8 +1,8 @@ -<?xml version="1.0"?><project> +<?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"> <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,11 +1,11 @@ -<?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"> - <parent> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-archetype-jsf-component</artifactId> - <name>Archetype - maven-archetype-jsf-component</name> +<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>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-archetype-jsf-component</artifactId> + <name>Archetype - maven-archetype-jsf-component</name> </project> \ No newline at end of file Modified: trunk/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,11 +1,11 @@ -<?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"> - <parent> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-archetype-jsfwebapp</artifactId> - <name>Archetype for jsf webapp project</name> +<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>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-archetype-jsfwebapp</artifactId> + <name>Archetype for jsf webapp project</name> </project> \ No newline at end of file Modified: trunk/cdk/maven-cdk-plugin/pom.xml =================================================================== --- trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,56 +1,56 @@ -<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>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <packaging>maven-plugin</packaging> - <name>Maven plugin for JSF components code generation</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/maven-cdk-plugin/</url> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>file-management</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>generator</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> +<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>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <packaging>maven-plugin</packaging> + <name>Maven plugin for JSF components code generation</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/maven-cdk-plugin/</url> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>file-management</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>generator</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: trunk/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/cdk/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -3,16 +3,16 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc4</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> <artifactId>cdk</artifactId> <packaging>pom</packaging> <name>JSF Components Development kit</name> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc4</version> <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> - <dependencies/> + <dependencies /> <build> <pluginManagement> <plugins> Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/framework/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,80 +1,76 @@ -<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>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <name>Java Server Faces AJAX framework</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/framework</url> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>target/javascript</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.ajax4jsf</prefix> - <jsfVersion>${jsfVersion}</jsfVersion> - <taglib> - <uri> - https://ajax4jsf.dev.java.net/ajax - </uri> - <shortName>a4j</shortName> - </taglib> - </library> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant - antfile="${basedir}/generatescript.xml" inheritRefs="true"> - <target name="assembly" /> - <property name="target-dir" - value="${project.build.directory}/javascript"> - </property> - </ant> - </tasks> - <resourceRoot> - ${project.build.directory}/javascript - </resourceRoot> - </configuration> - </execution> - </executions> - </plugin> +<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>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <name>Java Server Faces AJAX framework</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/framework</url> + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>target/javascript</directory> + </resource> + </resources> + <plugins> <plugin> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.ajax4jsf</prefix> + <jsfVersion>${jsfVersion}</jsfVersion> + <taglib> + <uri> + https://ajax4jsf.dev.java.net/ajax + </uri> + <shortName>a4j</shortName> + </taglib> + </library> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> + <target name="assembly" /> + <property name="target-dir" value="${project.build.directory}/javascript"> + </property> + </ant> + </tasks> + <resourceRoot> + ${project.build.directory}/javascript + </resourceRoot> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-source-plugin</artifactId> <executions> <execution> @@ -85,260 +81,260 @@ </execution> </executions> </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - </plugin> - </plugins> - </reporting> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + </plugin> + </plugins> + </reporting> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> <optional>true</optional> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.11</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>0.9</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - </dependencies> - <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.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.1_02</version> - <exclusions> -  - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet.jsp.jstl</groupId> - <artifactId>jstl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.1_02</version> - <scope>runtime</scope> - <exclusions> -  - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet.jsp.jstl</groupId> - <artifactId>jstl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <activation> - <property> - <name>jsfVersion</name> - <value>1.2</value> - </property> - </activation> - <build> - <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> -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>process-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/jsf12</source> - </sources> - </configuration> - </execution> - </executions> - </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>assembly</id> - <build> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <configuration> - <taglib.src.dir> - ${project.build.directory}/generated-component/resources/META-INF - </taglib.src.dir> - <tldDocDir> - ${project.build.directory}/tlddoc - </tldDocDir> - </configuration> - - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>taglibdocjar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.5</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>0.9</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + </dependencies> + <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.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.1_02</version> + <exclusions> +  + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>jstl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.1_02</version> + <scope>runtime</scope> + <exclusions> +  + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>jstl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <activation> + <property> + <name>jsfVersion</name> + <value>1.2</value> + </property> + </activation> + <build> + <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> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId> + build-helper-maven-plugin + </artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>process-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/jsf12</source> + </sources> + </configuration> + </execution> + </executions> + </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>assembly</id> + <build> + <plugins> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + <configuration> + <taglib.src.dir> + ${project.build.directory}/generated-component/resources/META-INF + </taglib.src.dir> + <tldDocDir> + ${project.build.directory}/tlddoc + </tldDocDir> + </configuration> + + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>taglibdocjar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,15 +1,13 @@ -<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.ajax4jsf</groupId> - <artifactId>master</artifactId> - <packaging>pom</packaging> - <version>1.1.1-SNAPSHOT</version> - <name>Ajax for Java Server faces core project</name> - <url>http://labs.jboss.com/jbossajax4jsf</url> - <properties> - <maven.test.failure.ignore>true</maven.test.failure.ignore> +<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.ajax4jsf</groupId> + <artifactId>master</artifactId> + <packaging>pom</packaging> + <version>1.1.1-rc4</version> + <name>Ajax for Java Server faces core project</name> + <url>http://labs.jboss.com/jbossajax4jsf</url> + <properties> + <maven.test.failure.ignore>true</maven.test.failure.ignore> </properties> <build> <pluginManagement> @@ -39,59 +37,59 @@ </plugin> </plugins> </pluginManagement> - </build> - <licenses> - <license> - <name>LGPL 2.1</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments> - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - </comments> - </license> - </licenses> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/jira/browse/AJSF</url> - </issueManagement> - <developers> - <developer> - <id>alexsmirnov</id> - <name>Alexander Smirnov</name> - <email>alexsmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>-3</timezone> - </developer> - <developer> - <id>ishabalov</id> - <name>Igor Shabalov</name> - <email>ishabalov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <id>sergeysmirnov</id> - <name>Sergey Smirnov</name> - <email>sergeysmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - </developers> + </build> + <licenses> + <license> + <name>LGPL 2.1</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments> + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + </comments> + </license> + </licenses> + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/jira/browse/AJSF</url> + </issueManagement> + <developers> + <developer> + <id>alexsmirnov</id> + <name>Alexander Smirnov</name> + <email>alexsmirnov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>-3</timezone> + </developer> + <developer> + <id>ishabalov</id> + <name>Igor Shabalov</name> + <email>ishabalov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + <developer> + <id>sergeysmirnov</id> + <name>Sergey Smirnov</name> + <email>sergeysmirnov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + </developers> <distributionManagement> <downloadUrl> http://labs.jboss.com/portal/jbossajax4jsf/downloads @@ -105,54 +103,50 @@ <id>snap-repository</id> <uniqueVersion>true</uniqueVersion> <url>${snapshotRepository}</url> - </snapshotRepository> - <site> - <id>ajax4jsf-site</id> - <url>ajax4jsf/</url> + </snapshotRepository> + <site> + <id>ajax4jsf-site</id> + <url>ajax4jsf/</url> </site> - </distributionManagement> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </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> - </repositories> + </distributionManagement> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </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> + </repositories> <scm> - <connection> - scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/ - </connection> - <developerConnection> - scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/ - </developerConnection> - <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> - </scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</developerConnection> + <url>http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</url> + </scm>  - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId> - maven-project-info-reports-plugin - </artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - </configuration> - </plugin> + --> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId> + maven-project-info-reports-plugin + </artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + </configuration> + </plugin>  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + </plugin>  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <xmlOutput>false</xmlOutput> - <threshold>Normal</threshold> - <effort>Max</effort> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - - </reporting> - <ciManagement> - <notifiers></notifiers> - <system>cruisecontrol</system> - </ciManagement> - - <modules> - <module>framework</module> - <module>test</module> - <module>cdk</module> + --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <configuration> + <xmlOutput>false</xmlOutput> + <threshold>Normal</threshold> + <effort>Max</effort> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + + </reporting> + <ciManagement> + <notifiers /> + <system>cruisecontrol</system> + </ciManagement> + + <modules> + <module>framework</module> + <module>test</module> + <module>cdk</module> <module>a4j-portlet</module> - </modules> - <profiles> - <profile> - <id>gwt</id> - <modules> - <module>gwtjsf</module> - </modules> - </profile> - <profile> - <id>trinidad</id> - <modules> - <module>a4j-trinidad</module> - </modules> - </profile> - <profile> - <id>seam</id> - <modules> - <module>a4j-seam</module> - </modules> - </profile> - <profile> - <id>assembly</id> - <build> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <finalName>ajax4jsf-${version}</finalName> - <descriptors> - <descriptor> - src/main/assembly/distribution.xml - </descriptor> - <descriptor> - src/main/assembly/src.xml - </descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <configuration> - <includesAllSourceRoots> - true - </includesAllSourceRoots> - <licenseLocation> - ${clover.license.path} - </licenseLocation> - <jdk>1.5</jdk> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>instrument</goal> - <goal>aggregate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> + </modules> + <profiles> + <profile> + <id>gwt</id> + <modules> + <module>gwtjsf</module> + </modules> + </profile> + <profile> + <id>trinidad</id> + <modules> + <module>a4j-trinidad</module> + </modules> + </profile> + <profile> + <id>seam</id> + <modules> + <module>a4j-seam</module> + </modules> + </profile> + <profile> + <id>assembly</id> + <build> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <finalName>ajax4jsf-${version}</finalName> + <descriptors> + <descriptor> + src/main/assembly/distribution.xml + </descriptor> + <descriptor> + src/main/assembly/src.xml + </descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <includesAllSourceRoots> + true + </includesAllSourceRoots> + <licenseLocation> + ${clover.license.path} + </licenseLocation> + <jdk>1.5</jdk> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>instrument</goal> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId>  - </plugin> - </plugins> - </reporting> - </profile> - </profiles> -  + --> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> +  </project> \ No newline at end of file Modified: trunk/test/pom.xml =================================================================== --- trunk/test/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ trunk/test/pom.xml 2007-05-16 23:55:00 UTC (rev 204) @@ -1,76 +1,76 @@ -<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>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>test</artifactId> - <name>Ajax4Jsf test framework</name> - <url>https://ajax4jsf.dev.java.net</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.shale</groupId> - <artifactId>shale-test</artifactId> - <version>1.0.4</version> - <exclusions> - <exclusion> - <groupId>org.apache.myfaces</groupId> - <artifactId>myfaces-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.myfaces</groupId> - <artifactId>myfaces-impl</artifactId> - </exclusion> - <exclusion> - <groupId>myfaces</groupId> - <artifactId>myfaces-api</artifactId> - </exclusion> - <exclusion> - <groupId>myfaces</groupId> - <artifactId>myfaces-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>1.10</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>2.2.1</version> - <optional>true</optional> - </dependency> - <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> - </dependencies> +<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>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>test</artifactId> + <name>Ajax4Jsf test framework</name> + <url>https://ajax4jsf.dev.java.net</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.shale</groupId> + <artifactId>shale-test</artifactId> + <version>1.0.4</version> + <exclusions> + <exclusion> + <groupId>org.apache.myfaces</groupId> + <artifactId>myfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + </exclusion> + <exclusion> + <groupId>myfaces</groupId> + <artifactId>myfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>1.10</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.2.1</version> + <optional>true</optional> + </dependency> + <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> + </dependencies> </project> \ No newline at end of file

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r203 - trunk.

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

Author: alexsmirnov Date: 2007-05-16 19:51:00 -0400 (Wed, 16 May 2007) New Revision: 203 Modified: trunk/pom.xml Log: Correct SVN connection urls Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-05-16 23:41:09 UTC (rev 202) +++ trunk/pom.xml 2007-05-16 23:51:00 UTC (rev 203) @@ -129,12 +129,12 @@ </repositories> <scm> <connection> - scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf + scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/ </connection> <developerConnection> - scm:svn:https://svn.jboss.org/repos/ajax4jsf + scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/ </developerConnection> - <url>http://anonsvn.jboss.org/repos/ajax4jsf</url> + <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> </scm>

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r202 - trunk.

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

Author: alexsmirnov Date: 2007-05-16 19:41:09 -0400 (Wed, 16 May 2007) New Revision: 202 Modified: trunk/pom.xml Log: Correct SVN connection urls Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-05-16 23:25:53 UTC (rev 201) +++ trunk/pom.xml 2007-05-16 23:41:09 UTC (rev 202) @@ -129,12 +129,12 @@ </repositories> <scm> <connection> - scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/ + scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf </connection> <developerConnection> - scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/ + scm:svn:https://svn.jboss.org/repos/ajax4jsf </developerConnection> - <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> + <url>http://anonsvn.jboss.org/repos/ajax4jsf</url> </scm>

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r201 - tags.

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

Author: alexsmirnov Date: 2007-05-16 19:25:53 -0400 (Wed, 16 May 2007) New Revision: 201 Added: tags/1_1_1_prerc4/ Log: Copied: tags/1_1_1_prerc4 (from rev 200, trunk)

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r200 - trunk/framework/src/main/javascript/ajaxjsf.

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

Author: alexsmirnov Date: 2007-05-16 19:22:21 -0400 (Wed, 16 May 2007) New Revision: 200 Modified: trunk/framework/src/main/javascript/ajaxjsf/sarissa.js trunk/framework/src/main/javascript/ajaxjsf/sarissa_dhtml.js trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_load.js trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xpath.js trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xslt.js Log: Update sarissa library to 0.9.7.8 Modified: trunk/framework/src/main/javascript/ajaxjsf/sarissa.js =================================================================== --- trunk/framework/src/main/javascript/ajaxjsf/sarissa.js 2007-05-16 13:14:42 UTC (rev 199) +++ trunk/framework/src/main/javascript/ajaxjsf/sarissa.js 2007-05-16 23:22:21 UTC (rev 200) @@ -1,653 +1,664 @@ -/** - * ==================================================================== - * About - * ==================================================================== - * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. - * The library supports Gecko based browsers like Mozilla and Firefox, - * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera - * @version 0.9.7.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * ==================================================================== - * Licence - * ==================================================================== - * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, - * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher - * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If - * you make modifications under the ASL, i would appreciate it if you submitted those. - * In case your copy of Sarissa does not include the license texts, you may find - * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and - * <a href="http://www.apache.org">http://www.apache.org</a>. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -/** - * Sarissa is a utility class. Provides "static" methods for DOMDocument, - * DOM Node serialization to XML strings and other utility goodies. - * @constructor - */ -function Sarissa(){}; -Sarissa.PARSED_OK = "Document contains no parsing errors"; -Sarissa.PARSED_EMPTY = "Document is empty"; -Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; -var _sarissa_iNsCounter = 0; -var _SARISSA_IEPREFIX4XSLPARAM = ""; -var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; -var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; -var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; -var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); -var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; -if(!window.Node || !Node.ELEMENT_NODE){ - Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; -}; - -if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } - -// IE initialization -if(_SARISSA_IS_IE){ - // for XSLT parameter names, prefix needed by IE - _SARISSA_IEPREFIX4XSLPARAM = "xsl:"; - // used to store the most recent ProgID available out of the above - var _SARISSA_DOM_PROGID = ""; - var _SARISSA_XMLHTTP_PROGID = ""; - var _SARISSA_DOM_XMLWRITER = ""; - /** - * Called when the Sarissa_xx.js file is parsed, to pick most recent - * ProgIDs for IE, then gets destroyed. - * @private - * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object - * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled - */ - Sarissa.pickRecentProgID = function (idList){ - // found progID flag - var bFound = false; - for(var i=0; i < idList.length && !bFound; i++){ - try{ - var oDoc = new ActiveXObject(idList[i]); - o2Store = idList[i]; - bFound = true; - }catch (objException){ - // trap; try next progID - }; - }; - if (!bFound) { - throw "Could not retreive a valid progID of Class: " + idList[idList.length-1]+". (original exception: "+e+")"; - }; - idList = null; - return o2Store; - }; - // pick best available MSXML progIDs - _SARISSA_DOM_PROGID = null; - _SARISSA_THREADEDDOM_PROGID = null; - _SARISSA_XSLTEMPLATE_PROGID = null; - _SARISSA_XMLHTTP_PROGID = null; - if(!window.XMLHttpRequest){ - /** - * Emulate XMLHttpRequest - * @constructor - */ - XMLHttpRequest = function() { - if(!_SARISSA_XMLHTTP_PROGID){ - _SARISSA_XMLHTTP_PROGID = Sarissa.pickRecentProgID(["Msxml2.XMLHTTP.6.0", "MSXML2.XMLHTTP.3.0", "MSXML2.XMLHTTP", "Microsoft.XMLHTTP"]); - }; - return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); - }; - }; - // we dont need this anymore - //============================================ - // Factory methods (IE) - //============================================ - // see non-IE version - Sarissa.getDomDocument = function(sUri, sName){ - if(!_SARISSA_DOM_PROGID){ - _SARISSA_DOM_PROGID = Sarissa.pickRecentProgID(["Msxml2.DOMDocument.6.0", "Msxml2.DOMDocument.3.0", "MSXML2.DOMDocument", "MSXML.DOMDocument", "Microsoft.XMLDOM"]); - }; - var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - // if a root tag name was provided, we need to load it in the DOM object - if (sName){ - // create an artifical namespace prefix - // or reuse existing prefix if applicable - var prefix = ""; - if(sUri){ - if(sName.indexOf(":") > 1){ - prefix = sName.substring(0, sName.indexOf(":")); - sName = sName.substring(sName.indexOf(":")+1); - }else{ - prefix = "a" + (_sarissa_iNsCounter++); - }; - }; - // use namespaces if a namespace URI exists - if(sUri){ - oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); - } else { - oDoc.loadXML('<' + sName + " />"); - }; - }; - return oDoc; - }; - // see non-IE version - Sarissa.getParseErrorText = function (oDoc) { - var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError.errorCode != 0){ - parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + - "\nLocation: " + oDoc.parseError.url + - "\nLine Number " + oDoc.parseError.line + ", Column " + - oDoc.parseError.linepos + - ":\n" + oDoc.parseError.srcText + - "\n"; - for(var i = 0; i < oDoc.parseError.linepos;i++){ - parseErrorText += "-"; - }; - parseErrorText += "^\n"; - } - else if(oDoc.documentElement == null){ - parseErrorText = Sarissa.PARSED_EMPTY; - }; - return parseErrorText; - }; - // see non-IE version - Sarissa.setXpathNamespaces = function(oDoc, sNsSet) { - oDoc.setProperty("SelectionLanguage", "XPath"); - oDoc.setProperty("SelectionNamespaces", sNsSet); - }; - /** - * Basic implementation of Mozilla's XSLTProcessor for IE. - * Reuses the same XSLT stylesheet for multiple transforms - * @constructor - */ - XSLTProcessor = function(){ - if(!_SARISSA_XSLTEMPLATE_PROGID){ - _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); - }; - this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); - this.processor = null; - }; - /** - * Imports the given XSLT DOM and compiles it to a reusable transform - * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those - * @argument xslDoc The XSLT DOMDocument to import - */ - XSLTProcessor.prototype.importStylesheet = function(xslDoc){ - if(!_SARISSA_THREADEDDOM_PROGID){ - _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); - }; - xslDoc.setProperty("SelectionLanguage", "XPath"); - xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); - // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); - // make included/imported stylesheets work if exist and xsl was originally loaded from url - if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ - converted.async = false; - if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { - converted.setProperty("AllowDocumentFunction", true); - converted.resolveExternals = true; - } - converted.load(xslDoc.url); - } else { - converted.loadXML(xslDoc.xml); - }; - converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); - var output = converted.selectSingleNode("//xsl:output"); - this.outputMethod = output ? output.getAttribute("method") : "html"; - this.template.stylesheet = converted; - this.processor = this.template.createProcessor(); - // for getParameter and clearParameters - this.paramsSet = new Array(); - }; - - /** - * Transform the given XML DOM and return the transformation result as a new DOM document - * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Document - */ - XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ - // fix for bug 1549749 - if(_SARISSA_THREADEDDOM_PROGID){ - this.processor.input=sourceDoc; - var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output=outDoc; - this.processor.transform(); - return outDoc; - } - else{ - if(!_SARISSA_DOM_XMLWRITER){ - _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); - }; - this.processor.input = sourceDoc; - var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); - this.processor.output = outDoc; - this.processor.transform(); - var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - oDoc.loadXML(outDoc.output+""); - return oDoc; - }; - }; - - /** - * Transform the given XML DOM and return the transformation result as a new DOM fragment. - * Note: The xsl:output method must match the nature of the owner document (XML/HTML). - * @argument sourceDoc The XML DOMDocument to transform - * @argument ownerDoc The owner of the result fragment - * @return The transformation result as a DOM Document - */ - XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { - this.processor.input = sourceDoc; - this.processor.transform(); - var s = this.processor.output; - var f = ownerDoc.createDocumentFragment(); - if (this.outputMethod == 'text') { - f.appendChild(ownerDoc.createTextNode(s)); - } else if (ownerDoc.body && ownerDoc.body.innerHTML) { - var container = ownerDoc.createElement('div'); - container.innerHTML = s; - while (container.hasChildNodes()) { - f.appendChild(container.firstChild); - } - } - else { - var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - if (s.substring(0, 5) == '<?xml') { - s = s.substring(s.indexOf('?>') + 2); - } - var xml = ''.concat('<my>', s, '</my>'); - oDoc.loadXML(xml); - var container = oDoc.documentElement; - while (container.hasChildNodes()) { - f.appendChild(container.firstChild); - } - } - return f; - }; - - /** - * Set global XSLT parameter of the imported stylesheet - * @argument nsURI The parameter namespace URI - * @argument name The parameter base name - * @argument value The new parameter value - */ - XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ - // nsURI is optional but cannot be null - if(nsURI){ - this.processor.addParameter(name, value, nsURI); - }else{ - this.processor.addParameter(name, value); - }; - // update updated params for getParameter - if(!this.paramsSet[""+nsURI]){ - this.paramsSet[""+nsURI] = new Array(); - }; - this.paramsSet[""+nsURI][name] = value; - }; - /** - * Gets a parameter if previously set by setParameter. Returns null - * otherwise - * @argument name The parameter base name - * @argument value The new parameter value - * @return The parameter value if reviously set by setParameter, null otherwise - */ - XSLTProcessor.prototype.getParameter = function(nsURI, name){ - nsURI = nsURI || ""; - if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ - return this.paramsSet[nsURI][name]; - }else{ - return null; - }; - }; - /** - * Clear parameters (set them to default values as defined in the stylesheet itself) - */ - XSLTProcessor.prototype.clearParameters = function(){ - for(var nsURI in this.paramsSet){ - for(var name in this.paramsSet[nsURI]){ - if(nsURI){ - this.processor.addParameter(name, null, nsURI); - }else{ - this.processor.addParameter(name, null); - }; - }; - }; - this.paramsSet = new Array(); - }; -}else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - /** - * Ensures the document was loaded correctly, otherwise sets the - * parseError to -1 to indicate something went wrong. Internal use - * @private - */ - Sarissa.__handleLoad__ = function(oDoc){ - Sarissa.__setReadyState__(oDoc, 4); - }; - /** - * Attached by an event handler to the load event. Internal use. - * @private - */ - _sarissa_XMLDocument_onload = function(){ - Sarissa.__handleLoad__(this); - }; - /** - * Sets the readyState property of the given DOM Document object. - * Internal use. - * @private - * @argument oDoc the DOM Document object to fire the - * readystatechange event - * @argument iReadyState the number to change the readystate property to - */ - Sarissa.__setReadyState__ = function(oDoc, iReadyState){ - oDoc.readyState = iReadyState; - oDoc.readystate = iReadyState; - if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") - oDoc.onreadystatechange(); - }; - Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); - if(!oDoc.onreadystatechange){ - - /** - * Emulate IE's onreadystatechange attribute - */ - oDoc.onreadystatechange = null; - }; - if(!oDoc.readyState){ - /** - * Emulates IE's readyState property, which always gives an integer from 0 to 4: - * <ul><li>1 == LOADING,</li> - * <li>2 == LOADED,</li> - * <li>3 == INTERACTIVE,</li> - * <li>4 == COMPLETED</li></ul> - */ - oDoc.readyState = 0; - }; - oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); - return oDoc; - }; - if(window.XMLDocument){ - // do nothing - }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS - else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ - //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good - /** - * Factory method to obtain a new DOM Document object - * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ - Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); - return oDoc; - }; - } - else { - Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); - // looks like safari does not create the root element for some unknown reason - if(oDoc && (sUri || sName) && !oDoc.documentElement){ - oDoc.appendChild(oDoc.createElementNS(sUri, sName)); - }; - return oDoc; - }; - }; - };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) -}; -//========================================== -// Common stuff -//========================================== -if(!window.DOMParser){ - if(_SARISSA_IS_SAFARI){ - /* - * DOMParser is a utility class, used to construct DOMDocuments from XML strings - * @constructor - */ - DOMParser = function() { }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var xmlhttp = new XMLHttpRequest(); - xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); - xmlhttp.send(null); - return xmlhttp.responseXML; - }; - }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ - DOMParser = function() { }; - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; - }; - }; -}; - -if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ - try{ - /** - * Implementation of importNode for the context window document in IE - * @param oNode the Node to import - * @param bChildren whether to include the children of oNode - * @returns the imported node for further use - */ - document.importNode = function(oNode, bChildren){ - var tmp; - if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ - tmp = document.createElement("table"); - } - else if(oNode.nodeName == "td"){ - tmp = document.createElement("tr"); - } - else if(oNode.nodeName == "option"){ - tmp = document.createElement("select"); - } - else{ - tmp = document.createElement("div"); - }; - if(bChildren){ - tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; - }else{ - tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; - }; - return tmp.getElementsByTagName("*")[0]; - }; - }catch(e){ }; -}; -if(!Sarissa.getParseErrorText){ - /** - * Returns a human readable description of the parsing error. Usefull - * for debugging. Tip: append the returned error string in a <pre> - * element if you want to render it. - * Many thanks to Christian Stocker for the initial patch. - * @argument oDoc The target DOM document - * @returns The parsing error description of the target Document in - * human readable form (preformated text) - */ - Sarissa.getParseErrorText = function (oDoc){ - var parseErrorText = Sarissa.PARSED_OK; - if(!oDoc.documentElement){ - parseErrorText = Sarissa.PARSED_EMPTY; - } else if(oDoc.documentElement.tagName == "parsererror"){ - parseErrorText = oDoc.documentElement.firstChild.data; - parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; - } else if(oDoc.getElementsByTagName("parsererror").length > 0){ - var parsererror = oDoc.getElementsByTagName("parsererror")[0]; - parseErrorText = Sarissa.getText(parsererror, true)+"\n"; - } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ - parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; - }; - return parseErrorText; - }; -}; -Sarissa.getText = function(oNode, deep){ - var s = ""; - var nodes = oNode.childNodes; - for(var i=0; i < nodes.length; i++){ - var node = nodes[i]; - var nodeType = node.nodeType; - if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ - s += node.data; - } else if(deep == true - && (nodeType == Node.ELEMENT_NODE - || nodeType == Node.DOCUMENT_NODE - || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ - s += Sarissa.getText(node, true); - }; - }; - return s; -}; -if(!window.XMLSerializer - && Sarissa.getDomDocument - && Sarissa.getDomDocument("","foo", null).xml){ - /** - * Utility class to serialize DOM Node objects to XML strings - * @constructor - */ - XMLSerializer = function(){}; - /** - * Serialize the given DOM Node to an XML string - * @param oNode the DOM Node to serialize - */ - XMLSerializer.prototype.serializeToString = function(oNode) { - return oNode.xml; - }; -}; - -/** - * strips tags from a markup string - */ -Sarissa.stripTags = function (s) { - return s.replace(/<[^>]+>/g,""); -}; -/** - * Deletes all child nodes of the given node - * @argument oNode the Node to empty - */ -Sarissa.clearChildNodes = function(oNode) { - // need to check for firstChild due to opera 8 bug with hasChildNodes - while(oNode.firstChild) { - oNode.removeChild(oNode.firstChild); - }; -}; -/** - * Copies the childNodes of nodeFrom to nodeTo - * Note: The second object's original content is deleted before - * the copy operation, unless you supply a true third parameter - * @argument nodeFrom the Node to copy the childNodes from - * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ -Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { - if((!nodeFrom) || (!nodeTo)){ - throw "Both source and destination nodes must be provided"; - }; - if(!bPreserveExisting){ - Sarissa.clearChildNodes(nodeTo); - }; - var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - var nodes = nodeFrom.childNodes; - if(typeof(ownerDoc.importNode) != "undefined") { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } else { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; - }; -}; - -/** - * Moves the childNodes of nodeFrom to nodeTo - * Note: The second object's original content is deleted before - * the move operation, unless you supply a true third parameter - * @argument nodeFrom the Node to copy the childNodes from - * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is - */ -Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { - if((!nodeFrom) || (!nodeTo)){ - throw "Both source and destination nodes must be provided"; - }; - if(!bPreserveExisting){ - Sarissa.clearChildNodes(nodeTo); - }; - var nodes = nodeFrom.childNodes; - // if within the same doc, just move, else copy and delete - if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - while(nodeFrom.firstChild){ - nodeTo.appendChild(nodeFrom.firstChild); - }; - } else { - var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(typeof(ownerDoc.importNode) != "undefined") { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - }else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; - }; - Sarissa.clearChildNodes(nodeFrom); - }; -}; - -/** - * Serialize any object to an XML string. All properties are serialized using the property name - * as the XML element name. Array elements are rendered as <code>array-item</code> elements, - * using their index/key as the value of the <code>key</code> attribute. - * @argument anyObject the object to serialize - * @argument objectName a name for that object - * @return the XML serializationj of the given object as a string - */ -Sarissa.xmlize = function(anyObject, objectName, indentSpace){ - indentSpace = indentSpace?indentSpace:''; - var s = indentSpace + '<' + objectName + '>'; - var isLeaf = false; - if(!(anyObject instanceof Object) || anyObject instanceof Number || anyObject instanceof String - || anyObject instanceof Boolean || anyObject instanceof Date){ - s += Sarissa.escape(""+anyObject); - isLeaf = true; - }else{ - s += "\n"; - var itemKey = ''; - var isArrayItem = anyObject instanceof Array; - for(var name in anyObject){ - s += Sarissa.xmlize(anyObject[name], (isArrayItem?"array-item key=\""+name+"\"":name), indentSpace + " "); - }; - s += indentSpace; - }; - return s += (objectName.indexOf(' ')!=-1?"</array-item>\n":"</" + objectName + ">\n"); -}; - -/** - * Escape the given string chacters that correspond to the five predefined XML entities - * @param sXml the string to escape - */ -Sarissa.escape = function(sXml){ - return sXml.replace(/&/g, "&") - .replace(/</g, "<") - .replace(/>/g, ">") - .replace(/"/g, """) - .replace(/'/g, "'"); -}; - -/** - * Unescape the given string. This turns the occurences of the predefined XML - * entities to become the characters they represent correspond to the five predefined XML entities - * @param sXml the string to unescape - */ -Sarissa.unescape = function(sXml){ - return sXml.replace(/'/g,"'") - .replace(/"/g,"\"") - .replace(/>/g,">") - .replace(/</g,"<") - .replace(/&/g,"&"); -}; -// EOF +/** + * ==================================================================== + * About + * ==================================================================== + * Sarissa is an ECMAScript library acting as a cross-browser wrapper for native XML APIs. + * The library supports Gecko based browsers like Mozilla and Firefox, + * Internet Explorer (5.5+ with MSXML3.0+), Konqueror, Safari and a little of Opera + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net + * ==================================================================== + * Licence + * ==================================================================== + * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, + * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher + * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and + * <a href="http://www.apache.org">http://www.apache.org</a>. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +/** + * Sarissa is a utility class. Provides "static" methods for DOMDocument, + * DOM Node serialization to XML strings and other utility goodies. + * @constructor + */ +function Sarissa(){}; +Sarissa.VERSION = "${project.version}"; +Sarissa.PARSED_OK = "Document contains no parsing errors"; +Sarissa.PARSED_EMPTY = "Document is empty"; +Sarissa.PARSED_UNKNOWN_ERROR = "Not well-formed or other error"; +Sarissa.IS_ENABLED_TRANSFORM_NODE = false; +var _sarissa_iNsCounter = 0; +var _SARISSA_IEPREFIX4XSLPARAM = ""; +var _SARISSA_HAS_DOM_IMPLEMENTATION = document.implementation && true; +var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; +var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; +var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); +var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; +if(!window.Node || !Node.ELEMENT_NODE){ + Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; +}; + +if(typeof XMLDocument == "undefined" && typeof Document !="undefined"){ XMLDocument = Document; } + +// IE initialization +if(_SARISSA_IS_IE){ + // for XSLT parameter names, prefix needed by IE + _SARISSA_IEPREFIX4XSLPARAM = "xsl:"; + // used to store the most recent ProgID available out of the above + var _SARISSA_DOM_PROGID = ""; + var _SARISSA_XMLHTTP_PROGID = ""; + var _SARISSA_DOM_XMLWRITER = ""; + /** + * Called when the Sarissa_xx.js file is parsed, to pick most recent + * ProgIDs for IE, then gets destroyed. + * @private + * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object + * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled + */ + Sarissa.pickRecentProgID = function (idList){ + // found progID flag + var bFound = false; + for(var i=0; i < idList.length && !bFound; i++){ + try{ + var oDoc = new ActiveXObject(idList[i]); + o2Store = idList[i]; + bFound = true; + }catch (objException){ + // trap; try next progID + }; + }; + if (!bFound) { + throw "Could not retreive a valid progID of Class: " + idList[idList.length-1]+". (original exception: "+e+")"; + }; + idList = null; + return o2Store; + }; + // pick best available MSXML progIDs + _SARISSA_DOM_PROGID = null; + _SARISSA_THREADEDDOM_PROGID = null; + _SARISSA_XSLTEMPLATE_PROGID = null; + _SARISSA_XMLHTTP_PROGID = null; + if(!window.XMLHttpRequest){ + /** + * Emulate XMLHttpRequest + * @constructor + */ + XMLHttpRequest = function() { + if(!_SARISSA_XMLHTTP_PROGID){ + _SARISSA_XMLHTTP_PROGID = Sarissa.pickRecentProgID(["Msxml2.XMLHTTP.6.0", "MSXML2.XMLHTTP.3.0", "MSXML2.XMLHTTP", "Microsoft.XMLHTTP"]); + }; + return new ActiveXObject(_SARISSA_XMLHTTP_PROGID); + }; + }; + // we dont need this anymore + //============================================ + // Factory methods (IE) + //============================================ + // see non-IE version + Sarissa.getDomDocument = function(sUri, sName){ + if(!_SARISSA_DOM_PROGID){ + _SARISSA_DOM_PROGID = Sarissa.pickRecentProgID(["Msxml2.DOMDocument.6.0", "Msxml2.DOMDocument.3.0", "MSXML2.DOMDocument", "MSXML.DOMDocument", "Microsoft.XMLDOM"]); + }; + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + // if a root tag name was provided, we need to load it in the DOM object + if (sName){ + // create an artifical namespace prefix + // or reuse existing prefix if applicable + var prefix = ""; + if(sUri){ + if(sName.indexOf(":") > 1){ + prefix = sName.substring(0, sName.indexOf(":")); + sName = sName.substring(sName.indexOf(":")+1); + }else{ + prefix = "a" + (_sarissa_iNsCounter++); + }; + }; + // use namespaces if a namespace URI exists + if(sUri){ + oDoc.loadXML('<' + prefix+':'+sName + " xmlns:" + prefix + "=\"" + sUri + "\"" + " />"); + } else { + oDoc.loadXML('<' + sName + " />"); + }; + }; + return oDoc; + }; + // see non-IE version + Sarissa.getParseErrorText = function (oDoc) { + var parseErrorText = Sarissa.PARSED_OK; + if(oDoc && oDoc.parseError && oDoc.parseError.errorCode && oDoc.parseError.errorCode != 0){ + parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + + "\nLocation: " + oDoc.parseError.url + + "\nLine Number " + oDoc.parseError.line + ", Column " + + oDoc.parseError.linepos + + ":\n" + oDoc.parseError.srcText + + "\n"; + for(var i = 0; i < oDoc.parseError.linepos;i++){ + parseErrorText += "-"; + }; + parseErrorText += "^\n"; + } + else if(oDoc.documentElement == null){ + parseErrorText = Sarissa.PARSED_EMPTY; + }; + return parseErrorText; + }; + // see non-IE version + Sarissa.setXpathNamespaces = function(oDoc, sNsSet) { + oDoc.setProperty("SelectionLanguage", "XPath"); + oDoc.setProperty("SelectionNamespaces", sNsSet); + }; + /** + * Basic implementation of Mozilla's XSLTProcessor for IE. + * Reuses the same XSLT stylesheet for multiple transforms + * @constructor + */ + XSLTProcessor = function(){ + if(!_SARISSA_XSLTEMPLATE_PROGID){ + _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.6.0", "MSXML2.XSLTemplate.3.0"]); + }; + this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID); + this.processor = null; + }; + /** + * Imports the given XSLT DOM and compiles it to a reusable transform + * Note: If the stylesheet was loaded from a URL and contains xsl:import or xsl:include elements,it will be reloaded to resolve those + * @argument xslDoc The XSLT DOMDocument to import + */ + XSLTProcessor.prototype.importStylesheet = function(xslDoc){ + if(!_SARISSA_THREADEDDOM_PROGID){ + _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.6.0", "MSXML2.FreeThreadedDOMDocument.3.0"]); + }; + xslDoc.setProperty("SelectionLanguage", "XPath"); + xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + // convert stylesheet to free threaded + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + // make included/imported stylesheets work if exist and xsl was originally loaded from url + if(xslDoc.url && xslDoc.selectSingleNode("//xsl:*[local-name() = 'import' or local-name() = 'include']") != null){ + converted.async = false; + if (_SARISSA_THREADEDDOM_PROGID == "MSXML2.FreeThreadedDOMDocument.6.0") { + converted.setProperty("AllowDocumentFunction", true); + converted.resolveExternals = true; + } + converted.load(xslDoc.url); + } else { + converted.loadXML(xslDoc.xml); + }; + converted.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); + var output = converted.selectSingleNode("//xsl:output"); + this.outputMethod = output ? output.getAttribute("method") : "html"; + this.template.stylesheet = converted; + this.processor = this.template.createProcessor(); + // for getParameter and clearParameters + this.paramsSet = new Array(); + }; + + /** + * Transform the given XML DOM and return the transformation result as a new DOM document + * @argument sourceDoc The XML DOMDocument to transform + * @return The transformation result as a DOM Document + */ + XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ + // fix for bug 1549749 + if(_SARISSA_THREADEDDOM_PROGID){ + this.processor.input=sourceDoc; + var outDoc=new ActiveXObject(_SARISSA_DOM_PROGID); + this.processor.output=outDoc; + this.processor.transform(); + return outDoc; + } + else{ + if(!_SARISSA_DOM_XMLWRITER){ + _SARISSA_DOM_XMLWRITER = Sarissa.pickRecentProgID(["Msxml2.MXXMLWriter.6.0", "Msxml2.MXXMLWriter.3.0", "MSXML2.MXXMLWriter", "MSXML.MXXMLWriter", "Microsoft.XMLDOM"]); + }; + this.processor.input = sourceDoc; + var outDoc = new ActiveXObject(_SARISSA_DOM_XMLWRITER); + this.processor.output = outDoc; + this.processor.transform(); + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + oDoc.loadXML(outDoc.output+""); + return oDoc; + }; + }; + + /** + * Transform the given XML DOM and return the transformation result as a new DOM fragment. + * Note: The xsl:output method must match the nature of the owner document (XML/HTML). + * @argument sourceDoc The XML DOMDocument to transform + * @argument ownerDoc The owner of the result fragment + * @return The transformation result as a DOM Document + */ + XSLTProcessor.prototype.transformToFragment = function (sourceDoc, ownerDoc) { + this.processor.input = sourceDoc; + this.processor.transform(); + var s = this.processor.output; + var f = ownerDoc.createDocumentFragment(); + if (this.outputMethod == 'text') { + f.appendChild(ownerDoc.createTextNode(s)); + } else if (ownerDoc.body && ownerDoc.body.innerHTML) { + var container = ownerDoc.createElement('div'); + container.innerHTML = s; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + else { + var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID); + if (s.substring(0, 5) == '<?xml') { + s = s.substring(s.indexOf('?>') + 2); + } + var xml = ''.concat('<my>', s, '</my>'); + oDoc.loadXML(xml); + var container = oDoc.documentElement; + while (container.hasChildNodes()) { + f.appendChild(container.firstChild); + } + } + return f; + }; + + /** + * Set global XSLT parameter of the imported stylesheet + * @argument nsURI The parameter namespace URI + * @argument name The parameter base name + * @argument value The new parameter value + */ + XSLTProcessor.prototype.setParameter = function(nsURI, name, value){ + // make value a zero length string if null to allow clearing + value = value ? value : ""; + // nsURI is optional but cannot be null + if(nsURI){ + this.processor.addParameter(name, value, nsURI); + }else{ + this.processor.addParameter(name, value); + }; + // update updated params for getParameter + if(!this.paramsSet[""+nsURI]){ + this.paramsSet[""+nsURI] = new Array(); + }; + this.paramsSet[""+nsURI][name] = value; + }; + /** + * Gets a parameter if previously set by setParameter. Returns null + * otherwise + * @argument name The parameter base name + * @argument value The new parameter value + * @return The parameter value if reviously set by setParameter, null otherwise + */ + XSLTProcessor.prototype.getParameter = function(nsURI, name){ + nsURI = "" + nsURI; + if(this.paramsSet[nsURI] && this.paramsSet[nsURI][name]){ + return this.paramsSet[nsURI][name]; + }else{ + return null; + }; + }; + /** + * Clear parameters (set them to default values as defined in the stylesheet itself) + */ + XSLTProcessor.prototype.clearParameters = function(){ + for(var nsURI in this.paramsSet){ + for(var name in this.paramsSet[nsURI]){ + if(nsURI){ + this.processor.addParameter(name, "", nsURI); + }else{ + this.processor.addParameter(name, ""); + }; + }; + }; + this.paramsSet = new Array(); + }; +}else{ /* end IE initialization, try to deal with real browsers now ;-) */ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ + /** + * Ensures the document was loaded correctly, otherwise sets the + * parseError to -1 to indicate something went wrong. Internal use + * @private + */ + Sarissa.__handleLoad__ = function(oDoc){ + Sarissa.__setReadyState__(oDoc, 4); + }; + /** + * Attached by an event handler to the load event. Internal use. + * @private + */ + _sarissa_XMLDocument_onload = function(){ + Sarissa.__handleLoad__(this); + }; + /** + * Sets the readyState property of the given DOM Document object. + * Internal use. + * @private + * @argument oDoc the DOM Document object to fire the + * readystatechange event + * @argument iReadyState the number to change the readystate property to + */ + Sarissa.__setReadyState__ = function(oDoc, iReadyState){ + oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; + if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") + oDoc.onreadystatechange(); + }; + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + * Emulate IE's onreadystatechange attribute + */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + * Emulates IE's readyState property, which always gives an integer from 0 to 4: + * <ul><li>1 == LOADING,</li> + * <li>2 == LOADED,</li> + * <li>3 == INTERACTIVE,</li> + * <li>4 == COMPLETED</li></ul> + */ + oDoc.readyState = 0; + }; + oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); + return oDoc; + }; + if(window.XMLDocument){ + // do nothing + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(_SARISSA_HAS_DOM_FEATURE && window.Document && !Document.prototype.load && document.implementation.hasFeature('LS', '3.0')){ + //Opera 9 may get the XPath branch which gives creates XMLDocument, therefore it doesn't reach here which is good + /** + * Factory method to obtain a new DOM Document object + * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + return oDoc; + }; + }; + };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) +}; +//========================================== +// Common stuff +//========================================== +if(!window.DOMParser){ + if(_SARISSA_IS_SAFARI){ + /* + * DOMParser is a utility class, used to construct DOMDocuments from XML strings + * @constructor + */ + DOMParser = function() { }; + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(sXml), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && Sarissa.getDomDocument(null, "bar").xml){ + DOMParser = function() { }; + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; + }; +}; + +if((typeof(document.importNode) == "undefined") && _SARISSA_IS_IE){ + try{ + /** + * Implementation of importNode for the context window document in IE. + * If <code>oNode</code> is a TextNode, <code>bChildren</code> is ignored. + * @param oNode the Node to import + * @param bChildren whether to include the children of oNode + * @returns the imported node for further use + */ + document.importNode = function(oNode, bChildren){ + var tmp; + if (oNode.nodeName=='#text') { + return document.createTextElement(oNode.data); + } + else { + if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ + tmp = document.createElement("table"); + } + else if(oNode.nodeName == "td"){ + tmp = document.createElement("tr"); + } + else if(oNode.nodeName == "option"){ + tmp = document.createElement("select"); + } + else{ + tmp = document.createElement("div"); + }; + if(bChildren){ + tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; + }else{ + tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; + }; + return tmp.getElementsByTagName("*")[0]; + }; + + }; + }catch(e){ }; +}; +if(!Sarissa.getParseErrorText){ + /** + * Returns a human readable description of the parsing error. Usefull + * for debugging. Tip: append the returned error string in a <pre> + * element if you want to render it. + * Many thanks to Christian Stocker for the initial patch. + * @argument oDoc The target DOM document + * @returns The parsing error description of the target Document in + * human readable form (preformated text) + */ + Sarissa.getParseErrorText = function (oDoc){ + var parseErrorText = Sarissa.PARSED_OK; + if(!oDoc.documentElement){ + parseErrorText = Sarissa.PARSED_EMPTY; + } else if(oDoc.documentElement.tagName == "parsererror"){ + parseErrorText = oDoc.documentElement.firstChild.data; + parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; + } else if(oDoc.getElementsByTagName("parsererror").length > 0){ + var parsererror = oDoc.getElementsByTagName("parsererror")[0]; + parseErrorText = Sarissa.getText(parsererror, true)+"\n"; + } else if(oDoc.parseError && oDoc.parseError.errorCode != 0){ + parseErrorText = Sarissa.PARSED_UNKNOWN_ERROR; + }; + return parseErrorText; + }; +}; +Sarissa.getText = function(oNode, deep){ + var s = ""; + var nodes = oNode.childNodes; + for(var i=0; i < nodes.length; i++){ + var node = nodes[i]; + var nodeType = node.nodeType; + if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ + s += node.data; + } else if(deep == true + && (nodeType == Node.ELEMENT_NODE + || nodeType == Node.DOCUMENT_NODE + || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ + s += Sarissa.getText(node, true); + }; + }; + return s; +}; +if(!window.XMLSerializer + && Sarissa.getDomDocument + && Sarissa.getDomDocument("","foo", null).xml){ + /** + * Utility class to serialize DOM Node objects to XML strings + * @constructor + */ + XMLSerializer = function(){}; + /** + * Serialize the given DOM Node to an XML string + * @param oNode the DOM Node to serialize + */ + XMLSerializer.prototype.serializeToString = function(oNode) { + return oNode.xml; + }; +}; + +/** + * strips tags from a markup string + */ +Sarissa.stripTags = function (s) { + return s.replace(/<[^>]+>/g,""); +}; +/** + * Deletes all child nodes of the given node + * @argument oNode the Node to empty + */ +Sarissa.clearChildNodes = function(oNode) { + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild) { + oNode.removeChild(oNode.firstChild); + }; +}; +/** + * Copies the childNodes of nodeFrom to nodeTo + * Note: The second object's original content is deleted before + * the copy operation, unless you supply a true third parameter + * @argument nodeFrom the Node to copy the childNodes from + * @argument nodeTo the Node to copy the childNodes to + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false + */ +Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; + if(!bPreserveExisting){ + Sarissa.clearChildNodes(nodeTo); + }; + var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; + var nodes = nodeFrom.childNodes; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + } else { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; + }; +}; + +/** + * Moves the childNodes of nodeFrom to nodeTo + * Note: The second object's original content is deleted before + * the move operation, unless you supply a true third parameter + * @argument nodeFrom the Node to copy the childNodes from + * @argument nodeTo the Node to copy the childNodes to + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ +Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; + if(!bPreserveExisting){ + Sarissa.clearChildNodes(nodeTo); + }; + var nodes = nodeFrom.childNodes; + // if within the same doc, just move, else copy and delete + if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; + } else { + var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; + if(typeof(ownerDoc.importNode) != "undefined") { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; + }; + Sarissa.clearChildNodes(nodeFrom); + }; +}; + +/** + * Serialize any object to an XML string. All properties are serialized using the property name + * as the XML element name. Array elements are rendered as <code>array-item</code> elements, + * using their index/key as the value of the <code>key</code> attribute. + * @argument anyObject the object to serialize + * @argument objectName a name for that object + * @return the XML serializationj of the given object as a string + */ +Sarissa.xmlize = function(anyObject, objectName, indentSpace){ + indentSpace = indentSpace?indentSpace:''; + var s = indentSpace + '<' + objectName + '>'; + var isLeaf = false; + if(!(anyObject instanceof Object) || anyObject instanceof Number || anyObject instanceof String + || anyObject instanceof Boolean || anyObject instanceof Date){ + s += Sarissa.escape(""+anyObject); + isLeaf = true; + }else{ + s += "\n"; + var itemKey = ''; + var isArrayItem = anyObject instanceof Array; + for(var name in anyObject){ + s += Sarissa.xmlize(anyObject[name], (isArrayItem?"array-item key=\""+name+"\"":name), indentSpace + " "); + }; + s += indentSpace; + }; + return s += (objectName.indexOf(' ')!=-1?"</array-item>\n":"</" + objectName + ">\n"); +}; + +/** + * Escape the given string chacters that correspond to the five predefined XML entities + * @param sXml the string to escape + */ +Sarissa.escape = function(sXml){ + return sXml.replace(/&/g, "&") + .replace(/</g, "<") + .replace(/>/g, ">") + .replace(/"/g, """) + .replace(/'/g, "'"); +}; + +/** + * Unescape the given string. This turns the occurences of the predefined XML + * entities to become the characters they represent correspond to the five predefined XML entities + * @param sXml the string to unescape + */ +Sarissa.unescape = function(sXml){ + return sXml.replace(/'/g,"'") + .replace(/"/g,"\"") + .replace(/>/g,">") + .replace(/</g,"<") + .replace(/&/g,"&"); +}; +// EOF Modified: trunk/framework/src/main/javascript/ajaxjsf/sarissa_dhtml.js =================================================================== --- trunk/framework/src/main/javascript/ajaxjsf/sarissa_dhtml.js 2007-05-16 13:14:42 UTC (rev 199) +++ trunk/framework/src/main/javascript/ajaxjsf/sarissa_dhtml.js 2007-05-16 23:22:21 UTC (rev 200) @@ -1,127 +1,127 @@ -/** - * ==================================================================== - * About - * ==================================================================== - * Sarissa cross browser XML library - AJAX module - * @version 0.9.7.6 - * @author: Copyright Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * - * This module contains some convinient AJAX tricks based on Sarissa - * - * ==================================================================== - * Licence - * ==================================================================== - * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, - * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher - * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If - * you make modifications under the ASL, i would appreciate it if you submitted those. - * In case your copy of Sarissa does not include the license texts, you may find - * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and - * <a href="http://www.apache.org">http://www.apache.org</a>. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -/** @private */ -Sarissa.updateCursor = function(oTargetElement, sValue) { - if(oTargetElement && oTargetElement.style && oTargetElement.style.cursor != undefined ){ - oTargetElement.style.cursor = sValue; - }; -}; - -/** - * Update an element with response of a GET request on the given URL. Passing a configured XSLT - * processor will result in transforming and updating oNode before using it to update oTargetElement. - * You can also pass a callback function to be executed when the update is finished. The function will be called as - * <code>functionName(oNode, oTargetElement);</code> - * @addon - * @param sFromUrl the URL to make the request to - * @param oTargetElement the element to update - * @param xsltproc (optional) the transformer to use on the returned - * content before updating the target element with it - * @param callback (optional) a Function object to execute once the update is finished successfuly, called as <code>callback(oNode, oTargetElement)</code> - * @param skipCache (optional) whether to skip any cache - */ -Sarissa.updateContentFromURI = function(sFromUrl, oTargetElement, xsltproc, callback, skipCache) { - try{ - Sarissa.updateCursor(oTargetElement, "wait"); - var xmlhttp = new XMLHttpRequest(); - xmlhttp.open("GET", sFromUrl); - function sarissa_dhtml_loadHandler() { - if (xmlhttp.readyState == 4) { - Sarissa.updateContentFromNode(xmlhttp.responseXML, oTargetElement, xsltproc, callback); - }; - }; - xmlhttp.onreadystatechange = sarissa_dhtml_loadHandler; - if (skipCache) { - var oldage = "Sat, 1 Jan 2000 00:00:00 GMT"; - xmlhttp.setRequestHeader("If-Modified-Since", oldage); - }; - xmlhttp.send(""); - } - catch(e){ - Sarissa.updateCursor(oTargetElement, "auto"); - throw e; - }; -}; - -/** - * Update an element's content with the given DOM node. Passing a configured XSLT - * processor will result in transforming and updating oNode before using it to update oTargetElement. - * You can also pass a callback function to be executed when the update is finished. The function will be called as - * <code>functionName(oNode, oTargetElement);</code> - * @addon - * @param oNode the URL to make the request to - * @param oTargetElement the element to update - * @param xsltproc (optional) the transformer to use on the given - * DOM node before updating the target element with it - * @param callback (optional) a Function object to execute once the update is finished successfuly, called as <code>callback(oNode, oTargetElement)</code> - */ -Sarissa.updateContentFromNode = function(oNode, oTargetElement, xsltproc, callback) { - try { - Sarissa.updateCursor(oTargetElement, "wait"); - Sarissa.clearChildNodes(oTargetElement); - // check for parsing errors - var ownerDoc = oNode.nodeType == Node.DOCUMENT_NODE?oNode:oNode.ownerDocument; - if(ownerDoc.parseError && ownerDoc.parseError != 0) { - var pre = document.createElement("pre"); - pre.appendChild(document.createTextNode(Sarissa.getParseErrorText(ownerDoc))); - oTargetElement.appendChild(pre); - } - else { - // transform if appropriate - if(xsltproc) { - oNode = xsltproc.transformToDocument(oNode); - }; - // be smart, maybe the user wants to display the source instead - if(oTargetElement.tagName.toLowerCase() == "textarea" || oTargetElement.tagName.toLowerCase() == "input") { - oTargetElement.value = new XMLSerializer().serializeToString(oNode); - } - else { - // ok that was not smart; it was paranoid. Keep up the good work by trying to use DOM instead of innerHTML - if(oNode.nodeType == Node.DOCUMENT_NODE || oNode.ownerDocument.documentElement == oNode) { - oTargetElement.innerHTML = new XMLSerializer().serializeToString(oNode); - } - else{ - oTargetElement.appendChild(oTargetElement.ownerDocument.importNode(oNode, true)); - }; - }; - }; - if (callback) { - callback(oNode, oTargetElement); - }; - } - catch(e) { - throw e; - } - finally{ - Sarissa.updateCursor(oTargetElement, "auto"); - }; -}; - +/** + * ==================================================================== + * About + * ==================================================================== + * Sarissa cross browser XML library - AJAX module + * @version ${project.version} + * @author: Copyright Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net + * + * This module contains some convenient AJAX tricks based on Sarissa + * + * ==================================================================== + * Licence + * ==================================================================== + * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, + * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher + * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and + * <a href="http://www.apache.org">http://www.apache.org</a>. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +/** @private */ +Sarissa.updateCursor = function(oTargetElement, sValue) { + if(oTargetElement && oTargetElement.style && oTargetElement.style.cursor != undefined ){ + oTargetElement.style.cursor = sValue; + }; +}; + +/** + * Asynchronously update an element with response of a GET request on the given URL. Passing a configured XSLT + * processor will result in transforming and updating oNode before using it to update oTargetElement. + * You can also pass a callback function to be executed when the update is finished. The function will be called as + * <code>functionName(oNode, oTargetElement);</code> + * @addon + * @param sFromUrl the URL to make the request to + * @param oTargetElement the element to update + * @param xsltproc (optional) the transformer to use on the returned + * content before updating the target element with it + * @param callback (optional) a Function object to execute once the update is finished successfuly, called as <code>callback(oNode, oTargetElement)</code> + * @param skipCache (optional) whether to skip any cache + */ +Sarissa.updateContentFromURI = function(sFromUrl, oTargetElement, xsltproc, callback, skipCache) { + try{ + Sarissa.updateCursor(oTargetElement, "wait"); + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", sFromUrl, true); + function sarissa_dhtml_loadHandler() { + if (xmlhttp.readyState == 4) { + Sarissa.updateContentFromNode(xmlhttp.responseXML, oTargetElement, xsltproc, callback); + }; + }; + xmlhttp.onreadystatechange = sarissa_dhtml_loadHandler; + if (skipCache) { + var oldage = "Sat, 1 Jan 2000 00:00:00 GMT"; + xmlhttp.setRequestHeader("If-Modified-Since", oldage); + }; + xmlhttp.send(""); + } + catch(e){ + Sarissa.updateCursor(oTargetElement, "auto"); + throw e; + }; +}; + +/** + * Update an element's content with the given DOM node. Passing a configured XSLT + * processor will result in transforming and updating oNode before using it to update oTargetElement. + * You can also pass a callback function to be executed when the update is finished. The function will be called as + * <code>functionName(oNode, oTargetElement);</code> + * @addon + * @param oNode the URL to make the request to + * @param oTargetElement the element to update + * @param xsltproc (optional) the transformer to use on the given + * DOM node before updating the target element with it + * @param callback (optional) a Function object to execute once the update is finished successfuly, called as <code>callback(oNode, oTargetElement)</code> + */ +Sarissa.updateContentFromNode = function(oNode, oTargetElement, xsltproc, callback) { + try { + Sarissa.updateCursor(oTargetElement, "wait"); + Sarissa.clearChildNodes(oTargetElement); + // check for parsing errors + var ownerDoc = oNode.nodeType == Node.DOCUMENT_NODE?oNode:oNode.ownerDocument; + if(ownerDoc.parseError && ownerDoc.parseError != 0) { + var pre = document.createElement("pre"); + pre.appendChild(document.createTextNode(Sarissa.getParseErrorText(ownerDoc))); + oTargetElement.appendChild(pre); + } + else { + // transform if appropriate + if(xsltproc) { + oNode = xsltproc.transformToDocument(oNode); + }; + // be smart, maybe the user wants to display the source instead + if(oTargetElement.tagName.toLowerCase() == "textarea" || oTargetElement.tagName.toLowerCase() == "input") { + oTargetElement.value = new XMLSerializer().serializeToString(oNode); + } + else { + // ok that was not smart; it was paranoid. Keep up the good work by trying to use DOM instead of innerHTML + if(oNode.nodeType == Node.DOCUMENT_NODE || oNode.ownerDocument.documentElement == oNode) { + oTargetElement.innerHTML = new XMLSerializer().serializeToString(oNode); + } + else{ + oTargetElement.appendChild(oTargetElement.ownerDocument.importNode(oNode, true)); + }; + }; + }; + if (callback) { + callback(oNode, oTargetElement); + }; + } + catch(e) { + throw e; + } + finally{ + Sarissa.updateCursor(oTargetElement, "auto"); + }; +}; + Modified: trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_load.js =================================================================== --- trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_load.js 2007-05-16 13:14:42 UTC (rev 199) +++ trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_load.js 2007-05-16 23:22:21 UTC (rev 200) @@ -1,236 +1,236 @@ -/** - * ==================================================================== - * About - * ==================================================================== - * Sarissa cross browser XML library - IE .load eulation (deprecated) - * @version 0.9.7.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * - * This script emulates Internet Explorer's .load method of DOM Document objects. - * - * All functionality in this file is DEPRECATED, XMLHttpRequest objects - * should be used to load XML documents instead - * - * @version 0.9.7.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * ==================================================================== - * Licence - * ==================================================================== - * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, - * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher - * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If - * you make modifications under the ASL, i would appreciate it if you submitted those. - * In case your copy of Sarissa does not include the license texts, you may find - * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and - * <a href="http://www.apache.org">http://www.apache.org</a>. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -if(!_SARISSA_IS_IE){ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ - /** - * Ensures the document was loaded correctly, otherwise sets the - * parseError to -1 to indicate something went wrong. Internal use - * @private - */ - Sarissa.__handleLoad__ = function(oDoc){ - Sarissa.__setReadyState__(oDoc, 4); - }; - function SarissaParseError() { - this.errorCode = 0; - }; - /** - * Attached by an event handler to the load event. Internal use. - * @private - */ - _sarissa_XMLDocument_onload = function(){ - Sarissa.__handleLoad__(this); - }; - /** - * Sets the readyState property of the given DOM Document object. - * Internal use. - * @private - * @argument oDoc the DOM Document object to fire the - * readystatechange event - * @argument iReadyState the number to change the readystate property to - */ - Sarissa.__setReadyState__ = function(oDoc, iReadyState){ - oDoc.readyState = iReadyState; - oDoc.readystate = iReadyState; - if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") - oDoc.onreadystatechange(); - }; - Sarissa.getDomDocument = function(sUri, sName){ - - var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); - if(!oDoc.onreadystatechange){ - - /** - * Emulate IE's onreadystatechange attribute - */ - oDoc.onreadystatechange = null; - }; - if(!oDoc.readyState){ - /** - * Emulates IE's readyState property, which always gives an integer from 0 to 4: - * <ul><li>1 == LOADING,</li> - * <li>2 == LOADED,</li> - * <li>3 == INTERACTIVE,</li> - * <li>4 == COMPLETED</li></ul> - */ - oDoc.readyState = 0; - }; - if(!oDoc.parseError){ - oDoc.parseError = new SarissaParseError(); - }; - oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); - return oDoc; - }; - if(window.XMLDocument){ - /** - * Keeps a handle to the original load() method. Internal use and only - * if Mozilla version is lower than 1.4 - * @private - */ - XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; - // NOTE: setting async to false will only work with documents - // called over HTTP (meaning a server), not the local file system, - // unless you are using Moz 1.4+. - - /** - * This is deprecated, use XMLHttpRequest to load remote documents instead. - * Overrides the original load method to provide synchronous loading for - * Mozilla versions prior to 1.4 and fix ready state stuff. - * @deprecated - * @returns the DOM Object as it was before the load() call (may be empty) - */ - XMLDocument.prototype.load = function(sURI) { - var oDoc = Sarissa.getDomDocument(); - Sarissa.copyChildNodes(this, oDoc); - this.parseError.errorCode = 0; - Sarissa.__setReadyState__(this, 1); - try { - if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sURI, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, this); - Sarissa.__setReadyState__(this, 3); - }else{ - this._sarissa_load(sURI); - }; - } - catch (objException) { - oDoc.parseError.errorCode = -1; - } - finally { - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror"){ - oDoc.parseError.errorCode = -1; - }; - if(this.async == false){ - Sarissa.__handleLoad__(this); - }; - }; - return oDoc; - }; - //if(window.XMLDocument) , now mainly for opera - }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS - else if(document.implementation && document.implementation.hasFeature && document.implementation.hasFeature('LS', '3.0')){ - Document.prototype.async = true; - Document.prototype.onreadystatechange = null; - Document.prototype.load = function(sURI) { - var oldDoc = Sarissa.getDomDocument(); - Sarissa.copyChildNodes(this, oldDoc, false); - var parser = document.implementation.createLSParser(this.async ? document.implementation.MODE_ASYNCHRONOUS : document.implementation.MODE_SYNCHRONOUS, null); - if(this.async){ - var self = this; - parser.addEventListener("load", - function(e) { - self.readyState = 4; - Sarissa.copyChildNodes(e.newDocument, self, false); - self.onreadystatechange.call(); - }, - false); - }; - try { - var oDoc = parser.parseURI(sURI); - if(!this.async) { - Sarissa.copyChildNodes(oDoc, this, false); - }; - } - catch(e){ - this.parseError.errorCode = -1; - }; - return oldDoc; - }; - /** - * Factory method to obtain a new DOM Document object - * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ - Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); - if(!oDoc.parseError){ - oDoc.parseError = {errorCode:0}; - }; - return oDoc; - }; - } - else { - Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); - // looks like safari does not create the root element for some unknown reason - if(oDoc && (sUri || sName) && !oDoc.documentElement){ - oDoc.appendChild(oDoc.createElementNS(sUri, sName)); - }; - // attachb to the new object as we have no prototype to use, this is for safari - if(!oDoc.load) { - oDoc.load = function(sUrl) { - var oldDoc = document.implementation.createDocument(); - Sarissa.copyChildNodes(this, oldDoc); - this.parseError = {errorCode : 0}; - Sarissa.__setReadyState__(this, 1); - if(this.async == false) { - var tmp = new XMLHttpRequest(); - tmp.open("GET", sUrl, false); - tmp.send(null); - Sarissa.__setReadyState__(this, 2); - Sarissa.copyChildNodes(tmp.responseXML, oDoc); - if(!oDoc.documentElement || oDoc.getElementsByTagName("parsererror").length >0){ - oDoc.parseError.errorCode = -1; - }; - Sarissa.__setReadyState__(this, 3); - Sarissa.__setReadyState__(this, 4); - } - else { - var xmlhttp = new XMLHttpRequest(); - xmlhttp.open('GET', sUrl, true); - xmlhttp.onreadystatechange = function(){ - if (xmlhttp.readyState == 4) { - Sarissa.copyChildNodes(xmlhttp.responseXML, oDoc); - if(!oDoc.documentElement || oDoc.getElementsByTagName("parsererror").length > 0){ - oDoc.parseError.errorCode = -1; - }; - }; - Sarissa.__setReadyState__(oDoc, xmlhttp.readyState); - }; - xmlhttp.send(null); - }; - return oldDoc; - }; - }; - return oDoc; - }; - }; - };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) -}; -// EOF +/** + * ==================================================================== + * About + * ==================================================================== + * Sarissa cross browser XML library - IE .load eulation (deprecated) + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net + * + * This script emulates Internet Explorer's .load method of DOM Document objects. + * + * All functionality in this file is DEPRECATED, XMLHttpRequest objects + * should be used to load XML documents instead + * + * @version @sarissa.version@ + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net + * ==================================================================== + * Licence + * ==================================================================== + * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, + * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher + * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and + * <a href="http://www.apache.org">http://www.apache.org</a>. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +if(!_SARISSA_IS_IE){ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ + /** + * Ensures the document was loaded correctly, otherwise sets the + * parseError to -1 to indicate something went wrong. Internal use + * @private + */ + Sarissa.__handleLoad__ = function(oDoc){ + Sarissa.__setReadyState__(oDoc, 4); + }; + function SarissaParseError() { + this.errorCode = 0; + }; + /** + * Attached by an event handler to the load event. Internal use. + * @private + */ + _sarissa_XMLDocument_onload = function(){ + Sarissa.__handleLoad__(this); + }; + /** + * Sets the readyState property of the given DOM Document object. + * Internal use. + * @private + * @argument oDoc the DOM Document object to fire the + * readystatechange event + * @argument iReadyState the number to change the readystate property to + */ + Sarissa.__setReadyState__ = function(oDoc, iReadyState){ + oDoc.readyState = iReadyState; + oDoc.readystate = iReadyState; + if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") + oDoc.onreadystatechange(); + }; + Sarissa.getDomDocument = function(sUri, sName){ + + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.onreadystatechange){ + + /** + * Emulate IE's onreadystatechange attribute + */ + oDoc.onreadystatechange = null; + }; + if(!oDoc.readyState){ + /** + * Emulates IE's readyState property, which always gives an integer from 0 to 4: + * <ul><li>1 == LOADING,</li> + * <li>2 == LOADED,</li> + * <li>3 == INTERACTIVE,</li> + * <li>4 == COMPLETED</li></ul> + */ + oDoc.readyState = 0; + }; + if(!oDoc.parseError){ + oDoc.parseError = new SarissaParseError(); + }; + oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); + return oDoc; + }; + if(window.XMLDocument){ + /** + * Keeps a handle to the original load() method. Internal use and only + * if Mozilla version is lower than 1.4 + * @private + */ + XMLDocument.prototype._sarissa_load = XMLDocument.prototype.load; + // NOTE: setting async to false will only work with documents + // called over HTTP (meaning a server), not the local file system, + // unless you are using Moz 1.4+. + + /** + * This is deprecated, use XMLHttpRequest to load remote documents instead. + * Overrides the original load method to provide synchronous loading for + * Mozilla versions prior to 1.4 and fix ready state stuff. + * @deprecated + * @returns the DOM Object as it was before the load() call (may be empty) + */ + XMLDocument.prototype.load = function(sURI) { + var oDoc = Sarissa.getDomDocument(); + Sarissa.copyChildNodes(this, oDoc); + this.parseError.errorCode = 0; + Sarissa.__setReadyState__(this, 1); + try { + if(this.async == false && _SARISSA_SYNC_NON_IMPLEMENTED) { + var tmp = new XMLHttpRequest(); + tmp.open("GET", sURI, false); + tmp.send(null); + Sarissa.__setReadyState__(this, 2); + Sarissa.copyChildNodes(tmp.responseXML, this); + Sarissa.__setReadyState__(this, 3); + }else{ + this._sarissa_load(sURI); + }; + } + catch (objException) { + oDoc.parseError.errorCode = -1; + } + finally { + if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror"){ + oDoc.parseError.errorCode = -1; + }; + if(this.async == false){ + Sarissa.__handleLoad__(this); + }; + }; + return oDoc; + }; + //if(window.XMLDocument) , now mainly for opera + }// TODO: check if the new document has content before trying to copynodes, check for error handling in DOM 3 LS + else if(document.implementation && document.implementation.hasFeature && document.implementation.hasFeature('LS', '3.0')){ + Document.prototype.async = true; + Document.prototype.onreadystatechange = null; + Document.prototype.load = function(sURI) { + var oldDoc = Sarissa.getDomDocument(); + Sarissa.copyChildNodes(this, oldDoc, false); + var parser = document.implementation.createLSParser(this.async ? document.implementation.MODE_ASYNCHRONOUS : document.implementation.MODE_SYNCHRONOUS, null); + if(this.async){ + var self = this; + parser.addEventListener("load", + function(e) { + self.readyState = 4; + Sarissa.copyChildNodes(e.newDocument, self, false); + self.onreadystatechange.call(); + }, + false); + }; + try { + var oDoc = parser.parseURI(sURI); + if(!this.async) { + Sarissa.copyChildNodes(oDoc, this, false); + }; + } + catch(e){ + this.parseError.errorCode = -1; + }; + return oldDoc; + }; + /** + * Factory method to obtain a new DOM Document object + * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + if(!oDoc.parseError){ + oDoc.parseError = {errorCode:0}; + }; + return oDoc; + }; + } + else { + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:null, sName?sName:null, null); + // looks like safari does not create the root element for some unknown reason + if(oDoc && (sUri || sName) && !oDoc.documentElement){ + oDoc.appendChild(oDoc.createElementNS(sUri, sName)); + }; + // attachb to the new object as we have no prototype to use, this is for safari + if(!oDoc.load) { + oDoc.load = function(sUrl) { + var oldDoc = document.implementation.createDocument(); + Sarissa.copyChildNodes(this, oldDoc); + this.parseError = {errorCode : 0}; + Sarissa.__setReadyState__(this, 1); + if(this.async == false) { + var tmp = new XMLHttpRequest(); + tmp.open("GET", sUrl, false); + tmp.send(null); + Sarissa.__setReadyState__(this, 2); + Sarissa.copyChildNodes(tmp.responseXML, oDoc); + if(!oDoc.documentElement || oDoc.getElementsByTagName("parsererror").length >0){ + oDoc.parseError.errorCode = -1; + }; + Sarissa.__setReadyState__(this, 3); + Sarissa.__setReadyState__(this, 4); + } + else { + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open('GET', sUrl, true); + xmlhttp.onreadystatechange = function(){ + if (xmlhttp.readyState == 4) { + Sarissa.copyChildNodes(xmlhttp.responseXML, oDoc); + if(!oDoc.documentElement || oDoc.getElementsByTagName("parsererror").length > 0){ + oDoc.parseError.errorCode = -1; + }; + }; + Sarissa.__setReadyState__(oDoc, xmlhttp.readyState); + }; + xmlhttp.send(null); + }; + return oldDoc; + }; + }; + return oDoc; + }; + }; + };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) +}; +// EOF Modified: trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xpath.js =================================================================== --- trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xpath.js 2007-05-16 13:14:42 UTC (rev 199) +++ trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xpath.js 2007-05-16 23:22:21 UTC (rev 200) @@ -1,200 +1,200 @@ -/** - * ==================================================================== - * About - * ==================================================================== - * Sarissa cross browser XML library - IE XPath Emulation - * @version 0.9.7.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * - * This script emulates Internet Explorer's selectNodes and selectSingleNode - * for Mozilla. Associating namespace prefixes with URIs for your XPath queries - * is easy with IE's setProperty. - * USers may also map a namespace prefix to a default (unprefixed) namespace in the - * source document with Sarissa.setXpathNamespaces - * - * - * ==================================================================== - * Licence - * ==================================================================== - * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, - * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher - * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If - * you make modifications under the ASL, i would appreciate it if you submitted those. - * In case your copy of Sarissa does not include the license texts, you may find - * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and - * <a href="http://www.apache.org">http://www.apache.org</a>. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -if(_SARISSA_HAS_DOM_FEATURE && document.implementation.hasFeature("XPath", "3.0")){ - /** - * SarissaNodeList behaves as a NodeList but is only used as a result to <code>selectNodes</code>, - * so it also has some properties IEs proprietery object features. - * @private - * @constructor - * @argument i the (initial) list size - */ - function SarissaNodeList(i){ - this.length = i; - }; - /** Set an Array as the prototype object */ - SarissaNodeList.prototype = new Array(0); - /** Inherit the Array constructor */ - SarissaNodeList.prototype.constructor = Array; - /** - * Returns the node at the specified index or null if the given index - * is greater than the list size or less than zero - * Note that in ECMAScript you can also use the square-bracket - * array notation instead of calling <code>item</code> - * @argument i the index of the member to return - * @returns the member corresponding to the given index - */ - SarissaNodeList.prototype.item = function(i) { - return (i < 0 || i >= this.length)?null:this[i]; - }; - /** - * Emulate IE's expr property - * (Here the SarissaNodeList object is given as the result of selectNodes). - * @returns the XPath expression passed to selectNodes that resulted in - * this SarissaNodeList - */ - SarissaNodeList.prototype.expr = ""; - /** dummy, used to accept IE's stuff without throwing errors */ - if(window.XMLDocument && (!XMLDocument.prototype.setProperty)){ - XMLDocument.prototype.setProperty = function(x,y){}; - }; - /** - * Programmatically control namespace URI/prefix mappings for XPath - * queries. - * This method comes especially handy when used to apply XPath queries - * on XML documents with a default namespace, as there is no other way - * of mapping that to a prefix. - * Using no namespace prefix in DOM Level 3 XPath queries, implies you - * are looking for elements in the null namespace. If you need to look - * for nodes in the default namespace, you need to map a prefix to it - * first like: - * <pre>Sarissa.setXpathNamespaces(oDoc, "xmlns:myprefix=&aposhttp://mynsURI&apos");</pre> - * Note 1 : Use this method only if the source document features - * a default namespace (without a prefix), otherwise just use IE's setProperty - * (moz will rezolve non-default namespaces by itself). You will need to map that - * namespace to a prefix for queries to work. - * Note 2 : This method calls IE's setProperty method to set the - * appropriate namespace-prefix mappings, so you dont have to do that. - * @param oDoc The target XMLDocument to set the namespace mappings for. - * @param sNsSet A whilespace-seperated list of namespace declarations as - * those would appear in an XML document. E.g.: - * <code>"xmlns:xhtml='http://www.w3.org/1999/xhtml' - * xmlns:'http://www.w3.org/1999/XSL/Transform'"</code> - * @throws An error if the format of the given namespace declarations is bad. - */ - Sarissa.setXpathNamespaces = function(oDoc, sNsSet) { - //oDoc._sarissa_setXpathNamespaces(sNsSet); - oDoc._sarissa_useCustomResolver = true; - var namespaces = sNsSet.indexOf(" ")>-1?sNsSet.split(" "):new Array(sNsSet); - oDoc._sarissa_xpathNamespaces = new Array(namespaces.length); - for(var i=0;i < namespaces.length;i++){ - var ns = namespaces[i]; - var colonPos = ns.indexOf(":"); - var assignPos = ns.indexOf("="); - if(colonPos > 0 && assignPos > colonPos+1){ - var prefix = ns.substring(colonPos+1, assignPos); - var uri = ns.substring(assignPos+2, ns.length-1); - oDoc._sarissa_xpathNamespaces[prefix] = uri; - }else{ - throw "Bad format on namespace declaration(s) given"; - }; - }; - }; - /** - * @private Flag to control whether a custom namespace resolver should - * be used, set to true by Sarissa.setXpathNamespaces - */ - XMLDocument.prototype._sarissa_useCustomResolver = false; - /** @private */ - XMLDocument.prototype._sarissa_xpathNamespaces = new Array(); - /** - * Extends the XMLDocument to emulate IE's selectNodes. - * @argument sExpr the XPath expression to use - * @argument contextNode this is for internal use only by the same - * method when called on Elements - * @returns the result of the XPath search as a SarissaNodeList - * @throws An error if no namespace URI is found for the given prefix. - */ - XMLDocument.prototype.selectNodes = function(sExpr, contextNode, returnSingle){ - var nsDoc = this; - var nsresolver = this._sarissa_useCustomResolver - ? function(prefix){ - var s = nsDoc._sarissa_xpathNamespaces[prefix]; - if(s)return s; - else throw "No namespace URI found for prefix: '" + prefix+"'"; - } - : this.createNSResolver(this.documentElement); - var result = null; - if(!returnSingle){ - var oResult = this.evaluate(sExpr, - (contextNode?contextNode:this), - nsresolver, - XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); - var nodeList = new SarissaNodeList(oResult.snapshotLength); - nodeList.expr = sExpr; - for(var i=0;i<nodeList.length;i++) - nodeList[i] = oResult.snapshotItem(i); - result = nodeList; - } - else { - result = oResult = this.evaluate(sExpr, - (contextNode?contextNode:this), - nsresolver, - XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue; - }; - return result; - }; - /** - * Extends the Element to emulate IE's selectNodes - * @argument sExpr the XPath expression to use - * @returns the result of the XPath search as an (Sarissa)NodeList - * @throws An - * error if invoked on an HTML Element as this is only be - * available to XML Elements. - */ - Element.prototype.selectNodes = function(sExpr){ - var doc = this.ownerDocument; - if(doc.selectNodes) - return doc.selectNodes(sExpr, this); - else - throw "Method selectNodes is only supported by XML Elements"; - }; - /** - * Extends the XMLDocument to emulate IE's selectSingleNode. - * @argument sExpr the XPath expression to use - * @argument contextNode this is for internal use only by the same - * method when called on Elements - * @returns the result of the XPath search as an (Sarissa)NodeList - */ - XMLDocument.prototype.selectSingleNode = function(sExpr, contextNode){ - var ctx = contextNode?contextNode:null; - return this.selectNodes(sExpr, ctx, true); - }; - /** - * Extends the Element to emulate IE's selectSingleNode. - * @argument sExpr the XPath expression to use - * @returns the result of the XPath search as an (Sarissa)NodeList - * @throws An error if invoked on an HTML Element as this is only be - * available to XML Elements. - */ - Element.prototype.selectSingleNode = function(sExpr){ - var doc = this.ownerDocument; - if(doc.selectSingleNode) - return doc.selectSingleNode(sExpr, this); - else - throw "Method selectNodes is only supported by XML Elements"; - }; - Sarissa.IS_ENABLED_SELECT_NODES = true; -}; +/** + * ==================================================================== + * About + * ==================================================================== + * Sarissa cross browser XML library - IE XPath Emulation + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net + * + * This script emulates Internet Explorer's selectNodes and selectSingleNode + * for Mozilla. Associating namespace prefixes with URIs for your XPath queries + * is easy with IE's setProperty. + * USers may also map a namespace prefix to a default (unprefixed) namespace in the + * source document with Sarissa.setXpathNamespaces + * + * + * ==================================================================== + * Licence + * ==================================================================== + * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, + * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher + * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and + * <a href="http://www.apache.org">http://www.apache.org</a>. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +if(_SARISSA_HAS_DOM_FEATURE && document.implementation.hasFeature("XPath", "3.0")){ + /** + * SarissaNodeList behaves as a NodeList but is only used as a result to <code>selectNodes</code>, + * so it also has some properties IEs proprietery object features. + * @private + * @constructor + * @argument i the (initial) list size + */ + function SarissaNodeList(i){ + this.length = i; + }; + /** Set an Array as the prototype object */ + SarissaNodeList.prototype = new Array(0); + /** Inherit the Array constructor */ + SarissaNodeList.prototype.constructor = Array; + /** + * Returns the node at the specified index or null if the given index + * is greater than the list size or less than zero + * Note that in ECMAScript you can also use the square-bracket + * array notation instead of calling <code>item</code> + * @argument i the index of the member to return + * @returns the member corresponding to the given index + */ + SarissaNodeList.prototype.item = function(i) { + return (i < 0 || i >= this.length)?null:this[i]; + }; + /** + * Emulate IE's expr property + * (Here the SarissaNodeList object is given as the result of selectNodes). + * @returns the XPath expression passed to selectNodes that resulted in + * this SarissaNodeList + */ + SarissaNodeList.prototype.expr = ""; + /** dummy, used to accept IE's stuff without throwing errors */ + if(window.XMLDocument && (!XMLDocument.prototype.setProperty)){ + XMLDocument.prototype.setProperty = function(x,y){}; + }; + /** + * Programmatically control namespace URI/prefix mappings for XPath + * queries. + * This method comes especially handy when used to apply XPath queries + * on XML documents with a default namespace, as there is no other way + * of mapping that to a prefix. + * Using no namespace prefix in DOM Level 3 XPath queries, implies you + * are looking for elements in the null namespace. If you need to look + * for nodes in the default namespace, you need to map a prefix to it + * first like: + * <pre>Sarissa.setXpathNamespaces(oDoc, "xmlns:myprefix=&aposhttp://mynsURI&apos");</pre> + * Note 1 : Use this method only if the source document features + * a default namespace (without a prefix), otherwise just use IE's setProperty + * (moz will rezolve non-default namespaces by itself). You will need to map that + * namespace to a prefix for queries to work. + * Note 2 : This method calls IE's setProperty method to set the + * appropriate namespace-prefix mappings, so you dont have to do that. + * @param oDoc The target XMLDocument to set the namespace mappings for. + * @param sNsSet A whilespace-seperated list of namespace declarations as + * those would appear in an XML document. E.g.: + * <code>"xmlns:xhtml='http://www.w3.org/1999/xhtml' + * xmlns:'http://www.w3.org/1999/XSL/Transform'"</code> + * @throws An error if the format of the given namespace declarations is bad. + */ + Sarissa.setXpathNamespaces = function(oDoc, sNsSet) { + //oDoc._sarissa_setXpathNamespaces(sNsSet); + oDoc._sarissa_useCustomResolver = true; + var namespaces = sNsSet.indexOf(" ")>-1?sNsSet.split(" "):new Array(sNsSet); + oDoc._sarissa_xpathNamespaces = new Array(namespaces.length); + for(var i=0;i < namespaces.length;i++){ + var ns = namespaces[i]; + var colonPos = ns.indexOf(":"); + var assignPos = ns.indexOf("="); + if(colonPos > 0 && assignPos > colonPos+1){ + var prefix = ns.substring(colonPos+1, assignPos); + var uri = ns.substring(assignPos+2, ns.length-1); + oDoc._sarissa_xpathNamespaces[prefix] = uri; + }else{ + throw "Bad format on namespace declaration(s) given"; + }; + }; + }; + /** + * @private Flag to control whether a custom namespace resolver should + * be used, set to true by Sarissa.setXpathNamespaces + */ + XMLDocument.prototype._sarissa_useCustomResolver = false; + /** @private */ + XMLDocument.prototype._sarissa_xpathNamespaces = new Array(); + /** + * Extends the XMLDocument to emulate IE's selectNodes. + * @argument sExpr the XPath expression to use + * @argument contextNode this is for internal use only by the same + * method when called on Elements + * @returns the result of the XPath search as a SarissaNodeList + * @throws An error if no namespace URI is found for the given prefix. + */ + XMLDocument.prototype.selectNodes = function(sExpr, contextNode, returnSingle){ + var nsDoc = this; + var nsresolver = this._sarissa_useCustomResolver + ? function(prefix){ + var s = nsDoc._sarissa_xpathNamespaces[prefix]; + if(s)return s; + else throw "No namespace URI found for prefix: '" + prefix+"'"; + } + : this.createNSResolver(this.documentElement); + var result = null; + if(!returnSingle){ + var oResult = this.evaluate(sExpr, + (contextNode?contextNode:this), + nsresolver, + XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); + var nodeList = new SarissaNodeList(oResult.snapshotLength); + nodeList.expr = sExpr; + for(var i=0;i<nodeList.length;i++) + nodeList[i] = oResult.snapshotItem(i); + result = nodeList; + } + else { + result = oResult = this.evaluate(sExpr, + (contextNode?contextNode:this), + nsresolver, + XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue; + }; + return result; + }; + /** + * Extends the Element to emulate IE's selectNodes + * @argument sExpr the XPath expression to use + * @returns the result of the XPath search as an (Sarissa)NodeList + * @throws An + * error if invoked on an HTML Element as this is only be + * available to XML Elements. + */ + Element.prototype.selectNodes = function(sExpr){ + var doc = this.ownerDocument; + if(doc.selectNodes) + return doc.selectNodes(sExpr, this); + else + throw "Method selectNodes is only supported by XML Elements"; + }; + /** + * Extends the XMLDocument to emulate IE's selectSingleNode. + * @argument sExpr the XPath expression to use + * @argument contextNode this is for internal use only by the same + * method when called on Elements + * @returns the result of the XPath search as an (Sarissa)NodeList + */ + XMLDocument.prototype.selectSingleNode = function(sExpr, contextNode){ + var ctx = contextNode?contextNode:null; + return this.selectNodes(sExpr, ctx, true); + }; + /** + * Extends the Element to emulate IE's selectSingleNode. + * @argument sExpr the XPath expression to use + * @returns the result of the XPath search as an (Sarissa)NodeList + * @throws An error if invoked on an HTML Element as this is only be + * available to XML Elements. + */ + Element.prototype.selectSingleNode = function(sExpr){ + var doc = this.ownerDocument; + if(doc.selectSingleNode) + return doc.selectSingleNode(sExpr, this); + else + throw "Method selectNodes is only supported by XML Elements"; + }; + Sarissa.IS_ENABLED_SELECT_NODES = true; +}; Modified: trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xslt.js =================================================================== --- trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xslt.js 2007-05-16 13:14:42 UTC (rev 199) +++ trunk/framework/src/main/javascript/ajaxjsf/sarissa_ieemu_xslt.js 2007-05-16 23:22:21 UTC (rev 200) @@ -1,165 +1,165 @@ -/** - * ==================================================================== - * About - * ==================================================================== - * Sarissa cross browser XML library - IE XSLT Emulation (deprecated) - * @version 0.9.7.6 - * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net - * - * This script emulates Internet Explorer's transformNode and transformNodeToObject - * for Mozilla and provides a common way to set XSLT parameters - * via Sarissa.setXslParameter. - * - * All functionality in this file is DEPRECATED, the XSLTProcessor - * should be used instead. - * - * ==================================================================== - * Licence - * ==================================================================== - * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, - * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher - * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If - * you make modifications under the ASL, i would appreciate it if you submitted those. - * In case your copy of Sarissa does not include the license texts, you may find - * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and - * <a href="http://www.apache.org">http://www.apache.org</a>. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE - * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -if(!Sarissa.IS_ENABLED_TRANSFORM_NODE && window.XSLTProcessor){ - /** - * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Element class to emulate IE's transformNodeToObject (deprecated). - * Note : The transformation result must be well formed, - * otherwise an error will be thrown - * @uses Mozilla's XSLTProcessor - * @deprecated use the XSLTProcessor instead - * @argument xslDoc The stylesheet to use (a DOM Document instance) - * @argument oResult The Document to store the transformation result - */ - XMLElement.prototype.transformNodeToObject = function(xslDoc, oResult){ - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - oDoc.transformNodeToObject(xslDoc, oResult); - }; - /** - * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Document class to emulate IE's transformNodeToObject (deprecated). - * @uses Mozilla's XSLTProcessor - * @deprecated use the XSLTProcessor instead - * @argument xslDoc The stylesheet to use (a DOM Document instance) - * @argument oResult The Document to store the transformation result - * @throws Errors that try to be informative - */ - Document.prototype.transformNodeToObject = function(xslDoc, oResult){ - var xsltProcessor = null; - try{ - xsltProcessor = new XSLTProcessor(); - if(xsltProcessor.reset){ - /* new nsIXSLTProcessor is available */ - xsltProcessor.importStylesheet(xslDoc); - var newFragment = xsltProcessor.transformToFragment(this, oResult); - Sarissa.copyChildNodes(newFragment, oResult); - }else{ - /* only nsIXSLTProcessorObsolete is available */ - xsltProcessor.transformDocument(this, xslDoc, oResult, null); - }; - }catch(e){ - if(xslDoc && oResult) - throw "Failed to transform document. (original exception: "+e+")"; - else if(!xslDoc) - throw "No Stylesheet Document was provided. (original exception: "+e+")"; - else if(!oResult) - throw "No Result Document was provided. (original exception: "+e+")"; - else if(xsltProcessor == null) - throw "Could not instantiate an XSLTProcessor object. (original exception: "+e+")"; - else - throw e; - }; - }; - /** - * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Element class to emulate IE's transformNode (deprecated). - * Note : The result of your transformation must be well formed, - * otherwise you will get an error. - * @uses Mozilla's XSLTProcessor - * @deprecated use the XSLTProcessor instead - * @argument xslDoc The stylesheet to use (a DOM Document instance) - * @returns the result of the transformation serialized to an XML String - */ - XMLElement.prototype.transformNode = function(xslDoc){ - var oDoc = document.implementation.createDocument("", "", null); - Sarissa.copyChildNodes(this, oDoc); - return oDoc.transformNode(xslDoc); - }; - /** - * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Document class to emulate IE's transformNode (deprecated). - * Note : The result of your transformation must be well formed, - * otherwise you will get an error - * @uses Mozilla's XSLTProcessor - * @deprecated use the XSLTProcessor instead - * @argument xslDoc The stylesheet to use (a DOM Document instance) - * @returns the result of the transformation serialized to an XML String - */ - Document.prototype.transformNode = function(xslDoc){ - var out = document.implementation.createDocument("", "", null); - this.transformNodeToObject(xslDoc, out); - var str = null; - try{ - var serializer = new XMLSerializer(); - str = serializer.serializeToString(out); - }catch(e){ - throw "Failed to serialize result document. (original exception: "+e+")"; - }; - return str; - }; - Sarissa.IS_ENABLED_TRANSFORM_NODE = true; -}; -/** - * Deprecated (use XSLTProcessor instead): Set xslt parameters. - * Note that this method can only work for the main stylesheet and not any included/imported files. - * @deprecated use the XSLTProcessor instead - * @argument oXslDoc the target XSLT DOM Document - * @argument sParamName the name of the XSLT parameter - * @argument sParamValue the value of the XSLT parameter - * @returns whether the parameter was set succefully - */ -Sarissa.setXslParameter = function(oXslDoc, sParamQName, sParamValue){ - try{ - var params = oXslDoc.getElementsByTagName(_SARISSA_IEPREFIX4XSLPARAM+"param"); - var iLength = params.length; - var bFound = false; - var param; - if(sParamValue){ - for(var i=0; i < iLength && !bFound;i++){ - if(params[i].getAttribute("name") == sParamQName){ - param = params[i]; - while(param.firstChild) - param.removeChild(param.firstChild); - if(!sParamValue || sParamValue == null){ - }else if(typeof sParamValue == "string"){ - param.setAttribute("select", sParamValue); - bFound = true; - }else if(sParamValue.nodeName){ - param.removeAttribute("select"); - param.appendChild(sParamValue.cloneNode(true)); - bFound = true; - }else if (sParamValue.item(0) && sParamValue.item(0).nodeType){ - for(var j=0;j < sParamValue.length;j++) - if(sParamValue.item(j).nodeType) - param.appendChild(sParamValue.item(j).cloneNode(true)); - bFound = true; - }else - throw "Failed to set xsl:param "+sParamQName+" (original exception: "+e+")"; - }; - }; - }; - return bFound; - }catch(e){ - throw e; - return false; - }; -}; +/** + * ==================================================================== + * About + * ==================================================================== + * Sarissa cross browser XML library - IE XSLT Emulation (deprecated) + * @version ${project.version} + * @author: Manos Batsis, mailto: mbatsis at users full stop sourceforge full stop net + * + * This script emulates Internet Explorer's transformNode and transformNodeToObject + * for Mozilla and provides a common way to set XSLT parameters + * via Sarissa.setXslParameter. + * + * All functionality in this file is DEPRECATED, the XSLTProcessor + * should be used instead. + * + * ==================================================================== + * Licence + * ==================================================================== + * Sarissa is free software distributed under the GNU GPL version 2 (see <a href="gpl.txt">gpl.txt</a>) or higher, + * GNU LGPL version 2.1 (see <a href="lgpl.txt">lgpl.txt</a>) or higher and Apache Software License 2.0 or higher + * (see <a href="asl.txt">asl.txt</a>). This means you can choose one of the three and use that if you like. If + * you make modifications under the ASL, i would appreciate it if you submitted those. + * In case your copy of Sarissa does not include the license texts, you may find + * them online in various formats at <a href="http://www.gnu.org">http://www.gnu.org</a> and + * <a href="http://www.apache.org">http://www.apache.org</a>. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE + * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +if(!Sarissa.IS_ENABLED_TRANSFORM_NODE && window.XSLTProcessor){ + /** + * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Element class to emulate IE's transformNodeToObject (deprecated). + * Note : The transformation result must be well formed, + * otherwise an error will be thrown + * @uses Mozilla's XSLTProcessor + * @deprecated use the XSLTProcessor instead + * @argument xslDoc The stylesheet to use (a DOM Document instance) + * @argument oResult The Document to store the transformation result + */ + XMLElement.prototype.transformNodeToObject = function(xslDoc, oResult){ + var oDoc = document.implementation.createDocument("", "", null); + Sarissa.copyChildNodes(this, oDoc); + oDoc.transformNodeToObject(xslDoc, oResult); + }; + /** + * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Document class to emulate IE's transformNodeToObject (deprecated). + * @uses Mozilla's XSLTProcessor + * @deprecated use the XSLTProcessor instead + * @argument xslDoc The stylesheet to use (a DOM Document instance) + * @argument oResult The Document to store the transformation result + * @throws Errors that try to be informative + */ + Document.prototype.transformNodeToObject = function(xslDoc, oResult){ + var xsltProcessor = null; + try{ + xsltProcessor = new XSLTProcessor(); + if(xsltProcessor.reset){ + /* new nsIXSLTProcessor is available */ + xsltProcessor.importStylesheet(xslDoc); + var newFragment = xsltProcessor.transformToFragment(this, oResult); + Sarissa.copyChildNodes(newFragment, oResult); + }else{ + /* only nsIXSLTProcessorObsolete is available */ + xsltProcessor.transformDocument(this, xslDoc, oResult, null); + }; + }catch(e){ + if(xslDoc && oResult) + throw "Failed to transform document. (original exception: "+e+")"; + else if(!xslDoc) + throw "No Stylesheet Document was provided. (original exception: "+e+")"; + else if(!oResult) + throw "No Result Document was provided. (original exception: "+e+")"; + else if(xsltProcessor == null) + throw "Could not instantiate an XSLTProcessor object. (original exception: "+e+")"; + else + throw e; + }; + }; + /** + * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Element class to emulate IE's transformNode (deprecated). + * Note : The result of your transformation must be well formed, + * otherwise you will get an error. + * @uses Mozilla's XSLTProcessor + * @deprecated use the XSLTProcessor instead + * @argument xslDoc The stylesheet to use (a DOM Document instance) + * @returns the result of the transformation serialized to an XML String + */ + XMLElement.prototype.transformNode = function(xslDoc){ + var oDoc = document.implementation.createDocument("", "", null); + Sarissa.copyChildNodes(this, oDoc); + return oDoc.transformNode(xslDoc); + }; + /** + * Deprecated, will be removed in 0.9.6 (use XSLTProcessor instead): Extends the Document class to emulate IE's transformNode (deprecated). + * Note : The result of your transformation must be well formed, + * otherwise you will get an error + * @uses Mozilla's XSLTProcessor + * @deprecated use the XSLTProcessor instead + * @argument xslDoc The stylesheet to use (a DOM Document instance) + * @returns the result of the transformation serialized to an XML String + */ + Document.prototype.transformNode = function(xslDoc){ + var out = document.implementation.createDocument("", "", null); + this.transformNodeToObject(xslDoc, out); + var str = null; + try{ + var serializer = new XMLSerializer(); + str = serializer.serializeToString(out); + }catch(e){ + throw "Failed to serialize result document. (original exception: "+e+")"; + }; + return str; + }; + Sarissa.IS_ENABLED_TRANSFORM_NODE = true; +}; +/** + * Deprecated (use XSLTProcessor instead): Set xslt parameters. + * Note that this method can only work for the main stylesheet and not any included/imported files. + * @deprecated use the XSLTProcessor instead + * @argument oXslDoc the target XSLT DOM Document + * @argument sParamName the name of the XSLT parameter + * @argument sParamValue the value of the XSLT parameter + * @returns whether the parameter was set succefully + */ +Sarissa.setXslParameter = function(oXslDoc, sParamQName, sParamValue){ + try{ + var params = oXslDoc.getElementsByTagName(_SARISSA_IEPREFIX4XSLPARAM+"param"); + var iLength = params.length; + var bFound = false; + var param; + if(sParamValue){ + for(var i=0; i < iLength && !bFound;i++){ + if(params[i].getAttribute("name") == sParamQName){ + param = params[i]; + while(param.firstChild) + param.removeChild(param.firstChild); + if(!sParamValue || sParamValue == null){ + }else if(typeof sParamValue == "string"){ + param.setAttribute("select", sParamValue); + bFound = true; + }else if(sParamValue.nodeName){ + param.removeAttribute("select"); + param.appendChild(sParamValue.cloneNode(true)); + bFound = true; + }else if (sParamValue.item(0) && sParamValue.item(0).nodeType){ + for(var j=0;j < sParamValue.length;j++) + if(sParamValue.item(j).nodeType) + param.appendChild(sParamValue.item(j).cloneNode(true)); + bFound = true; + }else + throw "Failed to set xsl:param "+sParamQName+" (original exception: "+e+")"; + }; + }; + }; + return bFound; + }catch(e){ + throw e; + return false; + }; +};

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r199 - trunk/framework/src/main/config/component.

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

Author: vkukharchuk Date: 2007-05-16 09:14:42 -0400 (Wed, 16 May 2007) New Revision: 199 Modified: trunk/framework/src/main/config/component/support.xml Log: Modified: trunk/framework/src/main/config/component/support.xml =================================================================== --- trunk/framework/src/main/config/component/support.xml 2007-05-16 01:06:06 UTC (rev 198) +++ trunk/framework/src/main/config/component/support.xml 2007-05-16 13:14:42 UTC (rev 199) @@ -124,11 +124,7 @@ <classname>int</classname> <description>Timeout (in ms) for request</description> </property> - <property> - <name>parentProperties</name> - <classname>java.lang.String</classname> - <description>parentProperties</description> - </property> + </component> </components> \ No newline at end of file

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r198 - trunk/cdk/maven-cdk-plugin/src/main/resources/component.

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

Author: alexsmirnov Date: 2007-05-15 21:06:06 -0400 (Tue, 15 May 2007) New Revision: 198 Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java Log: remove old license terms Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java =================================================================== --- trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java 2007-05-15 16:35:53 UTC (rev 197) +++ trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java 2007-05-16 01:06:06 UTC (rev 198) @@ -1,22 +1,5 @@ /** - * License Agreement. * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * 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 ${package}.component;

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r197 - trunk/framework/src/main/java/org/ajax4jsf/framework/resource.

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

Author: ishabalov Date: 2007-05-15 12:35:53 -0400 (Tue, 15 May 2007) New Revision: 197 Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java Log: Minor cosmetic changes Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java 2007-05-15 01:09:43 UTC (rev 196) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StaticResource.java 2007-05-15 16:35:53 UTC (rev 197) @@ -40,7 +40,6 @@ */ public StaticResource() { super(); - // TODO Auto-generated constructor stub } @@ -65,7 +64,6 @@ * @see org.ajax4jsf.framework.resource.InternetResourceBase#isCacheable() */ public boolean isCacheable(ResourceContext resourceContext) { - // TODO Auto-generated method stub return true; } Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java 2007-05-15 01:09:43 UTC (rev 196) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/resource/StyleRenderer.java 2007-05-15 16:35:53 UTC (rev 197) @@ -35,7 +35,6 @@ * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getTag() */ protected String getTag() { - // TODO Auto-generated method stub return "link"; } @@ -43,7 +42,6 @@ * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getHrefAttr() */ protected String getHrefAttr() { - // TODO Auto-generated method stub return "href"; } @@ -51,7 +49,6 @@ * @see org.ajax4jsf.framework.resource.BaseResourceRenderer#getCommonAttrs() */ protected String[][] getCommonAttrs() { - // TODO Auto-generated method stub return new String[][]{{"type","text/css"},{"rel","stylesheet"}}; }

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r196 - in trunk: samples/tomahawkCompability/src/main/java/org/ajax4jsf and 2 other directories.

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

Author: alexsmirnov Date: 2007-05-14 21:09:43 -0400 (Mon, 14 May 2007) New Revision: 196 Added: trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Container.java trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/ControlResultsController.java trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp Modified: trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Bean.java trunk/samples/tomahawkCompability/src/main/webapp/WEB-INF/faces-config.xml Log: Test for a support Tomahawk extended data table component. Modified: trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-05-14 23:56:53 UTC (rev 195) +++ trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxFormRenderer.java 2007-05-15 01:09:43 UTC (rev 196) @@ -84,13 +84,16 @@ * javax.faces.component.UIComponent) */ protected void doDecode(FacesContext context, UIComponent component) { - UIAjaxForm form = (UIAjaxForm) component; + UIForm form = (UIForm) component; boolean submitted = context.getExternalContext() .getRequestParameterMap().containsKey( component.getClientId(context)); form.setSubmitted(submitted); - if (submitted && form.isAjaxSubmit()) { - component.queueEvent(new AjaxEvent(component)); + if (component instanceof UIAjaxForm) { + UIAjaxForm ajaxForm = (UIAjaxForm) component; + if (submitted && ajaxForm.isAjaxSubmit()) { + component.queueEvent(new AjaxEvent(component)); + } } } Modified: trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Bean.java =================================================================== --- trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Bean.java 2007-05-14 23:56:53 UTC (rev 195) +++ trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Bean.java 2007-05-15 01:09:43 UTC (rev 196) @@ -20,13 +20,33 @@ */ package org.ajax4jsf; + +import java.util.ArrayList; +import java.util.List; + /** * @author $Autor$ * */ public class Bean { private int counter; + + private List containers ; + public Bean() { + containers = new ArrayList(); + boolean availible=false; + boolean changed=true; + for(int i=0;i<10;i++){ + Container c = new Container(); + c.setContainerNumber(i); + c.setAvailable(availible); + c.setChanged(changed); + availible = ! availible; + changed = ! changed; + containers.add(c); + } + } /** * @return the counter */ @@ -49,4 +69,16 @@ counter--; return null; } + /** + * @return the containers + */ + public List getContainers() { + return containers; + } + /** + * @param containers the containers to set + */ + public void setContainers(List containers) { + this.containers = containers; + } } \ No newline at end of file Added: trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Container.java =================================================================== --- trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Container.java (rev 0) +++ trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/Container.java 2007-05-15 01:09:43 UTC (rev 196) @@ -0,0 +1,51 @@ +/** + * + */ +package org.ajax4jsf; + +/** + * @author asmirnov + * + */ +public class Container { + private boolean available; + private boolean changed; + private int containerNumber; + /** + * @return the available + */ + public boolean isAvailable() { + return available; + } + /** + * @param available the available to set + */ + public void setAvailable(boolean available) { + this.available = available; + } + /** + * @return the changed + */ + public boolean isChanged() { + return changed; + } + /** + * @param changed the changed to set + */ + public void setChanged(boolean changed) { + this.changed = changed; + } + /** + * @return the containerNumber + */ + public int getContainerNumber() { + return containerNumber; + } + /** + * @param containerNumber the containerNumber to set + */ + public void setContainerNumber(int containerNumber) { + this.containerNumber = containerNumber; + } + +} Added: trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/ControlResultsController.java =================================================================== --- trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/ControlResultsController.java (rev 0) +++ trunk/samples/tomahawkCompability/src/main/java/org/ajax4jsf/ControlResultsController.java 2007-05-15 01:09:43 UTC (rev 196) @@ -0,0 +1,24 @@ +/** + * + */ +package org.ajax4jsf; + +import javax.faces.event.ActionEvent; + +/** + * @author asmirnov + * + */ +public class ControlResultsController { + public String addRow() { + return null; + } + + public String removeElement() { + return null; + } + + public void updateValue(ActionEvent e) { + + } +} Modified: trunk/samples/tomahawkCompability/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/WEB-INF/faces-config.xml 2007-05-14 23:56:53 UTC (rev 195) +++ trunk/samples/tomahawkCompability/src/main/webapp/WEB-INF/faces-config.xml 2007-05-15 01:09:43 UTC (rev 196) @@ -17,6 +17,11 @@ <managed-bean-class>org.ajax4jsf.TreeBacker</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>controlResultsController</managed-bean-name> + <managed-bean-class>org.ajax4jsf.ControlResultsController</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> <render-kit> <renderer> <component-family>javax.faces.Form</component-family> Added: trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp =================================================================== --- trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp (rev 0) +++ trunk/samples/tomahawkCompability/src/main/webapp/pages/dataTable.jsp 2007-05-15 01:09:43 UTC (rev 196) @@ -0,0 +1,61 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" %> +<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> +<html> + <head> + <title>Tomahawk extended data table</title> + </head> + <body> + <f:view> + <h:form> +<t:dataTable id="containers" value="#{bean.containers}" + var="GIContainers" styleClass="normalText" border="1" + cellspacing="0" cellpadding="0" rowIndexVar="rowIndex"> + <t:column> + <f:facet name="header">?????</f:facet> + + <h:inputText id="container" + styleClass="#{(GIContainers.available) ? ((GIContainers.changed) ? 'redText' : '') : 'strikeText'}" + size="5" maxlength="17" value="#{GIContainers.containerNumber}"> + <a4j:support event="onchange" ajaxSingle="true" + reRender="containers" + actionListener="#{controlResultsController.updateValue}"> + <a4j:actionparam name="rowIndex" value="#{rowIndex}" /> + <a4j:actionparam name="changeTable" value="containers" /> + </a4j:support> + <f:validateLength maximum="17" /> + </h:inputText> + </t:column> + <t:column> + <f:facet name="header">??? ?? ?????????</f:facet> + + <h:inputText size="5" maxlength="17" + styleClass="#{(GIContainers.available) ? ((GIContainers.changed) ? 'redText' : '') : 'strikeText'}" + value="#{GIContainers.containerNumber}"> + <f:validateLength maximum="17" /> + </h:inputText> + </t:column> + <t:column> + <f:facet name="header"> + <a4j:commandLink immediate="true" + action="#{controlResultsController.addRow}" + reRender="containers"> + <h:graphicImage style="border: none" value="/images/plus.gif" /> + <a4j:actionparam name="plusTable" value="containers"></a4j:actionparam> + </a4j:commandLink> + </f:facet> + + <a4j:commandLink reRender="containers" immediate="true" + style="text-decoration : none" + action="#{controlResultsController.removeElement}"> + <h:graphicImage style="border: none;" value="/images/minus.gif" /> + <a4j:actionparam name="rowIndex" value="#{rowIndex}"></a4j:actionparam> + <a4j:actionparam name="minusTable" value="containers"></a4j:actionparam> + </a4j:commandLink> + </t:column> + </t:dataTable> + </h:form> + </f:view> + </body> +</html>

17 years, 1 month

1
0
0 / 0

JBoss Ajax4JSF SVN: r195 - tags.

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

Author: alexsmirnov Date: 2007-05-14 19:56:53 -0400 (Mon, 14 May 2007) New Revision: 195 Added: tags/1_1_1_rc3/ Log: 1.1.1 release candidate 3 Copied: tags/1_1_1_rc3 (from rev 194, trunk)

17 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

ajax4jsf-svn-commits May 2007