March 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6075 - in portal/trunk: wsrp-integration and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-17 08:54:53 -0400 (Thu, 17 Mar 2011) New Revision: 6075 Modified: portal/trunk/ portal/trunk/wsrp-integration/pom.xml Log: - Re-added all modules to default profile. - Updated svn:ignore properties. Property changes on: portal/trunk ___________________________________________________________________ Modified: svn:ignore - *.iml .idea + *.iml .idea *.ipr Modified: portal/trunk/wsrp-integration/pom.xml =================================================================== --- portal/trunk/wsrp-integration/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) +++ portal/trunk/wsrp-integration/pom.xml 2011-03-17 12:54:53 UTC (rev 6075) @@ -47,7 +47,13 @@ <activation> <activeByDefault>true</activeByDefault> </activation> - <modules/> + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear-as5</module> + <module>extension-ear-as6</module> + </modules> </profile> <profile> <id>pkg-tomcat</id>

13 years, 9 months

1
0
0 / 0

gatein SVN: r6074 - in portal/trunk: packaging/jboss-as5/pkg and 8 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-17 08:38:58 -0400 (Thu, 17 Mar 2011) New Revision: 6074 Added: portal/trunk/wsrp-integration/extension-ear-as5/ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml portal/trunk/wsrp-integration/extension-ear-as6/ portal/trunk/wsrp-integration/extension-ear-as6/pom.xml portal/trunk/wsrp-integration/extension-ear-as6/src/ portal/trunk/wsrp-integration/extension-ear-as6/src/main/ portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/ portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/ portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/gatein-wsse-consumer.xml portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/jboss-scanning.xml Removed: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/pom.xml portal/trunk/wsrp-integration/pom.xml Log: - Renamed extension-ear module to extension-ear-as5 and added new extension-ear-as6 module. - Use profiles to determine which EAR extension should be built and how. - Fixed missing libs in AS 6 packaging. Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-17 10:46:18 UTC (rev 6073) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -806,7 +806,7 @@ <dependency> <?move gatein-wsrp-integration.ear?> <groupId>org.gatein.integration</groupId> - <artifactId>extension-ear</artifactId> + <artifactId>extension-ear-as5</artifactId> <type>ear</type> <version>${project.version}</version> </dependency> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-03-17 10:46:18 UTC (rev 6073) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -798,6 +798,21 @@ <artifactId>wsrp-integration-api</artifactId> <version>${org.gatein.wsrp.version}</version> </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> <dependency> <?context LIB?> @@ -833,7 +848,7 @@ <dependency> <?move gatein-wsrp-integration.ear?> <groupId>org.gatein.integration</groupId> - <artifactId>extension-ear</artifactId> + <artifactId>extension-ear-as6</artifactId> <type>ear</type> <version>${project.version}</version> </dependency> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-03-17 10:46:18 UTC (rev 6073) +++ portal/trunk/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -44,11 +44,11 @@ <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch05</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> - <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> + <org.gatein.common.version>2.0.4-Beta02-SNAPSHOT</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version> <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm> - <org.gatein.wsrp.version>2.1.0-Alpha01</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.1.0-Alpha02-SNAPSHOT</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.5-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> Deleted: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear/pom.xml 2011-03-16 04:47:19 UTC (rev 6039) +++ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -1,193 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>1.0.0-Beta01-SNAPSHOT</version> - </parent> - - <artifactId>extension-ear</artifactId> - <packaging>ear</packaging> - - <name>GateIn WSRP Integration extension EAR</name> - - <dependencies> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <displayName>gatein-wsrp-integration</displayName> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <modules> - <webModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <contextRoot>gatein-wsrp-integration</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <contextRoot>wsrp-producer</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <contextRoot>wsrp-admin-gui</contextRoot> - </webModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </jarModule> - </modules> - </configuration> - </plugin> - </plugins> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> Copied: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml (from rev 6044, portal/trunk/wsrp-integration/extension-ear/pom.xml) =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as5/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -0,0 +1,193 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <artifactId>extension-ear-as5</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR for JBoss AS 5</name> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Added: portal/trunk/wsrp-integration/extension-ear-as6/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as6/pom.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear-as6/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.gatein.integration</groupId> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + + <groupId>org.gatein.integration</groupId> + <artifactId>extension-ear-as6</artifactId> + + <name>GateIn WSRP Integration extension EAR for JBoss AS 6</name> + <packaging>ear</packaging> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> +  + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> \ No newline at end of file Added: portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/gatein-wsse-consumer.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/gatein-wsse-consumer.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -0,0 +1,8 @@ + <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config + http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + +  + +</jboss-ws-security> Added: portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/jboss-scanning.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear-as6/src/main/application/META-INF/jboss-scanning.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -0,0 +1,25 @@ + + +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> \ No newline at end of file Modified: portal/trunk/wsrp-integration/pom.xml =================================================================== --- portal/trunk/wsrp-integration/pom.xml 2011-03-17 10:46:18 UTC (rev 6073) +++ portal/trunk/wsrp-integration/pom.xml 2011-03-17 12:38:58 UTC (rev 6074) @@ -40,10 +40,53 @@ </parent> <description>GateIn WSRP Integration extension parent</description> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear</module> - </modules> + + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules/> + </profile> + <profile> + <id>pkg-tomcat</id> + <modules/> + </profile> + <profile> + <id>pkg-tomcat7</id> + <modules/> + </profile> + <profile> + <id>pkg-jetty</id> + <modules/> + </profile> + <profile> + <id>pkg-jbossas</id> + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear-as5</module> + </modules> + </profile> + <profile> + <id>pkg-jbossas6</id> + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear-as6</module> + </modules> + </profile> + <profile> + <id>pkg-jbossas5</id> + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear-as5</module> + </modules> + </profile> + </profiles> </project> \ No newline at end of file

