June 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6710 - in components/wci/trunk: test and 4 other directories.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-06-22 12:13:21 -0400 (Wed, 22 Jun 2011) New Revision: 6710 Modified: components/wci/trunk/pom.xml components/wci/trunk/test/pom.xml components/wci/trunk/test/portlets/exo-portlet/pom.xml components/wci/trunk/test/portlets/gatein-portlet/pom.xml components/wci/trunk/test/portlets/native-portlet/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml Log: - fix the build - comment out jetty tests Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) +++ components/wci/trunk/pom.xml 2011-06-22 16:13:21 UTC (rev 6710) @@ -153,9 +153,8 @@ <modules> <module>wci</module> <module>exo</module> - <module>tomcat/tomcat6</module> - <module>tomcat/tomcat7</module> - <module>jboss/jboss6</module> + <module>tomcat</module> + <module>jboss</module> <module>jetty</module> <module>test</module> </modules> Modified: components/wci/trunk/test/pom.xml =================================================================== --- components/wci/trunk/test/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) +++ components/wci/trunk/test/pom.xml 2011-06-22 16:13:21 UTC (rev 6710) @@ -41,9 +41,7 @@ <modules> <module>core</module> - <module>portlets/gatein-portlet</module> - <module>portlets/exo-portlet</module> - <module>portlets/native-portlet</module> + <module>portlets</module> <module>servers</module> </modules> Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 16:13:21 UTC (rev 6710) @@ -1,5 +1,4 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 16:13:21 UTC (rev 6710) @@ -1,5 +1,4 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 16:13:21 UTC (rev 6710) @@ -1,5 +1,4 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 16:13:21 UTC (rev 6710) @@ -278,134 +278,134 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> +  +  +  - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit</artifactId> - <version>${version.jboss.unit}</version> - </dependency> +  +  +  +  +  +  +  +  +  +  - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <version>${version.cargo}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - <version>1.3</version> - <executions> - <execution> - <id>integration-testing</id> - <phase>integration-test</phase> - <configuration> - <tasks> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  -  - <property name="project.build.directory" value="${project.build.directory}" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> +  +  +  +  -  -  - <condition property="test.generic.enable"> - <istrue value="${test.generic}" /> - </condition> - <condition property="test.native.enable"> - <istrue value="${test.native}" /> - </condition> - <condition property="test.exo.enable"> - <istrue value="${test.exo}" /> - </condition> - <condition property="test.endpoint.enable"> - <istrue value="${test.endpoint}" /> - </condition> - <condition property="cargo.debug" value="${test.cargo.debug}"> - <isset property="test.cargo.debug" /> - </condition> - <condition property="cargo.debug" value=""> - <not> - <isset property="test.cargo.debug" /> - </not> - </condition> -  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  -  - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" /> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" /> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" /> - <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> - <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" /> - <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" /> - <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" /> - <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> - <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> - <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> - <property name="dependency.gatein-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" /> - <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> - <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> - <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" /> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  -  - <property name="test.archives.directory" value="${project.build.directory}/test-archives" /> - <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" /> - <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" /> - <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" /> +  +  +  +  +  - <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" /> - <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" /> - <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" /> +  +  +  - <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> - <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> - <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> +  +  +  -  - <property name="common.xml.file" value="${test.common.xml}" /> -  +  +  +  -  - <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-6-and-earlier-deployer.war.path}" /> +  +  - <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> - <target name="tests" /> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> +  +  +  +  +  +  +  +  +  +  +  </plugins> </build> <properties>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6709 - in portal/trunk/packaging: jetty and 4 other directories.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-06-22 11:56:14 -0400 (Wed, 22 Jun 2011) New Revision: 6709 Modified: portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/jetty/pom.xml portal/trunk/packaging/pom.xml portal/trunk/packaging/tomcat/integration/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/packaging/tomcat/pom.xml Log: - fixing build Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> + <artifactId>exo.portal.packaging.jetty</artifactId> <version>3.2.0-M02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jetty.pkg</artifactId> Modified: portal/trunk/packaging/jetty/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) +++ portal/trunk/packaging/jetty/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> + <artifactId>exo.portal.packaging</artifactId> <version>3.2.0-M02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jetty</artifactId> Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) +++ portal/trunk/packaging/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) @@ -47,7 +47,7 @@ <module>jboss-as6</module> </modules> </profile> -  + </profile> <profile> <id>pkg-tomcat</id> <modules> Modified: portal/trunk/packaging/tomcat/integration/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/integration/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) +++ portal/trunk/packaging/tomcat/integration/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) @@ -22,7 +22,7 @@ <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> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.web</artifactId> + <artifactId>exo.portal.packaging.tomcat</artifactId> <version>3.2.0-M02-SNAPSHOT</version> </parent> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> + <artifactId>exo.portal.packaging.tomcat</artifactId> <version>3.2.0-M02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.tomcat.pkg</artifactId> @@ -883,12 +883,12 @@ <module>tc7</module> </modules> </profile> -  + </profile> </profiles> </project> Modified: portal/trunk/packaging/tomcat/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) +++ portal/trunk/packaging/tomcat/pom.xml 2011-06-22 15:56:14 UTC (rev 6709) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> + <artifactId>exo.portal.packaging</artifactId> <version>3.2.0-M02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.tomcat</artifactId>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6708 - in components/wci/trunk: jboss/jboss6 and 7 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-06-22 11:34:05 -0400 (Wed, 22 Jun 2011) New Revision: 6708 Modified: components/wci/trunk/jboss/jboss6/pom.xml components/wci/trunk/jboss/pom.xml components/wci/trunk/test/portlets/exo-portlet/pom.xml components/wci/trunk/test/portlets/gatein-portlet/pom.xml components/wci/trunk/test/portlets/native-portlet/pom.xml components/wci/trunk/test/portlets/pom.xml components/wci/trunk/tomcat/pom.xml components/wci/trunk/tomcat/tomcat6/pom.xml components/wci/trunk/tomcat/tomcat7/pom.xml Log: - Fixed improper version number in parent references. Modified: components/wci/trunk/jboss/jboss6/pom.xml =================================================================== --- components/wci/trunk/jboss/jboss6/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/jboss/jboss6/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,29 +1,30 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss6</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI JBoss 6 compatibility component</name> <dependencies> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.web</groupId> - <artifactId>jbossweb</artifactId> - <version>3.0.0-CR1</version> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <version>1.0.0.Final</version> - </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.web</groupId> + <artifactId>jbossweb</artifactId> + <version>3.0.0-CR1</version> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <version>1.0.0.Final</version> + </dependency> </dependencies> </project> Modified: components/wci/trunk/jboss/pom.xml =================================================================== --- components/wci/trunk/jboss/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/jboss/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,8 +1,9 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss</artifactId> Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,12 +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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-exo-portlet</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,12 +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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-gatein-portlet</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Gatein Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,12 +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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-portlet</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/pom.xml =================================================================== --- components/wci/trunk/test/portlets/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/test/portlets/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,8 +1,9 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-portlets</artifactId> Modified: components/wci/trunk/tomcat/pom.xml =================================================================== --- components/wci/trunk/tomcat/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/tomcat/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,8 +1,9 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat</artifactId> Modified: components/wci/trunk/tomcat/tomcat6/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,23 +1,24 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat6</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 6 compatibility component</name> <dependencies> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + </dependency> </dependencies> </project> Modified: components/wci/trunk/tomcat/tomcat7/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-06-22 06:27:43 UTC (rev 6707) +++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-06-22 15:34:05 UTC (rev 6708) @@ -1,24 +1,25 @@ -<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"> +<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> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.0-Beta03-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat7</artifactId> - <version>2.1.0-Beta04-SNAPSHOT</version> + <version>2.1.0-Beta04-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 7 compatibility component</name> <dependencies> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina</artifactId> - <version>7.0.2</version> - </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>7.0.2</version> + </dependency> </dependencies> </project>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6707 - in epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US: modules/Basics and 1 other directory.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-06-22 02:27:43 -0400 (Wed, 22 Jun 2011) New Revision: 6707 Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Book_Info.xml epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Next.xml epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Preface.xml epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Revision_History.xml epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Newsletters.xml epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Sites.xml Log: Updated for 5.1.1; Minor typos; New BZ link Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Book_Info.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Book_Info.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -9,7 +9,7 @@ <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.1</productnumber> <edition>1</edition> - <pubsnumber>5.5</pubsnumber> + <pubsnumber>5.6</pubsnumber> <abstract> <para> This document provides an easy to follow guide to the functions and options available in the Enterprise Portal Platform Site Publisher extension. It is intended to be accessible and useful to both experienced and novice portal users. Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Introduction.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -11,7 +11,7 @@ <section id="sect-User_Guide-Product_Introduction-Site_Content_Structure"> <title>Site Content Structure</title> <para> - While creating a site is a quick process, deciding what content to put into it and how to organize that content can take some time. Therefore, to make managing a site as easy and effective as possible, a site created with Site Publisher will always adhere to a specific structure: + While creating a site is a quick process, deciding what content to put into it and how to organize that content can take some time. Therefore, to make managing a site as easy and effective as possible, a site created with &PRODUCT; will always adhere to a specific structure: </para> <mediaobject> <imageobject role="html"> @@ -129,7 +129,7 @@ <section id="sect-User_Guide-Web_Content-Web_Content"> <title>Web Content</title> <para> - The <emphasis>Web Content</emphasis> is the visual or aural content that is encountered as part of the user experience on a website. It include any or all of the following elements; text, images, sounds, videos and animations. + The <emphasis>Web Content</emphasis> is the visual or aural content that is encountered as part of the user experience on a website. It includes any or all of the following elements; text, images, sounds, videos and animations. </para> </section> Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Next.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Next.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Next.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -1,80 +1,34 @@ -<?xml version='1.0' encoding='utf-8' ?> +<?xml version='1.0' encoding='UTF-8'?> + <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ <!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent"> %BOOK_ENTITIES; ]> <chapter id="chap-User_Guide-Next_Steps"> - <title>Support</title> - <para> - Although this document is intended to provide a thorough explanation of JBoss Enterprise Portal Platform Site Publisher features and terminologies, you may have more questions. The following links will assist you with information about Red Hat's support processes and services. - </para> - <section id="sect-User_Guide-Next_Steps-Product_Support_and_License_Website_Links"> - <title>Product Support and License Website Links</title> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-Red_Hat_JBoss_Customer_Support"> - <title>Red Hat JBoss Customer Support</title> - <para> - <ulink type="http" url="https://access.redhat.com/home " /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-JBoss_Customer_Suport_Portal_Downloads"> - <title>JBoss Customer Suport Portal Downloads</title> - <para> - <ulink type="http" url="https://access.redhat.com/jbossnetwork/restricted/listSoftware.html?produ..." /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-Support_Processes"> - <title>Support Processes</title> - <para> - <ulink url="https://access.redhat.com/support/policy/support_process.html" /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-_Production_Support_Scope_of_Coverage_"> - <title> Production Support Scope of Coverage </title> - <para> - <ulink url="https://access.redhat.com/support/offerings/production/soc.html" /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-_Production_Support_Service_Level_Agreement_"> - <title> Production Support Service Level Agreement </title> - <para> - <ulink url="https://access.redhat.com/support/offerings/production/sla.html" /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-_Developer_Support_Scope_of_Coverage"> - <title> Developer Support Scope of Coverage</title> - <para> - <ulink url="https://access.redhat.com/support/offerings/developer/soc.html" /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-_Developer_Support_Service_Level_Agreement"> - <title> Developer Support Service Level Agreement</title> - <para> - <ulink url="https://access.redhat.com/support/offerings/developer/sla.html" /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-_Product_Update_and_Support_Policy"> - <title> Product Update and Support Policy</title> - <para> - <ulink url="https://access.redhat.com/support/policy/updates/jboss_notes/" /> - </para> - - </formalpara> - <formalpara id="form-User_Guide-Next_Steps-Product_Support_and_License_Website_Links-_JBoss_End_User_License_Agreement"> - <title> JBoss End User License Agreement</title> - <para> - <ulink url="http://www.redhat.com/licenses/jboss_eula.html" /> - </para> - - </formalpara> - - </section> - + <title>Next Steps</title> + <para> + While this User Guide is intended to provide a thorough explanation of features and terminologies within &PRODUCT; you may have more questions or want to get involved, the following links can connect you with resources to learn more and contribute to the open source development process: + </para> + <itemizedlist> + <listitem> + <para> + <ulink url="http://www.exoplatform.com/company/public/website/platform" type="http">Learn more about eXo Platform 3.0</ulink> + </para> + </listitem> + <listitem> + <para> + <ulink url="http://www.exoplatform.com/company/public/website/resource-center" type="http">Video demos, tutorial and more in the eXo Resource Center</ulink> + </para> + </listitem> + <listitem> + <para> + <ulink url="http://wiki.exoplatform.com/xwiki/bin/view/Main/WebHome/" type="http">Access another eXo documents in the eXo Wiki</ulink> + </para> + </listitem> + <listitem> + <para> + <ulink url="http://forums.exoplatform.org/portal/public/classic/forum" type="http">Ask question about eXo Content in the Forums</ulink> + </para> + </listitem> + </itemizedlist> </chapter> - Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Preface.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Preface.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Preface.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -3,10 +3,10 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent"> %BOOK_ENTITIES; ]> -<preface id="pref-User_Guide-Preface"> +<preface id="pref-Install_Guide-Preface"> <title>Preface</title> - -  + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Common_Content/Conventions.xml">  <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Revision_History.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Revision_History.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -7,6 +7,22 @@ <title>Revision History</title> <simpara> <revhistory> + <revision> + <revnumber>1-5.6</revnumber> + <date>Wed June 22 2011</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email>smumford(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Incorporated new Bugzilla feedback link.</member> + <member>Corrected minor typographical errors.</member> + <member>Re-brewed for 5.1.1 Release.</member> + </simplelist> + </revdescription> + </revision> <revision> <revnumber>1-5.5</revnumber> <date>Wed June 01 2011</date> Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Newsletters.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Newsletters.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Newsletters.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -7,7 +7,7 @@ <section id="sect-User_Guide-Newsletters"> <title>Newsletters</title> <para> - Site Publisher provides a newsletter service aimed at helping users quickly get updated news from a website. + &PRODUCT; provides a newsletter service aimed at helping users quickly get updated news from a website. </para> <section id="sect-User_Guide-Newsletters-Newsletter_Viewer"> <title>Newsletter Viewer</title> @@ -82,7 +82,7 @@ <section id="sect-User_Guide-Newsletters-Manage_Newsletters"> <title>Manage Newsletters</title> <para> - Site Publisher allows administrators to easily and quickly manage newsletters. Go to <menuchoice> + &PRODUCT; allows administrators to easily and quickly manage newsletters. Go to <menuchoice> <guimenu>Group</guimenu> <guimenuitem>Newsletters</guimenuitem> </menuchoice> on the administration bar to access the Newsletters functionality. @@ -166,7 +166,7 @@ <textobject> <phrase>Select user</phrase> </textobject> - </inlinemediaobject> icon next to the Moderator field to select a user. The form to selet users will appear. + </inlinemediaobject> icon next to the Moderator field to select a user. The form to select users will appear. </para> <mediaobject> <imageobject role="html"> @@ -782,7 +782,7 @@ <section id="sect-User_Guide-Manage_Newsletters-Newsletters"> <title>Newsletters</title> <para> - Each subscription consists of many newsletters. Site Publisher helps you easily create newsletters by following these steps. + Each subscription consists of many newsletters. &PRODUCT; helps you easily create newsletters by following these steps. </para> <procedure id="proc-User_Guide-Newsletters-Creating_Newsletters"> <title>Creating Newsletters</title> Modified: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Sites.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Sites.xml 2011-06-22 05:38:44 UTC (rev 6706) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/modules/Basics/Sites.xml 2011-06-22 06:27:43 UTC (rev 6707) @@ -11,11 +11,11 @@ </para> <note> <para> - Only administrators have the authorization rights required to create a new site in Site Publisher. + Only administrators have the authorization rights required to create a new site in &PRODUCT;. </para> </note> <para> - Site Publisher administrators can create a site (portal) to meet their specific needs. + &PRODUCT; administrators can create a site (portal) to meet their specific needs. </para> <para> Do the following: @@ -776,7 +776,7 @@ <tbody> <row> <entry><guilabel>Uri</guilabel></entry> - <entry> The node's identification. The Uri is automatically created once a new node has been created. </entry> + <entry> The node's identification. The URI is automatically created once a new node has been created. </entry> </row> <row> <entry><guilabel>Label</guilabel></entry> @@ -988,4 +988,4 @@ </step> </procedure> </section> -</section> \ No newline at end of file +</section>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6706 - epp/docs/branches/5.1/Reference_Guide/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-06-22 01:38:44 -0400 (Wed, 22 Jun 2011) New Revision: 6706 Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml Log: Updated for 5.1.1; Minor typos; New BZ link Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml 2011-06-22 05:26:20 UTC (rev 6705) +++ epp/docs/branches/5.1/Reference_Guide/en-US/Book_Info.xml 2011-06-22 05:38:44 UTC (rev 6706) @@ -5,11 +5,11 @@ ]> <bookinfo id="book-Reference_Guide"> <title>Reference Guide</title> - <subtitle>An in-depth guide to Enterprise Portal Platform &VX;</subtitle> + <subtitle>An in-depth guide to Enterprise Portal Platform &VZ;</subtitle> <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.1</productnumber> <edition>1</edition> - <pubsnumber>5.7</pubsnumber> + <pubsnumber>5.8</pubsnumber> <abstract> <para> This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the JBoss Enterprise Portal Platform product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml 2011-06-22 05:26:20 UTC (rev 6705) +++ epp/docs/branches/5.1/Reference_Guide/en-US/Revision_History.xml 2011-06-22 05:38:44 UTC (rev 6706) @@ -7,6 +7,22 @@ <title>Revision History</title> <simpara> <revhistory> + <revision> + <revnumber>1-5.8</revnumber> + <date>Wed June 22 2011</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email>smumford(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Incorporated new Bugzilla feedback link.</member> + <member>Corrected minor typographical errors.</member> + <member>Re-brewed for 5.1.1 Release.</member> + </simplelist> + </revdescription> + </revision> <revision> <revnumber>1-5.7</revnumber> <date>Mon May 30 2011</date>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6705 - in epp/portal/branches/EPP_5_2_Branch: component/application-registry/src/main/java/org/exoplatform/application and 13 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-06-22 01:26:20 -0400 (Wed, 22 Jun 2011) New Revision: 6705 Added: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/EventQueue.java epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CharSequenceReader.java Removed: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/SampleMixin.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/src/main/java/com/ibatis/jpetstore/persistence/DaoConfig.java epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml Log: JBEPP-986 Thirdparty update Deleted: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.application; - -import org.chromattic.ext.format.AbstractEncodingObjectFormatter; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class AppFormatter extends AbstractEncodingObjectFormatter -{ - - public String getPrefix() - { - return "app:"; - } -} Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -20,15 +20,16 @@ import org.chromattic.api.annotations.*; import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.chromattic.ext.ntdef.NTFolder; -import org.exoplatform.application.AppFormatter; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ @PrimaryType(name = "app:gadgetdefinition") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class GadgetDefinition { Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -20,9 +20,10 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; -import org.exoplatform.application.AppFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.Collection; import java.util.Map; @@ -32,7 +33,8 @@ * @version $Revision$ */ @PrimaryType(name = "app:gadgetregistry") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class GadgetRegistry { Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -23,10 +23,10 @@ import org.apache.shindig.gadgets.spec.ModulePrefs; import org.chromattic.api.annotations.*; import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.chromattic.ext.ntdef.NTFile; import org.chromattic.ext.ntdef.Resource; import org.chromattic.ext.ntdef.NTFolder; -import org.exoplatform.application.AppFormatter; import org.exoplatform.application.gadget.EncodingDetector; @@ -39,7 +39,8 @@ * @version $Revision$ */ @PrimaryType(name = "app:localgadgetdata") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class LocalGadgetData extends GadgetData { Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -19,16 +19,18 @@ package org.exoplatform.application.gadget.impl; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; -import org.exoplatform.application.AppFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ @PrimaryType(name = "app:remotegadgetdata") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class RemoteGadgetData extends GadgetData { Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -21,10 +21,11 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.FormattedBy; import org.chromattic.api.annotations.Name; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.Property; -import org.exoplatform.application.AppFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.exoplatform.portal.pom.config.POMSession; import org.gatein.mop.api.content.ContentType; import org.gatein.mop.api.content.Customization; @@ -39,7 +40,8 @@ * @version $Revision$ */ @PrimaryType(name = "app:category") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class CategoryDefinition { Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -19,7 +19,7 @@ package org.exoplatform.application.registry.impl; import org.chromattic.api.annotations.*; -import org.exoplatform.application.AppFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.exoplatform.portal.pom.config.POMSession; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.workspace.Workspace; @@ -32,7 +32,8 @@ * @version $Revision$ */ @PrimaryType(name = "app:application") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class ContentDefinition { Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -20,9 +20,10 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.FormattedBy; +import org.chromattic.api.annotations.NamingPrefix; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; -import org.exoplatform.application.AppFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import java.util.List; import java.util.Map; @@ -32,7 +33,8 @@ * @version $Revision$ */ @PrimaryType(name = "app:applicationregistry") -(a)FormattedBy(AppFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("app") public abstract class ContentRegistry { @@ -47,7 +49,8 @@ public CategoryDefinition getCategory(String categoryName) { - return getCategoryMap().get(categoryName); + Map<String, CategoryDefinition> categoryMap = getCategoryMap(); + return categoryMap.get(categoryName); } public CategoryDefinition createCategory(String categoryName) Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -355,7 +355,7 @@ if (option != null) { log.debug("Setting Chromattic option " + optionEntry); - builder.setOptionStringValue(option, optionEntry.getValue()); + setOption(builder, option, optionEntry.getValue()); } } @@ -377,6 +377,12 @@ } } + private <D> void setOption(ChromatticBuilder builder, ChromatticBuilder.Option<D> option, String value) + { + log.debug("Setting Chromattic option " + option.getDisplayName()); + builder.setOptionValue(option, option.getInstance(value).getValue()); + } + public final void stop() { // Nothing to do for now Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -25,7 +25,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@PrimaryType(name = "nt:base") +@PrimaryType(name = "nt:unstructured") public abstract class FooEntity { Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-06-22 05:26:20 UTC (rev 6705) @@ -75,7 +75,7 @@ </dependency> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -21,6 +21,7 @@ import org.chromattic.api.ChromatticSession; import org.chromattic.api.UndeclaredRepositoryException; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.exoplatform.commons.chromattic.SessionContext; import org.exoplatform.commons.chromattic.SynchronizationListener; import org.exoplatform.commons.chromattic.SynchronizationStatus; @@ -35,7 +36,6 @@ import org.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.Workspace; import org.gatein.mop.api.workspace.WorkspaceObject; -import org.gatein.mop.core.api.MOPFormatter; import org.gatein.mop.core.api.ModelImpl; import org.gatein.mop.core.api.workspace.NavigationImpl; import org.gatein.mop.core.api.workspace.PageImpl; @@ -239,12 +239,22 @@ return prefs; } + private static final BaseEncodingObjectFormatter formatter = new BaseEncodingObjectFormatter(); + public <O extends WorkspaceObject> Iterator<O> findObjects(ObjectType<O> type, ObjectType<? extends Site> siteType, String ownerId, String title) { this.save(); // - String ownerIdChunk = ownerId != null ? new MOPFormatter().encodeNodeName(null, ownerId) : "%"; + String ownerIdChunk = "%"; + if (ownerId != null) + { + ownerId = ownerId.trim(); + if (!ownerId.isEmpty()) + { + ownerIdChunk = formatter.encodeNodeName(null, ownerId); + } + } // String ownerTypeChunk; Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/spi/portlet/PortletState.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -20,7 +20,7 @@ package org.exoplatform.portal.pom.spi.portlet; import org.chromattic.api.annotations.*; -import org.gatein.mop.core.api.MOPFormatter; +import org.chromattic.ext.format.BaseEncodingObjectFormatter; import org.gatein.mop.core.api.workspace.content.AbstractCustomizationState; import java.util.ArrayList; @@ -32,7 +32,8 @@ * @version $Revision$ */ @PrimaryType(name = "mop:portletpreferences") -(a)FormattedBy(MOPFormatter.class) +(a)FormattedBy(BaseEncodingObjectFormatter.class) +@NamingPrefix("mop") public abstract class PortletState extends AbstractCustomizationState { Copied: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/EventQueue.java (from rev 6274, portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/EventQueue.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/EventQueue.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/EventQueue.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -0,0 +1,67 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.config; + +import junit.framework.Assert; +import org.exoplatform.services.listener.Event; +import org.exoplatform.services.listener.Listener; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +/** @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> */ +public class EventQueue extends Listener +{ + + /** . */ + private final LinkedList<Event> events; + + public EventQueue() + { + this.events = new LinkedList<Event>(); + } + + @Override + public void onEvent(Event event) throws Exception + { + events.add(event); + } + + public void assertSize(int expectedSize) + { + Assert.assertEquals("Was expecting events size to be " + expectedSize + " instead of " + toString(), expectedSize, events.size()); + } + + public void clear() + { + events.clear(); + } + + @Override + public String toString() + { + List<String> tmp = new ArrayList<String>(events.size()); + for (Event event : events) + { + tmp.add("Event[name=" + event.getEventName() + ",data" + event.getData() + "]"); + } + return tmp.toString(); + } +} Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/SampleMixin.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/SampleMixin.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/SampleMixin.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -18,6 +18,7 @@ */ package org.exoplatform.portal.config; +import org.chromattic.api.annotations.DefaultValue; import org.chromattic.api.annotations.MixinType; import org.chromattic.api.annotations.Property; @@ -30,7 +31,8 @@ public abstract class SampleMixin { - @Property(name = "gtn:sampleProperty", defaultValue = {"SampleProperty"}) + @Property(name = "gtn:sampleProperty") + @DefaultValue("SampleProperty") public abstract String getSampleProperty(); public abstract void setSampleProperty(String sampleProperty); Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -64,7 +64,7 @@ end(); } - public void testDirtyWrite() throws Exception + public void _testDirtyWrite() throws Exception { begin(); session = mgr.openSession(); Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -19,6 +19,7 @@ package org.exoplatform.portal.config; +import org.exoplatform.portal.pom.config.POMSession; import static org.exoplatform.portal.pom.config.Utils.split; import junit.framework.AssertionFailedError; @@ -73,8 +74,10 @@ /** . */ private POMSessionManager mgr; - private LinkedList<Event> events; + /** . */ + private EventQueue events; + /** . */ private ListenerService listenerService; public TestDataStorage(String name) @@ -84,33 +87,31 @@ public void setUp() throws Exception { - Listener listener = new Listener() - { - @Override - public void onEvent(Event event) throws Exception - { - events.add(event); - } - }; - - // super.setUp(); PortalContainer container = PortalContainer.getInstance(); storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - events = new LinkedList<Event>(); + POMSession session = mgr.openSession(); listenerService = (ListenerService)container.getComponentInstanceOfType(ListenerService.class); // - listenerService.addListener(DataStorage.PAGE_CREATED, listener); - listenerService.addListener(DataStorage.PAGE_REMOVED, listener); - listenerService.addListener(DataStorage.PAGE_UPDATED, listener); - listenerService.addListener(DataStorage.NAVIGATION_CREATED, listener); - listenerService.addListener(DataStorage.NAVIGATION_REMOVED, listener); - listenerService.addListener(DataStorage.NAVIGATION_UPDATED, listener); - listenerService.addListener(DataStorage.PORTAL_CONFIG_CREATED, listener); - listenerService.addListener(DataStorage.PORTAL_CONFIG_UPDATED, listener); - listenerService.addListener(DataStorage.PORTAL_CONFIG_REMOVED, listener); + if (events == null) + { + events = new EventQueue(); + listenerService.addListener(DataStorage.PAGE_CREATED, events); + listenerService.addListener(DataStorage.PAGE_REMOVED, events); + listenerService.addListener(DataStorage.PAGE_UPDATED, events); + listenerService.addListener(DataStorage.NAVIGATION_CREATED, events); + listenerService.addListener(DataStorage.NAVIGATION_REMOVED, events); + listenerService.addListener(DataStorage.NAVIGATION_UPDATED, events); + listenerService.addListener(DataStorage.PORTAL_CONFIG_CREATED, events); + listenerService.addListener(DataStorage.PORTAL_CONFIG_UPDATED, events); + listenerService.addListener(DataStorage.PORTAL_CONFIG_REMOVED, events); + } + else + { + events.clear(); + } // begin(); @@ -131,8 +132,9 @@ portal.setAccessPermissions(new String[]{UserACL.EVERYONE}); // + events.clear(); storage_.create(portal); - assertEquals(1, events.size()); + events.assertSize(1); portal = storage_.getPortalConfig(portal.getName()); assertNotNull(portal); assertEquals("portal", portal.getType()); @@ -145,9 +147,11 @@ assertNotNull(portal); // + events.clear(); portal.setLocale("vietnam"); storage_.save(portal); - assertEquals(1, events.size()); + events.assertSize(1); + // portal = storage_.getPortalConfig("portal", "test"); assertNotNull(portal); @@ -159,8 +163,9 @@ PortalConfig portal = storage_.getPortalConfig("portal", "test"); assertNotNull(portal); + events.clear(); storage_.remove(portal); - assertEquals(1, events.size()); + events.assertSize(1); assertNull(storage_.getPortalConfig("portal", "test")); try @@ -184,8 +189,9 @@ page.setName("foo"); // + events.clear(); storage_.create(page); - assertEquals(1, events.size()); + events.assertSize(1); // Page page2 = storage_.getPage(page.getPageId()); @@ -210,15 +216,17 @@ page.setShowMaxWindow(false); // + events.clear(); storage_.create(page); - assertEquals(1, events.size()); + events.assertSize(1); // Page page2 = storage_.getPage(page.getPageId()); page2.setTitle("MyTitle2"); page2.setShowMaxWindow(true); + events.clear(); storage_.save(page2); - assertEquals(2, events.size()); + events.assertSize(1); page2 = storage_.getPage(page.getPageId()); assertNotNull(page2); @@ -308,9 +316,10 @@ assertNotNull(page); // + events.clear(); storage_.remove(page); - assertEquals(1, events.size()); - + events.assertSize(1); + // page = storage_.getPage(testPage); assertNull(page); @@ -387,15 +396,17 @@ portal.setName("foo"); portal.setLocale("en"); portal.setAccessPermissions(new String[]{UserACL.EVERYONE}); + events.clear(); storage_.create(portal); - assertEquals(1, events.size()); + events.assertSize(1); // PageNavigation navigation = new PageNavigation(); navigation.setOwnerId("foo"); navigation.setOwnerType("portal"); + events.clear(); storage_.create(navigation); - assertEquals(2, events.size()); + events.assertSize(1); } public void testSaveNavigation() throws Exception @@ -404,8 +415,9 @@ assertNotNull(pageNavi); // + events.clear(); storage_.save(pageNavi); - assertEquals(1, events.size()); + events.assertSize(1); // PageNavigation newPageNavi = storage_.getPageNavigation(pageNavi.getOwnerType(), pageNavi.getOwnerId()); @@ -465,8 +477,9 @@ assertNotNull(navigation); // + events.clear(); storage_.remove(navigation); - assertEquals(1, events.size()); + events.assertSize(1); // navigation = storage_.getPageNavigation("portal", "test"); Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-06-22 05:26:20 UTC (rev 6705) @@ -176,6 +176,16 @@ </component> <component> + <type>org.exoplatform.services.jcr.impl.RepositoryCreationSynchronizer</type> + <init-params> + <value-param> + <name>disabled</name> + <value>false</value> + </value-param> + </init-params> + </component> + + <component> <key>org.exoplatform.services.jcr.RepositoryService</key> <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> </component> Copied: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CharSequenceReader.java (from rev 6274, portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/CharSequenceReader.java) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CharSequenceReader.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CharSequenceReader.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -0,0 +1,162 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.resource; + +/** @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> */ + +import java.io.Reader; +import java.io.Serializable; + +/** + * Fork of commons-io 1.4 org.apache.commons.io.input.CharSequenceReader + * + * {@link Reader} implementation that can read from String, StringBuffer, + * StringBuilder or CharBuffer. + * <p> + * <strong>Note:</strong> Supports {@link #mark(int)} and {@link #reset()}. + * + * @version $Revision$ $Date$ + * @since Commons IO 1.4 + */ +public class CharSequenceReader extends Reader implements Serializable +{ + + private final CharSequence charSequence; + private int idx; + private int mark; + + /** + * Construct a new instance with the specified character sequence. + * + * @param charSequence The character sequence, may be <code>null</code> + */ + public CharSequenceReader(CharSequence charSequence) { + this.charSequence = (charSequence != null ? charSequence : ""); + } + + /** + * Close resets the file back to the start and removes any marked position. + */ + public void close() { + idx = 0; + mark = 0; + } + + /** + * Mark the current position. + * + * @param readAheadLimit ignored + */ + public void mark(int readAheadLimit) { + mark = idx; + } + + /** + * Mark is supported (returns true). + * + * @return <code>true</code> + */ + public boolean markSupported() { + return true; + } + + /** + * Read a single character. + * + * @return the next character from the character sequence + * or -1 if the end has been reached. + */ + public int read() { + if (idx >= charSequence.length()) { + return -1; + } else { + return charSequence.charAt(idx++); + } + } + + /** + * Read the sepcified number of characters into the array. + * + * @param array The array to store the characters in + * @param offset The starting position in the array to store + * @param length The maximum number of characters to read + * @return The number of characters read or -1 if there are + * no more + */ + public int read(char[] array, int offset, int length) { + if (idx >= charSequence.length()) { + return -1; + } + if (array == null) { + throw new NullPointerException("Character array is missing"); + } + if (length < 0 || (offset + length) > array.length) { + throw new IndexOutOfBoundsException("Array Size=" + array.length + + ", offset=" + offset + ", length=" + length); + } + int count = 0; + for (int i = 0; i < length; i++) { + int c = read(); + if (c == -1) { + return count; + } + array[offset + i] = (char)c; + count++; + } + return count; + } + + /** + * Reset the reader to the last marked position (or the beginning if + * mark has not been called). + */ + public void reset() { + idx = mark; + } + + /** + * Skip the specified number of characters. + * + * @param n The number of characters to skip + * @return The actual number of characters skipped + */ + public long skip(long n) { + if (n < 0) { + throw new IllegalArgumentException( + "Number of characters to skip is less than zero: " + n); + } + if (idx >= charSequence.length()) { + return -1; + } + int dest = (int)Math.min(charSequence.length(), (idx + n)); + int count = dest - idx; + idx = dest; + return count; + } + + /** + * Return a String representation of the underlying + * character sequence. + * + * @return The contents of the character sequence + */ + public String toString() { + return charSequence.toString(); + } +} \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/src/main/java/org/exoplatform/portal/resource/CompositeResourceResolver.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -19,7 +19,6 @@ package org.exoplatform.portal.resource; -import org.apache.commons.io.input.CharSequenceReader; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-06-22 05:26:20 UTC (rev 6705) @@ -37,10 +37,22 @@ <target>1.5</target> </configuration> </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/AccountDaoTest.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> <dependencies> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -67,13 +79,13 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.0.4</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>antlr</groupId> @@ -84,7 +96,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> + <version>1.8.3</version> </dependency> <dependency> <groupId>commons-digester</groupId> @@ -100,7 +112,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.0</version> + <version>1.2.1</version> </dependency> <dependency> <groupId>commons-validator</groupId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/src/main/java/com/ibatis/jpetstore/persistence/DaoConfig.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/src/main/java/com/ibatis/jpetstore/persistence/DaoConfig.java 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/src/main/java/com/ibatis/jpetstore/persistence/DaoConfig.java 2011-06-22 05:26:20 UTC (rev 6705) @@ -36,7 +36,7 @@ conn.close(); } } - } catch (Exception e) { + } catch (Throwable e) { throw new RuntimeException("Description. Cause: " + e, e); } Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-06-22 05:26:20 UTC (rev 6705) @@ -48,11 +48,11 @@ <org.gatein.wci.version>2.1.0-Beta03</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> - <org.gatein.wsrp.version>2.1.0.Beta04</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta02</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> - <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> + <org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version> <javax.servlet.version>2.5</javax.servlet.version> <version.chromattic>1.1.0-beta5</version.chromattic> <version.reflect>1.1.0-beta12</version.reflect> @@ -132,11 +132,6 @@ </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.remote</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> <version>${org.exoplatform.kernel.version}</version> <exclusions> @@ -597,9 +592,55 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.5.5</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> - <version>1.2.2</version> + <version>1.4</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -610,17 +651,38 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> + <version>1.3.2</version> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.7</version> + </dependency> + + <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> <version>20070829</version> </dependency> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>javax.resource</groupId> @@ -718,11 +780,11 @@ <artifactId>htmlparser</artifactId> <version>1.0.7</version> </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> <dependency> <groupId>org.gatein.shindig</groupId> @@ -889,7 +951,7 @@ </activation> <dependencies> <dependency> - <groupId>hsqldb</groupId> + <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> @@ -940,6 +1002,12 @@ <version>5.1.6</version> <scope>test</scope> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-06-22 05:25:23 UTC (rev 6704) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-06-22 05:26:20 UTC (rev 6705) @@ -43,12 +43,12 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> + <version>1.3.2</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>2.6</version> </dependency> </dependencies>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6704 - epp/portal/branches/EPP_5_2_Branch/packaging.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-06-22 01:25:23 -0400 (Wed, 22 Jun 2011) New Revision: 6704 Removed: epp/portal/branches/EPP_5_2_Branch/packaging/tomcat/ Log: Remove tomcat packaging

