2:22 p.m.
Author: chris.laprun(a)jboss.com
Date: 2011-08-31 15:22:42 -0400 (Wed, 31 Aug 2011)
New Revision: 7266
Modified:
components/wsrp/trunk/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml
Log:
- Updated to PC 2.3.0-Beta05: removed dependency on pc-mc, fixed ordering of elements in
portlet.xml as new staxnav parsing will silently discard out of order elements.
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-08-31 18:27:04 UTC (rev 7265)
+++ components/wsrp/trunk/pom.xml 2011-08-31 19:22:42 UTC (rev 7266)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
<modelVersion>4.0.0</modelVersion>
@@ -46,7 +47,7 @@
</scm>
<properties>
- <org.gatein.pc.version>2.3.0-Beta03</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-08-31 18:27:04 UTC (rev 7265)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-08-31 19:22:42 UTC (rev 7266)
@@ -22,7 +22,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
+<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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -328,11 +329,12 @@
<scope>test</scope>
<version>${org.gatein.pc.version}</version>
</dependency>
+ <!-- Staxnav needed for PC -->
<dependency>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-mc</artifactId>
+ <groupId>org.staxnav</groupId>
+ <artifactId>staxnav.core</artifactId>
+ <version>0.9.4</version>
<scope>test</scope>
- <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-08-31
18:27:04 UTC (rev 7265)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-08-31
19:22:42 UTC (rev 7266)
@@ -1,3 +1,26 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ 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.
+ -->
+
<assembly>
<id>producer</id>
<formats>
@@ -46,7 +69,7 @@
<include>javax.portlet:portlet-api</include>
<include>org.gatein.pc:pc-controller</include>
- <include>org.gatein.pc:pc-mc</include>
+ <include>org.staxnav:staxnav.core</include>
<include>org.gatein.common:common-common</include>
<include>org.gatein.common:common-logging</include>
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml
===================================================================
---
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml 2011-08-31
18:27:04 UTC (rev 7265)
+++
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml 2011-08-31
19:22:42 UTC (rev 7266)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+ ~ Copyright 2011, Red Hat Middleware, LLC, and individual
~ contributors as indicated by the @authors tag. See the
~ copyright.txt in the distribution for a full listing of
~ individual contributors.
@@ -23,7 +23,7 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="PortletApplicationDeployer"
class="org.gatein.pc.mc.PortletApplicationDeployer">
+ <bean name="PortletApplicationDeployer"
class="org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer">
<alias>PortletApplicationRegistry</alias>
<property name="servletContainerFactory">
<inject bean="ServletContainerFactory"/>
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml
===================================================================
---
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2011-08-31
18:27:04 UTC (rev 7265)
+++
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2011-08-31
19:22:42 UTC (rev 7266)
@@ -50,15 +50,15 @@
<value>prefValue2</value>
</preference>
</portlet-preferences>
+ <supported-processing-event>
+ <qname
xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname>
+ </supported-processing-event>
<supported-publishing-event>
<qname
xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname>
</supported-publishing-event>
<supported-publishing-event>
<qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname>
</supported-publishing-event>
- <supported-processing-event>
- <qname
xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname>
- </supported-processing-event>
<supported-public-render-parameter>zipcode</supported-public-render-parameter>
<supported-public-render-parameter>foo</supported-public-render-parameter>
</portlet>
@@ -69,9 +69,9 @@
</event-definition>
<event-definition>
<qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname>
- <value-type>java.lang.String</value-type>
<alias xmlns:gtn='urn:jboss:gatein'>gtn:bar</alias>
<alias xmlns:gtn='urn:jboss:gatein'>gtn:baz</alias>
+ <value-type>java.lang.String</value-type>
</event-definition>
<public-render-parameter>
@@ -79,9 +79,9 @@
<qname
xmlns:g='urn:jboss:portal:simple:google'>g:zipcode</qname>
</public-render-parameter>
<public-render-parameter>
+ <description>Foo param</description>
<identifier>foo</identifier>
<qname xmlns:gtn='urn:jboss:gatein'>gtn:fooparam</qname>
- <description>Foo param</description>
<alias xmlns:gtn='urn:jboss:gatein'>gtn:barparam</alias>
<alias xmlns:gtn='urn:jboss:gatein'>gtn:bazparam</alias>
</public-render-parameter>