13 years, 9 months

1
0
0 / 0

gatein SVN: r6073 - portal/trunk/testsuite/testdefinitions.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-03-17 06:46:18 -0400 (Thu, 17 Mar 2011) New Revision: 6073 Added: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods Log: TESTVN-2456 - Update Test Referential with TC PLF 3.5.0-M1 feedback - Add new Added: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods =================================================================== (Binary files differ) Property changes on: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 9 months

1
0
0 / 0

gatein SVN: r6072 - portal/trunk/testsuite/testdefinitions.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-03-17 06:45:46 -0400 (Thu, 17 Mar 2011) New Revision: 6072 Removed: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods Log: TESTVN-2456 - Update Test Referential with TC PLF 3.5.0-M1 feedback - Delete file Deleted: portal/trunk/testsuite/testdefinitions/GateIn_v3.2.x_TechTests_TestDefinition.ods =================================================================== (Binary files differ)

13 years, 9 months

1
0
0 / 0

gatein SVN: r6071 - exo/portal/branches/3.1.x/testsuite.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-03-17 06:43:38 -0400 (Thu, 17 Mar 2011) New Revision: 6071 Added: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods Log: TESTVN-2456 - Update Test Referential with TC PLF 3.5.0-M1 feedback - Add new Added: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods =================================================================== (Binary files differ) Property changes on: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 9 months

1
0
0 / 0

gatein SVN: r6070 - exo/portal/branches/3.1.x/testsuite.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2011-03-17 06:43:10 -0400 (Thu, 17 Mar 2011) New Revision: 6070 Removed: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods Log: TESTVN-2456 - Update Test Referential with TC PLF 3.5.0-M1 feedback - Delete file Deleted: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods =================================================================== (Binary files differ)

13 years, 9 months

1
0
0 / 0