13 years, 6 months

1
0
0 / 0

gatein SVN: r6703 - in epp/docs/branches/5.1/User_Guide/en-US: modules/language and 2 other directories.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-06-22 00:21:58 -0400 (Wed, 22 Jun 2011) New Revision: 6703 Modified: epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml epp/docs/branches/5.1/User_Guide/en-US/modules/language/Multi-Language_Navigation_Nodes.xml epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Functional_Portlets.xml epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml Log: Updated for 5.1.1; Minor typos; New BZ link Modified: epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -3,11 +3,11 @@ %BOOK_ENTITIES; ]><bookinfo id="book-User_Guide-User_Guide"> <title>User Guide</title> - <subtitle>A User Guide for Enterprise Portal Platform &VX;</subtitle> + <subtitle>A User Guide for Enterprise Portal Platform &VZ;</subtitle> <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.1</productnumber> <edition>1</edition> - <pubsnumber>5.3</pubsnumber> + <pubsnumber>5.4</pubsnumber> <abstract> <para> This document provides an easy to follow guide to the functions and Modified: epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -7,6 +7,22 @@ <title>Revision History</title> <simpara> <revhistory> + <revision> + <revnumber>1-5.4</revnumber> + <date>Wed June 22 2011</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email>smumford(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Incorporated new Bugzilla feedback link.</member> + <member>Corrected minor typographical errors.</member> + <member>Re-brewed for 5.1.1 Release.</member> + </simplelist> + </revdescription> + </revision> <revision> <revnumber>1-5.3</revnumber> <date>Wed Jun 01 2011</date> Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/language/Multi-Language_Navigation_Nodes.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/modules/language/Multi-Language_Navigation_Nodes.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/modules/language/Multi-Language_Navigation_Nodes.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -172,7 +172,7 @@ </para> <para> Property files (or XML resource bundles) must be located in: - <emphasis role="bold">WEB-INF/classes/locale/navigation/portal/[portalName]_[2letterCode].properties</emphasis> + <filename>/jboss-as/server/<replaceable><PROFILE></replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/classes/locale/navigation/portal/<replaceable><PORTAL_NAME></replaceable>_<replaceable><LANGUAGE_CODE></replaceable>.properties</filename> </para> </section> Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Navigation_Nodes.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -51,7 +51,7 @@ <term><emphasis role="bold">Uri</emphasis></term> <listitem> <para> - An identification of the node. The Uri is automatically created after adding a new node + An identification of the node. The URI is automatically created after adding a new node </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -100,7 +100,7 @@ </listitem> </varlistentry> <varlistentry> - <term><emphasis role="bold">ToDo</emphasis></term> + <term><emphasis role="bold">Todo</emphasis></term> <listitem> <para> This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. @@ -181,7 +181,7 @@ <procedure> <step> <para> - Obtain the URL (.xml or .rss) of the gadget you wish to add from the gadget source. + Obtain the URL (<emphasis>.xml</emphasis> or <emphasis>.rss</emphasis>) of the gadget you wish to add from the gadget source. </para> <para> The gadgets available at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> provide a link to <emphasis role="bold">View source</emphasis>. Clicking on this link will open a page showing the gadget's XML source. Use the URL of this page in the Dashboard Workspace. The URL should end with <literal>.xml</literal> Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Functional_Portlets.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Functional_Portlets.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Functional_Portlets.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-Functional_Portlets"> <title>Functional Portlets</title> <para> - Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. They are built into the portal and are accessed via toolbar links as required when actioning portal tasks. + Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. They are built into the portal and are accessed via toolbar links as required when undertaking portal tasks. </para> <para> JBoss Enterprise Portal Platform provides the following portlets by default: Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml 2011-06-22 03:07:00 UTC (rev 6702) +++ epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Interface_Portlets.xml 2011-06-22 04:21:58 UTC (rev 6703) @@ -11,7 +11,7 @@ <variablelist> <varlistentry> - <term><emphasis role="bold">HomePage Portlet</emphasis></term> + <term><emphasis role="bold">Homepage Portlet</emphasis></term> <listitem> <para> This Portlet is the home page for a portal. The home page is the first page displayed when you visit the site.

13 years, 6 months

1
0
0 / 0

gatein SVN: r6702 - epp/docs/branches/5.1/Installation_Guide/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-06-21 23:07:00 -0400 (Tue, 21 Jun 2011) New Revision: 6702 Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Add-ons.xml epp/docs/branches/5.1/Installation_Guide/en-US/Book_Info.xml epp/docs/branches/5.1/Installation_Guide/en-US/ClusteringConfiguration.xml epp/docs/branches/5.1/Installation_Guide/en-US/Introduction.xml epp/docs/branches/5.1/Installation_Guide/en-US/Revision_History.xml Log: Updated and staged for 5.1.1 release Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Add-ons.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/Add-ons.xml 2011-06-22 00:06:56 UTC (rev 6701) +++ epp/docs/branches/5.1/Installation_Guide/en-US/Add-ons.xml 2011-06-22 03:07:00 UTC (rev 6702) @@ -9,15 +9,15 @@ <important> <title>Important</title> <para> - Do not read further in this guide if you intend to install theJBoss Site Publisher add-on. + Do not read further in this guide if you intend to install the JBoss Site Publisher add-on. </para> </important> <para> - At this point you should refer to theJBoss Site Publisher Installation Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...."></ulink> and install the add-on. + At this point you should refer to the JBoss Site Publisher Installation Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...."></ulink> and install the add-on. </para> <para> - Once you have completed the installation for theJBoss Site Publisher extension, you should return to this document and continue this process. + Once you have completed the installation for the JBoss Site Publisher extension, you should return to this document and continue this process. </para> -</chapter> \ No newline at end of file +</chapter> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Book_Info.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/Book_Info.xml 2011-06-22 00:06:56 UTC (rev 6701) +++ epp/docs/branches/5.1/Installation_Guide/en-US/Book_Info.xml 2011-06-22 03:07:00 UTC (rev 6702) @@ -5,11 +5,11 @@ ]> <bookinfo id="book-Install_Guide-Install_Guide"> <title>Installation Guide</title> - <subtitle>An Installation Guide for JBoss Enterprise Portal Platform &VX;</subtitle> + <subtitle>An Installation Guide for JBoss Enterprise Portal Platform &VZ;</subtitle> <productname>JBoss Enterprise Portal Platform</productname> <productnumber>5.1</productnumber> <edition>1</edition> - <pubsnumber>5.1</pubsnumber> + <pubsnumber>5.2</pubsnumber> <abstract> <para> This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform. It forms part of the complete document suite along with the <emphasis role="bold">User Guide</emphasis> and <emphasis role="bold">Reference Guide</emphasis> available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." />. Modified: epp/docs/branches/5.1/Installation_Guide/en-US/ClusteringConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/ClusteringConfiguration.xml 2011-06-22 00:06:56 UTC (rev 6701) +++ epp/docs/branches/5.1/Installation_Guide/en-US/ClusteringConfiguration.xml 2011-06-22 03:07:00 UTC (rev 6702) @@ -72,7 +72,7 @@ </listitem> <listitem> <para> - <literal>gatein.jcr.changefilterclass;</literal> + <literal>gatein.jcr.index.changefilterclass;</literal> <itemizedlist> <listitem> <para> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Introduction.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/Introduction.xml 2011-06-22 00:06:56 UTC (rev 6701) +++ epp/docs/branches/5.1/Installation_Guide/en-US/Introduction.xml 2011-06-22 03:07:00 UTC (rev 6702) @@ -18,7 +18,7 @@ <section id="Introduction-Other_Manuals"> <title>Other Manuals</title> <para> - If you are looking for detailed information about other JBoss middleware products such as JBoss Enterprise Applications Platform please refer to the manuals available online at <ulink url="http://docs.redhat.com/docs/en-US/index.html"></ulink>. + If you are looking for detailed information about other JBoss Middleware products such as JBoss Enterprise Applications Platform please refer to the manuals available online at <ulink url="http://docs.redhat.com/docs/en-US/index.html"></ulink>. </para> </section> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/Revision_History.xml 2011-06-22 00:06:56 UTC (rev 6701) +++ epp/docs/branches/5.1/Installation_Guide/en-US/Revision_History.xml 2011-06-22 03:07:00 UTC (rev 6702) @@ -8,7 +8,23 @@ <title>Revision History</title> <simpara> <revhistory> - <revision> + <revision> + <revnumber>1-5.2</revnumber> + <date>Wed June 22 2011</date> + <author> + <firstname>Scott</firstname> + <surname>Mumford</surname> + <email>smumford(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Incorporated new Bugzilla feedback link.</member> + <member>Corrected minor typographical errors.</member> + <member>Re-brewed for 5.1.1 Release.</member> + </simplelist> + </revdescription> + </revision> + <revision> <revnumber>1-5.1</revnumber> <date>Tue Dec 21 2010</date> <author>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6701 - in portal/trunk/packaging: tomcat/pkg and 1 other directory.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-06-21 20:06:56 -0400 (Tue, 21 Jun 2011) New Revision: 6701 Modified: portal/trunk/packaging/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml Log: - disable packaging in release profile to make CI shutup Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2011-06-21 23:29:44 UTC (rev 6700) +++ portal/trunk/packaging/pom.xml 2011-06-22 00:06:56 UTC (rev 6701) @@ -47,7 +47,7 @@ <module>jboss-as6</module> </modules> </profile> - <profile> +  <profile> <id>pkg-tomcat</id> <modules> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-06-21 23:29:44 UTC (rev 6700) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-06-22 00:06:56 UTC (rev 6701) @@ -788,7 +788,7 @@ <?rename integration.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging.tomcat.integration</artifactId> - <version>3.2.0-M02-SNAPSHOT</version> + <version>3.2.0-M01-SNAPSHOT</version> <type>war</type> </dependency> @@ -847,12 +847,12 @@  <copy todir="${project.build.directory}/tomcat"> - <fileset dir="${project.basedir}/src/main/resources/tomcat" /> + <fileset dir="${project.basedir}/src/main/resources/tomcat"/> </copy>  <copy tofile="${project.build.directory}/tomcat/gatein/conf/configuration.properties"> - <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-tomcat.properties" /> + <fileset dir="${project.basedir}/../../../component/common/src/main/java/conf" includes="configuration-tomcat.properties"/> </copy> </target> @@ -883,12 +883,12 @@ <module>tc7</module> </modules> </profile> - <profile> +  </profiles> </project>

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits June 2011