February 2011 - gatein-commits - Jboss List Archives

gatein SVN: r5895 - components/shindig/tags/1.0-r790473-Patch05.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-02-15 11:19:44 -0500 (Tue, 15 Feb 2011) New Revision: 5895 Modified: components/shindig/tags/1.0-r790473-Patch05/pom.xml Log: Changing SCM Modified: components/shindig/tags/1.0-r790473-Patch05/pom.xml =================================================================== --- components/shindig/tags/1.0-r790473-Patch05/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) +++ components/shindig/tags/1.0-r790473-Patch05/pom.xml 2011-02-15 16:19:44 UTC (rev 5895) @@ -48,9 +48,9 @@   <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm>

13 years, 10 months

1
0
0 / 0

gatein SVN: r5894 - in components/pc/trunk/test/servers: jboss42 and 8 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-15 11:16:06 -0500 (Tue, 15 Feb 2011) New Revision: 5894 Added: components/pc/trunk/test/servers/src/ components/pc/trunk/test/servers/src/common/ components/pc/trunk/test/servers/src/common/resources/ components/pc/trunk/test/servers/src/common/resources/common.xml Removed: components/pc/trunk/test/servers/src/common/ components/pc/trunk/test/servers/src/common/resources/ components/pc/trunk/test/servers/src/common/resources/common.xml Modified: components/pc/trunk/test/servers/jboss42/pom.xml components/pc/trunk/test/servers/jboss51/pom.xml components/pc/trunk/test/servers/jboss6/pom.xml components/pc/trunk/test/servers/jetty6/pom.xml components/pc/trunk/test/servers/tomcat6/pom.xml components/pc/trunk/test/servers/tomcat7/pom.xml Log: finally revert that change, will try to do it again later Modified: components/pc/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss42/pom.xml 2011-02-15 13:42:12 UTC (rev 5893) +++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -339,12 +339,6 @@ <configuration> <tasks> - <unjar src="${org.gatein.pc:pc-test-core:jar}" dest="${project.basedir}/target"> - <patternset> - <include name="common.xml"/> - </patternset> - </unjar> - <property name="compile_classpath" refid="maven.compile.classpath"/> <property name="runtime_classpath" refid="maven.runtime.classpath"/> <property name="test_classpath" refid="maven.test.classpath"/> @@ -363,7 +357,7 @@   - <property name="common.xml.file" value="${project.basedir}/target/common.xml"/> + <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml"/> <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> <target name="tests"/> Modified: components/pc/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss51/pom.xml 2011-02-15 13:42:12 UTC (rev 5893) +++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -344,12 +344,6 @@ <configuration> <tasks> - <unjar src="${org.gatein.pc:pc-test-core:jar}" dest="${project.basedir}/target"> - <patternset> - <include name="common.xml"/> - </patternset> - </unjar> - <property name="compile_classpath" refid="maven.compile.classpath" /> <property name="runtime_classpath" refid="maven.runtime.classpath" /> <property name="test_classpath" refid="maven.test.classpath" /> @@ -368,7 +362,7 @@   - <property name="common.xml.file" value="${project.basedir}/target/common.xml" /> + <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" /> <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> <target name="tests" /> Modified: components/pc/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/pc/trunk/test/servers/jboss6/pom.xml 2011-02-15 13:42:12 UTC (rev 5893) +++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -344,12 +344,6 @@ <configuration> <tasks> - <unjar src="${org.gatein.pc:pc-test-core:jar}" dest="${project.basedir}/target"> - <patternset> - <include name="common.xml"/> - </patternset> - </unjar> - <property name="compile_classpath" refid="maven.compile.classpath" /> <property name="runtime_classpath" refid="maven.runtime.classpath" /> <property name="test_classpath" refid="maven.test.classpath" /> @@ -368,7 +362,7 @@   - <property name="common.xml.file" value="${project.basedir}/target/common.xml" /> + <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" /> <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> <target name="tests" /> Modified: components/pc/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/pc/trunk/test/servers/jetty6/pom.xml 2011-02-15 13:42:12 UTC (rev 5893) +++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -344,12 +344,6 @@ <configuration> <tasks> - <unjar src="${org.gatein.pc:pc-test-core:jar}" dest="${project.basedir}/target"> - <patternset> - <include name="common.xml"/> - </patternset> - </unjar> - <property name="compile_classpath" refid="maven.compile.classpath" /> <property name="runtime_classpath" refid="maven.runtime.classpath" /> <property name="test_classpath" refid="maven.test.classpath" /> @@ -368,7 +362,7 @@   - <property name="common.xml.file" value="${project.basedir}/target/common.xml" /> + <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" /> <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> <target name="tests" /> Deleted: components/pc/trunk/test/servers/src/common/resources/common.xml =================================================================== --- components/pc/trunk/test/servers/src/common/resources/common.xml 2011-02-14 23:03:52 UTC (rev 5880) +++ components/pc/trunk/test/servers/src/common/resources/common.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -1,282 +0,0 @@ -<?xml version="1.0"?> -<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant"> - - <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" - uri="antlib:org.apache.maven.artifact.ant" - classpathref="maven-ant-tasks.classpath" /> - - <property name="target.dir" value="${basedir}/target"/> - <property name="test.dir" value="${target.dir}/integration-tests"/> - <property name="test.cargo.dir" value="${test.dir}/cargo/"/> - - <target name="tests.common" depends="prepare_env" > - - <echo message="compile classpath: ${compile_classpath}"/> - <echo message="runtime classpath: ${runtime_classpath}"/> - <echo message="test classpath: ${test_classpath}"/> - <echo message="plugin classpath: ${plugin_classpath}"/> - <echo message="base directory: ${basedir}"/> - - <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/> - - <antcall target="package-tests"/> - - <antcall target="test.container-servlet"/> - - </target> - - <target name="prepare_env"> - -  - <property name="target" value="${basedir}/target"/> - <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/> - <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/> - <property name="test.temp.lib" value="${test.temp.dir}/lib"/> - - <mkdir dir="${test.temp.dir}"/> - <mkdir dir="${test.temp.lib}"/> - <mkdir dir="${target}/jboss-unit"/> - - <echo message="Preparing environment"/> - - <path id="jboss-logging"> - <pathelement location="${jboss:jboss-common-logging-spi:jar}"/> - <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/> - <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/> - </path> - - <path id="jboss-xb"> - <pathelement location="${org.jboss:jbossxb:jar}"/> - </path> - - <path id="portal-common"> - </path> - - <path id="portal-common-shared"> - <pathelement location="${org.gatein.common:common-common:jar}"/> - <pathelement location="${org.gatein.common:common-logging:jar}"/> - <pathelement location="${org.slf4j:slf4j-simple:jar}"/> - <pathelement location="${org.slf4j:slf4j-api:jar}"/> - </path> - - <path id="portal-web"> - </path> - - <path id="portal-web-shared"> - <pathelement location="${org.gatein.wci:wci-wci:jar}"/> - </path> - - <path id="portal-portlet"> - <pathelement location="${org.gatein.pc:pc-controller:jar}"/> - <pathelement location="${org.gatein.pc:pc-mc:jar}"/> - </path> - - <path id="portal-portlet-shared"> - <pathelement location="${org.gatein.pc:pc-portlet:jar}"/> - <pathelement location="${org.gatein.pc:pc-api:jar}"/> - <pathelement location="${javax.portlet:portlet-api:jar}"/> - </path> - - <path id="jboss-unit"> - </path> - - <path id="jboss-unit-shared"> - <pathelement location="${org.jboss.unit:jboss-unit:jar}"/> - <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/> - <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/> - <pathelement location="${org.jboss.unit:portal-test:jar}"/> - <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/> - </path> - - </target> - - <macrodef name="package-ext-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/> - </sequential> - </macrodef> - - <macrodef name="package-tck-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/> - </sequential> - </macrodef> - - <macrodef name="package-api-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/> - </sequential> - </macrodef> - - <macrodef name="package-jsr286-tck-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/> - </sequential> - </macrodef> - - <macrodef name="package-jsr286-api-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/> - </sequential> - </macrodef> - - <macrodef name="package-jsr286-ext-test"> - <attribute name="test"/> - <sequential> - <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/> - </sequential> - </macrodef> - - <macrodef name="package-testsuite"> - <attribute name="testsuiteversion"/> - <attribute name="testsuitetype"/> - <attribute name="testsuitename"/> - <sequential> - - <artifact:dependencies pathId="dependency.classpath"> - <dependency - groupId="org.gatein.pc" - artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" - version="${project.version}" - type="war"/> - </artifact:dependencies> - - <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war"> - <path refid="dependency.classpath"/> - </copy> - - </sequential> - </macrodef> - - <target name="package-tests" depends="prepare_env"> - - <package-tck-test test="portletinterface"/> - <package-tck-test test="dispatcher"/> - <package-tck-test test="portletrequests"/> - <package-tck-test test="portletmode"/> - <package-tck-test test="portletconfig"/> - <package-tck-test test="portletresponses"/> - <package-tck-test test="preferences"/> - <package-tck-test test="portletsession"/> - <package-tck-test test="portleturl"/> - <package-tck-test test="windowstates"/> - <package-tck-test test="portletcontext"/> - <package-api-test test="portletconfig"/> - <package-api-test test="portletmode"/> - <package-api-test test="windowstate"/> - <package-api-test test="portletsessionutil"/> - <package-api-test test="portalcontext"/> - <package-api-test test="portletcontext"/> - <package-api-test test="portleturl"/> - <package-api-test test="portletpreferences"/> - <package-api-test test="portletsession"/> - <package-api-test test="actionrequest"/> - <package-api-test test="renderrequest"/> - <package-api-test test="actionresponse"/> - <package-api-test test="renderresponse"/> - <package-ext-test test="nocache"/> - <package-ext-test test="expiringcache"/> - <package-ext-test test="neverexpiringcache"/> - <package-ext-test test="preferences"/> - <package-ext-test test="session"/> - <package-ext-test test="portletresponses"/> - <package-ext-test test="portletrequests"/> - <package-ext-test test="portletmode"/> - <package-ext-test test="portletconfig"/> - <package-ext-test test="taglib"/> - <package-jsr286-tck-test test="dispatcher"/> - <package-jsr286-tck-test test="portletconfig"/> - <package-jsr286-tck-test test="portletconfignonamespace"/> - <package-jsr286-tck-test test="event"/> - <package-jsr286-tck-test test="eventnonamespace"/> - <package-jsr286-tck-test test="stateawareresponse"/> - <package-jsr286-tck-test test="portletrequests"/> - <package-jsr286-tck-test test="resourceserving"/> - <package-jsr286-tck-test test="portleturl"/> - <package-jsr286-tck-test test="portletfilter"/> - <package-jsr286-tck-test test="taglib"/> - <package-jsr286-tck-test test="userinformation"/> - <package-jsr286-api-test test="event"/> - <package-jsr286-api-test test="portleturl"/> - <package-jsr286-ext-test test="portletrequests"/> - <package-jsr286-ext-test test="portletfilter"/> - <package-jsr286-ext-test test="portletresponses"/> - <package-jsr286-ext-test test="dispatcher"/> - <package-jsr286-ext-test test="portletcontext"/> - <package-jsr286-ext-test test="portletinterface"/> - <package-jsr286-ext-test test="event"/> - <package-jsr286-ext-test test="eventsupport"/> - <package-jsr286-ext-test test="portletmode"/> - <package-jsr286-ext-test test="cache"/> - -  - <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true"> - <path refid="${test.server.name}-${test.server.version}"/> - <path> - <pathelement location="${org.gatein.pc:pc-test-core:jar}"/> - <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/> - </path> - </copy> - <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/> - <war - destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war" - needxmlfile="false"> - <fileset dir="${target}/test-classes/portlet-test-war"/> - </war> - - </target> - - <target name="cargo.setup"> - <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/> - <mkdir dir="${cargo.log.dir}"/> - <taskdef resource="cargo.tasks"> - <classpath> - <pathelement path="${plugin_classpath}"/> - </classpath> - </taskdef> - </target> - - <target name="test.container-servlet"> - <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/> - <antcall target="cargo.start"> - <param name="cargo.wait" value="false"/> - </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="${test.remote.server.name}"/> - </antcall> - <antcall target="cargo.stop"/> - </target> - - <target name="tests.remote"> - - <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> - - <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true"> - - <tests config="${target}/test-classes/test/remote-jboss-unit.xml"> - <property name="archivePath" value="${test.temp.lib}"/> - <property name="serverName" value="${test.server.name}"/> - </tests> - - <reports> - <xml toDir="${target}/tests/reports/xml/${test.server.name}"/> - <html toDir="${target}/tests/reports/html/${test.server.name}"/> - </reports> - - <classpath> - <pathelement location="${test.temp.lib}"/> - <pathelement location="${target}/test-classes/test"/> - <pathelement path="${test_classpath}"/> - </classpath> - - </jboss-unit> - - </target> - -</project> Copied: components/pc/trunk/test/servers/src/common/resources/common.xml (from rev 5880, components/pc/trunk/test/servers/src/common/resources/common.xml) =================================================================== --- components/pc/trunk/test/servers/src/common/resources/common.xml (rev 0) +++ components/pc/trunk/test/servers/src/common/resources/common.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -0,0 +1,282 @@ +<?xml version="1.0"?> +<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + + <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="antlib:org.apache.maven.artifact.ant" + classpathref="maven-ant-tasks.classpath" /> + + <property name="target.dir" value="${basedir}/target"/> + <property name="test.dir" value="${target.dir}/integration-tests"/> + <property name="test.cargo.dir" value="${test.dir}/cargo/"/> + + <target name="tests.common" depends="prepare_env" > + + <echo message="compile classpath: ${compile_classpath}"/> + <echo message="runtime classpath: ${runtime_classpath}"/> + <echo message="test classpath: ${test_classpath}"/> + <echo message="plugin classpath: ${plugin_classpath}"/> + <echo message="base directory: ${basedir}"/> + + <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/> + + <antcall target="package-tests"/> + + <antcall target="test.container-servlet"/> + + </target> + + <target name="prepare_env"> + +  + <property name="target" value="${basedir}/target"/> + <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/> + <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/> + <property name="test.temp.lib" value="${test.temp.dir}/lib"/> + + <mkdir dir="${test.temp.dir}"/> + <mkdir dir="${test.temp.lib}"/> + <mkdir dir="${target}/jboss-unit"/> + + <echo message="Preparing environment"/> + + <path id="jboss-logging"> + <pathelement location="${jboss:jboss-common-logging-spi:jar}"/> + <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/> + <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/> + </path> + + <path id="jboss-xb"> + <pathelement location="${org.jboss:jbossxb:jar}"/> + </path> + + <path id="portal-common"> + </path> + + <path id="portal-common-shared"> + <pathelement location="${org.gatein.common:common-common:jar}"/> + <pathelement location="${org.gatein.common:common-logging:jar}"/> + <pathelement location="${org.slf4j:slf4j-simple:jar}"/> + <pathelement location="${org.slf4j:slf4j-api:jar}"/> + </path> + + <path id="portal-web"> + </path> + + <path id="portal-web-shared"> + <pathelement location="${org.gatein.wci:wci-wci:jar}"/> + </path> + + <path id="portal-portlet"> + <pathelement location="${org.gatein.pc:pc-controller:jar}"/> + <pathelement location="${org.gatein.pc:pc-mc:jar}"/> + </path> + + <path id="portal-portlet-shared"> + <pathelement location="${org.gatein.pc:pc-portlet:jar}"/> + <pathelement location="${org.gatein.pc:pc-api:jar}"/> + <pathelement location="${javax.portlet:portlet-api:jar}"/> + </path> + + <path id="jboss-unit"> + </path> + + <path id="jboss-unit-shared"> + <pathelement location="${org.jboss.unit:jboss-unit:jar}"/> + <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/> + <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/> + <pathelement location="${org.jboss.unit:portal-test:jar}"/> + <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/> + </path> + + </target> + + <macrodef name="package-ext-test"> + <attribute name="test"/> + <sequential> + <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/> + </sequential> + </macrodef> + + <macrodef name="package-tck-test"> + <attribute name="test"/> + <sequential> + <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/> + </sequential> + </macrodef> + + <macrodef name="package-api-test"> + <attribute name="test"/> + <sequential> + <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/> + </sequential> + </macrodef> + + <macrodef name="package-jsr286-tck-test"> + <attribute name="test"/> + <sequential> + <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/> + </sequential> + </macrodef> + + <macrodef name="package-jsr286-api-test"> + <attribute name="test"/> + <sequential> + <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/> + </sequential> + </macrodef> + + <macrodef name="package-jsr286-ext-test"> + <attribute name="test"/> + <sequential> + <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/> + </sequential> + </macrodef> + + <macrodef name="package-testsuite"> + <attribute name="testsuiteversion"/> + <attribute name="testsuitetype"/> + <attribute name="testsuitename"/> + <sequential> + + <artifact:dependencies pathId="dependency.classpath"> + <dependency + groupId="org.gatein.pc" + artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}" + version="${project.version}" + type="war"/> + </artifact:dependencies> + + <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war"> + <path refid="dependency.classpath"/> + </copy> + + </sequential> + </macrodef> + + <target name="package-tests" depends="prepare_env"> + + <package-tck-test test="portletinterface"/> + <package-tck-test test="dispatcher"/> + <package-tck-test test="portletrequests"/> + <package-tck-test test="portletmode"/> + <package-tck-test test="portletconfig"/> + <package-tck-test test="portletresponses"/> + <package-tck-test test="preferences"/> + <package-tck-test test="portletsession"/> + <package-tck-test test="portleturl"/> + <package-tck-test test="windowstates"/> + <package-tck-test test="portletcontext"/> + <package-api-test test="portletconfig"/> + <package-api-test test="portletmode"/> + <package-api-test test="windowstate"/> + <package-api-test test="portletsessionutil"/> + <package-api-test test="portalcontext"/> + <package-api-test test="portletcontext"/> + <package-api-test test="portleturl"/> + <package-api-test test="portletpreferences"/> + <package-api-test test="portletsession"/> + <package-api-test test="actionrequest"/> + <package-api-test test="renderrequest"/> + <package-api-test test="actionresponse"/> + <package-api-test test="renderresponse"/> + <package-ext-test test="nocache"/> + <package-ext-test test="expiringcache"/> + <package-ext-test test="neverexpiringcache"/> + <package-ext-test test="preferences"/> + <package-ext-test test="session"/> + <package-ext-test test="portletresponses"/> + <package-ext-test test="portletrequests"/> + <package-ext-test test="portletmode"/> + <package-ext-test test="portletconfig"/> + <package-ext-test test="taglib"/> + <package-jsr286-tck-test test="dispatcher"/> + <package-jsr286-tck-test test="portletconfig"/> + <package-jsr286-tck-test test="portletconfignonamespace"/> + <package-jsr286-tck-test test="event"/> + <package-jsr286-tck-test test="eventnonamespace"/> + <package-jsr286-tck-test test="stateawareresponse"/> + <package-jsr286-tck-test test="portletrequests"/> + <package-jsr286-tck-test test="resourceserving"/> + <package-jsr286-tck-test test="portleturl"/> + <package-jsr286-tck-test test="portletfilter"/> + <package-jsr286-tck-test test="taglib"/> + <package-jsr286-tck-test test="userinformation"/> + <package-jsr286-api-test test="event"/> + <package-jsr286-api-test test="portleturl"/> + <package-jsr286-ext-test test="portletrequests"/> + <package-jsr286-ext-test test="portletfilter"/> + <package-jsr286-ext-test test="portletresponses"/> + <package-jsr286-ext-test test="dispatcher"/> + <package-jsr286-ext-test test="portletcontext"/> + <package-jsr286-ext-test test="portletinterface"/> + <package-jsr286-ext-test test="event"/> + <package-jsr286-ext-test test="eventsupport"/> + <package-jsr286-ext-test test="portletmode"/> + <package-jsr286-ext-test test="cache"/> + +  + <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true"> + <path refid="${test.server.name}-${test.server.version}"/> + <path> + <pathelement location="${org.gatein.pc:pc-test-core:jar}"/> + <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/> + </path> + </copy> + <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/> + <war + destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war" + needxmlfile="false"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + </war> + + </target> + + <target name="cargo.setup"> + <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/> + <mkdir dir="${cargo.log.dir}"/> + <taskdef resource="cargo.tasks"> + <classpath> + <pathelement path="${plugin_classpath}"/> + </classpath> + </taskdef> + </target> + + <target name="test.container-servlet"> + <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/> + <antcall target="cargo.start"> + <param name="cargo.wait" value="false"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.remote.server.name}"/> + </antcall> + <antcall target="cargo.stop"/> + </target> + + <target name="tests.remote"> + + <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> + + <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true"> + + <tests config="${target}/test-classes/test/remote-jboss-unit.xml"> + <property name="archivePath" value="${test.temp.lib}"/> + <property name="serverName" value="${test.server.name}"/> + </tests> + + <reports> + <xml toDir="${target}/tests/reports/xml/${test.server.name}"/> + <html toDir="${target}/tests/reports/html/${test.server.name}"/> + </reports> + + <classpath> + <pathelement location="${test.temp.lib}"/> + <pathelement location="${target}/test-classes/test"/> + <pathelement path="${test_classpath}"/> + </classpath> + + </jboss-unit> + + </target> + +</project> Modified: components/pc/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-02-15 13:42:12 UTC (rev 5893) +++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -338,12 +338,6 @@ <configuration> <tasks> - <unjar src="${org.gatein.pc:pc-test-core:jar}" dest="${project.basedir}/target"> - <patternset> - <include name="common.xml"/> - </patternset> - </unjar> - <property name="compile_classpath" refid="maven.compile.classpath" /> <property name="runtime_classpath" refid="maven.runtime.classpath" /> <property name="test_classpath" refid="maven.test.classpath" /> @@ -362,7 +356,7 @@   - <property name="common.xml.file" value="${project.basedir}/target/common.xml" /> + <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" /> <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> <target name="tests" /> Modified: components/pc/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-02-15 13:42:12 UTC (rev 5893) +++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-02-15 16:16:06 UTC (rev 5894) @@ -338,12 +338,6 @@ <configuration> <tasks> - <unjar src="${org.gatein.pc:pc-test-core:jar}" dest="${project.basedir}/target"> - <patternset> - <include name="common.xml"/> - </patternset> - </unjar> - <property name="compile_classpath" refid="maven.compile.classpath" /> <property name="runtime_classpath" refid="maven.runtime.classpath" /> <property name="test_classpath" refid="maven.test.classpath" /> @@ -362,7 +356,7 @@   - <property name="common.xml.file" value="${project.basedir}/target/common.xml" /> + <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" /> <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true"> <target name="tests" />