gatein SVN: r6069 - components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-17 06:08:23 -0400 (Thu, 17 Mar 2011) New Revision: 6069 Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java Log: - Added comment to remember to remove when GTNWSRP-90 is fixed. Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java 2011-03-17 09:49:18 UTC (rev 6068) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java 2011-03-17 10:08:23 UTC (rev 6069) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ - * @deprecated Remove when we can use common 2.0.4 + * @deprecated Remove when we can use common 2.0.4 GTNWSRP-90 */ public class Utils {

13 years, 9 months

1
0
0 / 0

gatein SVN: r6068 - portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-17 05:49:18 -0400 (Thu, 17 Mar 2011) New Revision: 6068 Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml Log: - Fixed improper package name for JBoss5WSSServiceIntegration. Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-17 09:48:13 UTC (rev 6067) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-17 09:49:18 UTC (rev 6068) @@ -46,7 +46,7 @@  <component> - <type>org.gatein.portal.wsrp.wss.JBoss5WSSServiceIntegration</type> + <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</type> </component>

13 years, 9 months

1
0
0 / 0

gatein SVN: r6067 - portal/trunk/wsrp-integration/extension-component.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-03-17 05:48:13 -0400 (Thu, 17 Mar 2011) New Revision: 6067 Modified: portal/trunk/wsrp-integration/extension-component/pom.xml Log: - Added provided scope where possible. Modified: portal/trunk/wsrp-integration/extension-component/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-17 09:33:58 UTC (rev 6066) +++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-17 09:48:13 UTC (rev 6067) @@ -56,6 +56,7 @@ <dependency> <groupId>org.gatein.mop</groupId> <artifactId>mop-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> @@ -101,6 +102,7 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId>

13 years, 9 months

1
0
0 / 0

gatein SVN: r6066 - in portal/branches/branch-GTNPORTAL-1832: component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks and 2 other directories.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-03-17 05:33:58 -0400 (Thu, 17 Mar 2011) New Revision: 6066 Modified: portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java portal/branches/branch-GTNPORTAL-1832/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java Log: GTNPORTAL-1799 Should remove space characters in front and behind the strings that use to search Modified: portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-03-17 08:57:06 UTC (rev 6065) +++ portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-03-17 09:33:58 UTC (rev 6066) @@ -244,7 +244,15 @@ { this.save(); // - String ownerIdChunk = ownerId != null ? new MOPFormatter().encodeNodeName(null, ownerId) : "%"; + String ownerIdChunk = "%"; + if (ownerId != null) + { + ownerId = ownerId.trim(); + if (!ownerId.isEmpty()) + { + ownerIdChunk = new MOPFormatter().encodeNodeName(null, ownerId); + } + } // String ownerTypeChunk; @@ -314,7 +322,7 @@ "jcr:path LIKE '" + workspaceChunk + "/" + ownerTypeChunk + "/" + ownerIdChunk + "/mop:rootpage/mop:children/mop:pages/mop:children/%' AND " + "(" + - "LOWER(gtn:name) LIKE '%" + title.toLowerCase() + "%' ESCAPE '\\')"; + "LOWER(gtn:name) LIKE '%" + title.trim().toLowerCase() + "%' ESCAPE '\\')"; } else { Modified: portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java =================================================================== --- portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-03-17 08:57:06 UTC (rev 6065) +++ portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-03-17 09:33:58 UTC (rev 6066) @@ -73,7 +73,7 @@ ObjectType<? extends Site> siteType = null; if (ownerType != null) { - siteType = Mapper.parseSiteType(ownerType); + siteType = Mapper.parseSiteType(ownerType.trim()); } ite = findW(session, siteType, q.getOwnerId(), q.getTitle()); Modified: portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java =================================================================== --- portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java 2011-03-17 08:57:06 UTC (rev 6065) +++ portal/branches/branch-GTNPORTAL-1832/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java 2011-03-17 09:33:58 UTC (rev 6066) @@ -130,7 +130,7 @@ UIFormStringInput input = (UIFormStringInput)quickSearchInput.getChild(0); UIFormSelectBox select = (UIFormSelectBox)quickSearchInput.getChild(1); String name = input.getValue(); - if (name != null && !name.equals("")) + if (name != null && !(name = name.trim()).equals("")) { if (name.indexOf("*") < 0) { Modified: portal/branches/branch-GTNPORTAL-1832/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java =================================================================== --- portal/branches/branch-GTNPORTAL-1832/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-03-17 08:57:06 UTC (rev 6065) +++ portal/branches/branch-GTNPORTAL-1832/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2011-03-17 09:33:58 UTC (rev 6066) @@ -260,7 +260,7 @@ { OrganizationService service = getApplicationComponent(OrganizationService.class); Query q = new Query(); - if (keyword != null && keyword.trim().length() != 0) + if (keyword != null && (keyword = keyword.trim()).length() != 0) { if (keyword.indexOf("*") < 0) { @@ -292,7 +292,7 @@ // remove if user doesn't exist in selected group MembershipHandler memberShipHandler = service.getMembershipHandler(); - if (groupId != null && groupId.trim().length() != 0) + if (groupId != null && (groupId = groupId.trim()).length() != 0) { for (Object user : results) {

13 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2011