Author: julien(a)jboss.com Date: 2008-02-22 09:53:58 -0500 (Fri, 22 Feb 2008) New Revision: 10088 Modified: modules/portlet/trunk/bridge/pom.xml modules/portlet/trunk/build/pom.xml modules/portlet/trunk/controller/pom.xml modules/portlet/trunk/docs/pom.xml modules/portlet/trunk/docs/user-guide/pom.xml modules/portlet/trunk/federation/pom.xml modules/portlet/trunk/jsr168api/pom.xml modules/portlet/trunk/management/pom.xml modules/portlet/trunk/pom.xml modules/portlet/trunk/portlet/pom.xml modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java modules/portlet/trunk/test/pom.xml modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java Log: JBPORTAL-1898 : Upgrade JBoss MC to the same version than ASB4 Modified: modules/portlet/trunk/bridge/pom.xml =================================================================== --- modules/portlet/trunk/bridge/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/bridge/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/build/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss Portal Portlet Module</name> <description>JBoss Portal Portlet Module</description> @@ -40,12 +40,12 @@ <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0-Beta1</version.jboss.portal.common> <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web> - <version.jboss.unit>1.2.0-Beta1</version.jboss.unit> + <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> <version.trove>2.1.1</version.trove> - <version.jboss.microcontainer>2.0.0.Beta4</version.jboss.microcontainer> + <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> <version.cargo>0.9-portal</version.cargo> <version.junit>3.8.1</version.junit> <version.xerces>2.7.1</version.xerces> Modified: modules/portlet/trunk/controller/pom.xml =================================================================== --- modules/portlet/trunk/controller/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/controller/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/docs/pom.xml =================================================================== --- modules/portlet/trunk/docs/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/docs/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <artifactId>docs-aggregator</artifactId> Modified: modules/portlet/trunk/docs/user-guide/pom.xml =================================================================== --- modules/portlet/trunk/docs/user-guide/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/docs/user-guide/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -11,7 +11,7 @@ </parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>user-guide-${translation}</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>User_Guide_(${translation})</name> Modified: modules/portlet/trunk/federation/pom.xml =================================================================== --- modules/portlet/trunk/federation/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/federation/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/jsr168api/pom.xml =================================================================== --- modules/portlet/trunk/jsr168api/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/jsr168api/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/management/pom.xml =================================================================== --- modules/portlet/trunk/management/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/management/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/pom.xml =================================================================== --- modules/portlet/trunk/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Portlet Module Aggregator</name> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossportal</url> <dependencies/> Modified: modules/portlet/trunk/portlet/pom.xml =================================================================== --- modules/portlet/trunk/portlet/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/portlet/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-22 14:53:58 UTC (rev 10088) @@ -328,7 +328,7 @@ if (filter.getId().equals(filterRef)) { T filterInstance = filter.instance(type); - if (filterInstance == null) + if (filterInstance != null) { list.add(filterInstance); } Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/test/pom.xml 2008-02-22 14:53:58 UTC (rev 10088) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.portlet</groupId> <artifactId>module-parent</artifactId> - <version>2.0-Beta1</version> + <version>2.0-SNAPSHOT</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-02-22 13:40:29 UTC (rev 10087) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-02-22 14:53:58 UTC (rev 10088) @@ -45,7 +45,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class PortletControllerContextImpl extends AbstractPortletControllerContext + public class PortletControllerContextImpl extends AbstractPortletControllerContext { /** . */