13 years, 10 months

1
0
0 / 0

gatein SVN: r5893 - components/wci/branches.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-02-15 08:42:12 -0500 (Tue, 15 Feb 2011) New Revision: 5893 Added: components/wci/branches/logout/ Log: This branch is for the development of cross-context logout functionality. Branched off wci trunk at r5892

13 years, 10 months

1
0
0 / 0

gatein SVN: r5892 - components/shindig/tags.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-02-15 07:22:04 -0500 (Tue, 15 Feb 2011) New Revision: 5892 Added: components/shindig/tags/1.0-r790473-Patch05/ Log: Tagging 1.0-r790473-Patch05

13 years, 10 months

1
0
0 / 0

gatein SVN: r5891 - in components/shindig/trunk: features and 6 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2011-02-15 07:16:11 -0500 (Tue, 15 Feb 2011) New Revision: 5891 Modified: components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Preparing for 1.0-r790474-Patch05 release Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/features/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -23,12 +23,12 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version> 1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>shindig-features</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <packaging>jar</packaging> <name>Apache Shindig Features</name> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/java/common/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/java/gadgets/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/java/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -22,11 +22,11 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version> 1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </parent> <artifactId>shindig-parent</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <packaging>pom</packaging> <name>Apache Shindig Project Parent</name> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/java/samples/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch04-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </parent> <artifactId>shindig-samples</artifactId> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/java/server/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/java/social-api/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2011-02-15 09:45:25 UTC (rev 5890) +++ components/shindig/trunk/pom.xml 2011-02-15 12:16:11 UTC (rev 5891) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version> 1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <packaging>pom</packaging> <name>Apache Shindig Project</name> @@ -1234,32 +1234,32 @@ <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> - <version>1.0-r790474-Patch05-SNAPSHOT</version> + <version>1.0-r790474-Patch05</version> <type>test-jar</type> </dependency>

13 years, 10 months

1
0
0 / 0

gatein SVN: r5890 - in components/shindig/trunk/java/gadgets/src: test/java/org/apache/shindig/gadgets/spec and 1 other directory.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2011-02-15 04:45:25 -0500 (Tue, 15 Feb 2011) New Revision: 5890 Modified: components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java Log: GTNPORTAL-1800 support CDATA in message bundle sections Modified: components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java =================================================================== --- components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java 2011-02-15 09:27:31 UTC (rev 5889) +++ components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java 2011-02-15 09:45:25 UTC (rev 5890) @@ -27,6 +27,7 @@ import org.json.JSONObject; import org.w3c.dom.Element; +import org.w3c.dom.Node; import org.w3c.dom.NodeList; import java.io.IOException; @@ -164,7 +165,12 @@ NodeList msgChildren = msg.getChildNodes(); for (int child = 0; child < msgChildren.getLength(); ++child) { try { - htmlSerializer.serialize(msgChildren.item(child), sw); + if (msgChildren.item(child).getNodeType() == Node.CDATA_SECTION_NODE) { + // Workaround to treat CDATA as text. + sw.append(msgChildren.item(child).getTextContent()); + } else { + htmlSerializer.serialize(msgChildren.item(child), sw); + } } catch (IOException e) { throw new SpecParserException("Unexpected error getting value of msg node", new XmlException(e)); Modified: components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java =================================================================== --- components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java 2011-02-15 09:27:31 UTC (rev 5889) +++ components/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/MessageBundleTest.java 2011-02-15 09:45:25 UTC (rev 5890) @@ -84,6 +84,16 @@ assertEquals(ImmutableMap.of("key", "value"), bundle.getMessages()); } + @Test + public void containsCdataSection() throws Exception { + String cdataXml = + "<messagebundle>" + + " <msg name='key'><![CDATA[<span id='foo'>data</span>]]></msg>" + + "</messagebundle>"; + MessageBundle bundle = new MessageBundle(locale, cdataXml); + assertEquals(ImmutableMap.of("key", "<span id='foo'>data</span>"), bundle.getMessages()); + } + @Test(expected = SpecParserException.class) public void missingNameThrows() throws SpecParserException { String xml = "<messagebundle><msg>foo</msg></messagebundle>";

13 years, 10 months

1
0
0 / 0

gatein SVN: r5889 - in portal/branches/wsrp-extraction/wsrp-integration: extension-component and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-02-15 04:27:31 -0500 (Tue, 15 Feb 2011) New Revision: 5889 Modified: portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml portal/branches/wsrp-extraction/wsrp-integration/pom.xml Log: - GTNPORTAL-911: Added resources section in build section of the component pom so that resources are bundled in the jar. Re-ordered list of modules in parent pom. Modified: portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml 2011-02-15 09:25:46 UTC (rev 5888) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml 2011-02-15 09:27:31 UTC (rev 5889) @@ -107,4 +107,12 @@ </dependency> </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + </project> \ No newline at end of file Modified: portal/branches/wsrp-extraction/wsrp-integration/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/pom.xml 2011-02-15 09:25:46 UTC (rev 5888) +++ portal/branches/wsrp-extraction/wsrp-integration/pom.xml 2011-02-15 09:27:31 UTC (rev 5889) @@ -41,9 +41,9 @@ <description>GateIn WSRP Integration extension parent</description> <modules> - <module>extension-ear</module> <module>extension-config</module> + <module>extension-component</module> <module>extension-war</module> - <module>extension-component</module> + <module>extension-ear</module> </modules> </project> \ No newline at end of file

13 years, 10 months

1
0
0 / 0

gatein SVN: r5888 - portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-02-15 04:25:46 -0500 (Tue, 15 Feb 2011) New Revision: 5888 Modified: portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml Log: - GTNPORTAL-911: Remove persistence of JCR configuration so that GateIn will start even if the extension is removed. Modified: portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-02-15 09:00:59 UTC (rev 5887) +++ portal/branches/wsrp-extraction/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2011-02-15 09:25:46 UTC (rev 5888) @@ -33,13 +33,13 @@ <description>JCR configuration file</description> <value>war:/conf/jcr/repository-configuration.xml</value> </value-param> - <properties-param> +  </init-params> </component>

13 years, 10 months

1
0
0 / 0

gatein SVN: r5887 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-02-15 04:00:59 -0500 (Tue, 15 Feb 2011) New Revision: 5887 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_28_EditPortalConfig.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_39_AddNewpageForGroup.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html Log: TESTVN-2484 - Daily tests on GateIn - Clean and improve scripts Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-02-15 07:17:35 UTC (rev 5886) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html 2011-02-15 09:00:59 UTC (rev 5887) @@ -62,6 +62,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Add New Portal</td> <td></td> @@ -492,6 +497,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Site</td> <td></td> @@ -522,6 +532,16 @@ <td></td> </tr> <tr> + <td>verifyTextNotPresent</td> + <td>Test_SNF_PRL_25</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>Test_SNF_PRL_25</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> @@ -531,7 +551,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_28_EditPortalConfig.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_28_EditPortalConfig.html 2011-02-15 07:17:35 UTC (rev 5886) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_28_EditPortalConfig.html 2011-02-15 09:00:59 UTC (rev 5887) @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/div[1]/table/tbody/tr/td/div/div/div/div</td> + <td>//div[@id='UISiteManagement']//a[text()="Add New Portal"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UISiteManagement']/div[1]/table/tbody/tr/td/div/div/div/div</td> + <td>//div[@id='UISiteManagement']//a[text()="Add New Portal"]</td> <td></td> </tr> <tr> @@ -84,7 +84,7 @@ <tr> <td>waitForElementPresent</td> <td>locale</td> - <td>label=French</td> + <td></td> </tr> <tr> <td>select</td> @@ -94,7 +94,7 @@ <tr> <td>waitForElementPresent</td> <td>skin</td> - <td>label=SimpleSkin</td> + <td></td> </tr> <tr> <td>select</td> @@ -108,12 +108,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> + <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td> <td></td> </tr> <tr> @@ -412,6 +412,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Site</td> <td></td> @@ -437,6 +442,16 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Test_SNF_PRL_28</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Test_SNF_PRL_28</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> @@ -446,7 +461,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html 2011-02-15 07:17:35 UTC (rev 5886) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html 2011-02-15 09:00:59 UTC (rev 5887) @@ -457,6 +457,16 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Test_SNF_PRL_31_edit</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Test_SNF_PRL_31_edit</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_39_AddNewpageForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-02-15 07:17:35 UTC (rev 5886) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-02-15 09:00:59 UTC (rev 5887) @@ -258,12 +258,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title="Quick Search"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td>//a[@title="Quick Search"]</td> <td></td> </tr> <tr> @@ -312,6 +312,16 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Test_SNF_PRL_39</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Test_SNF_PRL_39</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> @@ -321,7 +331,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-02-15 07:17:35 UTC (rev 5886) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-02-15 09:00:59 UTC (rev 5887) @@ -52,6 +52,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Group</td> <td></td> @@ -108,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> <td></td> </tr> <tr> @@ -133,16 +138,46 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//tr[2]/td[5]/div/img</td> + <td>searchTerm</td> <td></td> </tr> <tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[@title="Quick Search"]</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//tr[2]/td[5]/div/img</td> + <td>//a[@title="Quick Search"]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> @@ -208,7 +243,7 @@ </tr> <tr> <td>pause</td> - <td>2000</td> + <td>20000</td> <td></td> </tr> <tr> @@ -263,12 +298,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td>//div[2]/div/div/div/div/div/div[1]//div[text()="Page Selector"]</td> <td></td> </tr> <tr> @@ -422,6 +457,16 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Test_SNF_PRL_45_edit</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Test_SNF_PRL_45_edit</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td>

13 years, 10 months

1
0
0 / 0

gatein SVN: r5886 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment: PortletBridge and 1 other directory.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-02-15 02:17:35 -0500 (Tue, 15 Feb 2011) New Revision: 5886 Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml Log: JBEPP-753: Changed references to 5.0 to <VERSION> for future-proofing. Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-02-15 07:05:16 UTC (rev 5885) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-02-15 07:17:35 UTC (rev 5886) @@ -107,7 +107,7 @@ <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Before_You_Start"> <title>Before You Start</title> <para> - The embedded version in the &PRODUCT; is made to be compatible with the JSF implementation, portal and application server that compose the product. You will find the binaries embedded in <filename>jboss-epp-5.0/portletbridge</filename> + The embedded version in the &PRODUCT; is made to be compatible with the JSF implementation, portal and application server that compose the product. You will find the binaries embedded in <filename>jboss-epp-<VERSION>/portletbridge</filename> </para> <para> You can run a provided archetype and deploy the generated <literal>war</literal> or <literal>ear</literal> in a few easy steps.  Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-02-15 07:05:16 UTC (rev 5885) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-02-15 07:17:35 UTC (rev 5886) @@ -128,7 +128,7 @@ This section describes how to deploy a portlet in &PRODUCT;. </para> <para> - An example portlet called <filename>SimplestHelloWorld</filename> is available in the <filename>/jboss-epp-5.0-src/portal/examples/portlets/</filename> directory of the &PRODUCT; sources package or the <filename>jboss-epp-5.0-docs/epp-doc/examples/portlets</filename> directory of the documentation package. + An example portlet called <filename>SimplestHelloWorld</filename> is available in the <filename>/jboss-epp-<VERSION>-src/portal/examples/portlets/</filename> directory of the &PRODUCT; sources package or the <filename>jboss-epp-<VERSION>-docs/epp-doc/examples/portlets</filename> directory of the documentation package. </para> <section id="sect-Reference_Guide-Deploying_your_first_Portlet-Compiling"> <title>Compiling</title> @@ -366,7 +366,7 @@ <formalpara id="form-Reference_Guide-JavaServer_Pages_Portlet_Example-Compiling_the_example"> <title>Compiling the example</title> <para> - The example used in this section is available in the <filename>/jboss-epp-5.0-src/portal/examples/portlets/</filename> directory of the &PRODUCT; sources package or the <filename>/jboss-epp-5.0-docs/epp-doc/examples/portlets</filename> directory of the documentation package. + The example used in this section is available in the <filename>/jboss-epp-<VERSION>-src/portal/examples/portlets/</filename> directory of the &PRODUCT; sources package or the <filename>/jboss-epp-<VERSION>-docs/epp-doc/examples/portlets</filename> directory of the documentation package. </para> </formalpara> <para> @@ -598,7 +598,7 @@ In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. </para> <para> - An example using the JBoss Portlet Bridge is available in the <filename>/jboss-epp-5.0-src/portal/examples/portlets/</filename> directory of the &PRODUCT; sources package or the <filename>/jboss-epp-5.0-docs/epp-doc/examples/portlets</filename> directory of the documentation package. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application. + An example using the JBoss Portlet Bridge is available in the <filename>/jboss-epp-<VERSION>-src/portal/examples/portlets/</filename> directory of the &PRODUCT; sources package or the <filename>/jboss-epp-<VERSION>-docs/epp-doc/examples/portlets</filename> directory of the documentation package. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application. </para> <para> As in any JSF application, the file <literal>faces-config.xml</literal> is required. It must contain the following information:

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2011