You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2017/01/08 04:48:44 UTC
[2/5] portals-pluto git commit: Modified TCK POM to allow filtering.
Modified the additionalPages.xml files in the TCK to use substitution
variables rather than hard-coded versions in the context paths.
Modified TCK POM to allow filtering. Modified the additionalPages.xml
files in the TCK to use substitution variables rather than hard-coded
versions in the context paths.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/cd97dfd1
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/cd97dfd1
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/cd97dfd1
Branch: refs/heads/master
Commit: cd97dfd19fd8156a64e1907c1867317b7534a1cf
Parents: 92449d1
Author: Scott Nicklous <ms...@apache.org>
Authored: Sat Jan 7 13:23:45 2017 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Sat Jan 7 13:23:45 2017 +0100
----------------------------------------------------------------------
.../xml-resources/tck-TestModule3-pages.xml | 6 ++---
.../resources/xml-resources/additionalPages.xml | 28 ++++++++++----------
.../resources/xml-resources/additionalPages.xml | 20 +++++++-------
.../resources/xml-resources/additionalPages.xml | 12 ++++-----
.../resources/xml-resources/additionalPages.xml | 10 +++----
.../resources/xml-resources/additionalPages.xml | 26 +++++++++---------
.../resources/xml-resources/additionalPages.xml | 28 ++++++++++----------
.../resources/xml-resources/additionalPages.xml | 6 ++---
.../resources/xml-resources/additionalPages.xml | 4 +--
.../resources/xml-resources/additionalPages.xml | 22 +++++++--------
.../resources/xml-resources/additionalPages.xml | 8 +++---
.../resources/xml-resources/additionalPages.xml | 10 +++----
.../resources/xml-resources/additionalPages.xml | 6 ++---
.../resources/xml-resources/additionalPages.xml | 10 +++----
.../xml-resources/plutoPageCombiner.xsl | 2 +-
portlet-tck_3.0/pom.xml | 9 +++++--
16 files changed, 106 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/TestModule3/src/main/resources/xml-resources/tck-TestModule3-pages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule3/src/main/resources/xml-resources/tck-TestModule3-pages.xml b/portlet-tck_3.0/TestModule3/src/main/resources/xml-resources/tck-TestModule3-pages.xml
index 582b71a..d3f1103 100644
--- a/portlet-tck_3.0/TestModule3/src/main/resources/xml-resources/tck-TestModule3-pages.xml
+++ b/portlet-tck_3.0/TestModule3/src/main/resources/xml-resources/tck-TestModule3-pages.xml
@@ -19,7 +19,7 @@ limitations under the License.
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -35,8 +35,8 @@ limitations under the License.
<portlet context="/pluto" name="AboutPortlet"/>
</page>
<page xmlns="" name="TestModule3_2PortletAppsTest" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-TestModule3-Portlet1-3.0-SNAPSHOT" name="TestModule3_Portlet1"/>
-<portlet context="/tck-TestModule3-Portlet2-3.0-SNAPSHOT" name="TestModule3_Portlet2"/>
+<portlet context="/${project.artifactId}-Portlet1-${project.version}" name="TestModule3_Portlet1"/>
+<portlet context="/${project.artifactId}-Portlet2-${project.version}" name="TestModule3_Portlet2"/>
</page>
</render-config>
</pluto-portal-driver>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V2RequestTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2RequestTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V2RequestTests/src/main/resources/xml-resources/additionalPages.xml
index 94101ce..e1f27bb 100644
--- a/portlet-tck_3.0/V2RequestTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V2RequestTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -35,24 +35,24 @@
<portlet context="/pluto" name="AboutPortlet"/>
</page>
<page xmlns="" name="V2RequestTestsRender" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_PortletRequest_ApiRender"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_RenderRequest_ApiRender"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_PortletRequest_ApiRender"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_RenderRequest_ApiRender"/>
</page>
<page xmlns="" name="V2RequestTestsAction" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_PortletRequest_ApiAction"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_ClientDataRequest_ApiAction"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_ActionRequest_ApiAction"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_PortletRequest_ApiAction"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_ClientDataRequest_ApiAction"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_ActionRequest_ApiAction"/>
</page>
<page xmlns="" name="V2RequestTestsEvent" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_PortletRequest_ApiEvent"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_PortletRequest_ApiEvent_event"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_EventRequest_ApiEvent"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_EventRequest_ApiEvent_event"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_PortletRequest_ApiEvent"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_PortletRequest_ApiEvent_event"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_EventRequest_ApiEvent"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_EventRequest_ApiEvent_event"/>
</page>
<page xmlns="" name="V2RequestTestsResource" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_PortletRequest_ApiResource"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_ClientDataRequest_ApiResource"/>
-<portlet context="/tck-V2RequestTests-3.0-SNAPSHOT" name="RequestTests_ResourceRequest_ApiResource"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_PortletRequest_ApiResource"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_ClientDataRequest_ApiResource"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RequestTests_ResourceRequest_ApiResource"/>
</page>
</render-config>
-</pluto-portal-driver>
\ No newline at end of file
+</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/resources/xml-resources/additionalPages.xml
index 9c466ed..6a51cc8 100644
--- a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,15 +32,15 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3AnnotationPortletAppConfigOverrideTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PortletModes"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_WindowStates"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_DefaultNamespaceURI"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_EventConfiguration1"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_EventConfiguration2"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PublicRenderParameters1"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PublicRenderParameters2"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PublicRenderParameters3"/>
-<portlet context="/tck-V3AnnotationPortletAppConfigOverrideTests-3.0-SNAPSHOT" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PortletContainerRuntimeOptions"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PortletModes"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_WindowStates"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_DefaultNamespaceURI"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_EventConfiguration1"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_EventConfiguration2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PublicRenderParameters1"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PublicRenderParameters2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PublicRenderParameters3"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletAppConfigOverrideTests_SPEC1_28_PortletContainerRuntimeOptions"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/src/main/resources/xml-resources/additionalPages.xml
index b41ad38..e32ffd7 100644
--- a/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,11 +32,11 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3AnnotationPortletApplicationConfigTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3AnnotationPortletApplicationConfigTests-3.0-SNAPSHOT" name="AnnotationPortletApplicationConfigTests_SPEC1_28_PortletModes"/>
-<portlet context="/tck-V3AnnotationPortletApplicationConfigTests-3.0-SNAPSHOT" name="AnnotationPortletApplicationConfigTests_SPEC1_28_WindowStates"/>
-<portlet context="/tck-V3AnnotationPortletApplicationConfigTests-3.0-SNAPSHOT" name="AnnotationPortletApplicationConfigTests_SPEC1_28_EventConfiguration"/>
-<portlet context="/tck-V3AnnotationPortletApplicationConfigTests-3.0-SNAPSHOT" name="AnnotationPortletApplicationConfigTests_SPEC1_28_PublicRenderParameters"/>
-<portlet context="/tck-V3AnnotationPortletApplicationConfigTests-3.0-SNAPSHOT" name="AnnotationPortletApplicationConfigTests_SPEC1_28_PortletContainerRuntimeOptions"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletApplicationConfigTests_SPEC1_28_PortletModes"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletApplicationConfigTests_SPEC1_28_WindowStates"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletApplicationConfigTests_SPEC1_28_EventConfiguration"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletApplicationConfigTests_SPEC1_28_PublicRenderParameters"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletApplicationConfigTests_SPEC1_28_PortletContainerRuntimeOptions"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/xml-resources/additionalPages.xml
index 2fc665e..bc97290 100644
--- a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,10 +32,10 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3AnnotationPortletArtifactValidityTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3AnnotationPortletArtifactValidityTests-3.0-SNAPSHOT" name="AnnotationPortletArtifactValidityTests_SPEC3_20_RequestArtifacts"/>
-<portlet context="/tck-V3AnnotationPortletArtifactValidityTests-3.0-SNAPSHOT" name="AnnotationPortletArtifactValidityTests_SPEC3_20_ResponseArtifacts"/>
-<portlet context="/tck-V3AnnotationPortletArtifactValidityTests-3.0-SNAPSHOT" name="AnnotationPortletArtifactValidityTests_SPEC3_20_ParameterArtifacts"/>
-<portlet context="/tck-V3AnnotationPortletArtifactValidityTests-3.0-SNAPSHOT" name="AnnotationPortletArtifactValidityTests_SPEC3_20_PortletArtifacts"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletArtifactValidityTests_SPEC3_20_RequestArtifacts"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletArtifactValidityTests_SPEC3_20_ResponseArtifacts"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletArtifactValidityTests_SPEC3_20_ParameterArtifacts"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletArtifactValidityTests_SPEC3_20_PortletArtifacts"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3AnnotationPortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3AnnotationPortletConfigTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3AnnotationPortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
index f665d73..058a422 100644
--- a/portlet-tck_3.0/V3AnnotationPortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,18 +32,18 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3AnnotationPortletConfigTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletApplicationConfigTests_SPEC1_28_DefaultNamespaceURI"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_PortletContainerRuntimeOptions"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_PortletInitParameters"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_PortletIdentification"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_ResourceBundle"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_CacheSettings"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_SecurityRole"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_PortletDependency"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_EventDeclaration"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_SupportedLocales"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_PortletPreferences"/>
-<portlet context="/tck-V3AnnotationPortletConfigTests-3.0-SNAPSHOT" name="AnnotationPortletConfigTests_SPEC2_28_AsynchronousSupport"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletApplicationConfigTests_SPEC1_28_DefaultNamespaceURI"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_PortletContainerRuntimeOptions"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_PortletInitParameters"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_PortletIdentification"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_ResourceBundle"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_CacheSettings"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_SecurityRole"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_PortletDependency"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_EventDeclaration"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_SupportedLocales"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_PortletPreferences"/>
+<portlet context="/${project.artifactId}-${project.version}" name="AnnotationPortletConfigTests_SPEC2_28_AsynchronousSupport"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3HeaderPortletTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3HeaderPortletTests/src/main/resources/xml-resources/additionalPages.xml
index 61abdae..5e69a15 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3HeaderPortletTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,19 +32,19 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3HeaderPortletTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC3_6_4_HeaderPortlet"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC7_14_RenderRequest"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC14_HeaderAttr"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC14_HeaderReq"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC14_RenderState_ApiHeader"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC15_Header"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC15_HeaderResponse1"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC15_HeaderResponse2"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2"/>
-<portlet context="/tck-V3HeaderPortletTests-3.0-SNAPSHOT" name="HeaderPortletTests_SPEC15_PortletResponse_ApiHeader"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC3_6_4_HeaderPortlet"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC7_14_RenderRequest"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC14_HeaderAttr"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC14_HeaderReq"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC14_RenderState_ApiHeader"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC15_MimeResponse_ApiHeader1"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC15_MimeResponse_ApiHeader2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC15_Header"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC15_HeaderResponse1"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC15_HeaderResponse2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC14_PortletRequest_ApiHeader1"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC14_PortletRequest_ApiHeader2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="HeaderPortletTests_SPEC15_PortletResponse_ApiHeader"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
index aaf0b3b..1b9eaff 100644
--- a/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3PortletConfigTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,8 +32,8 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3PortletConfigTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3PortletConfigTests-3.0-SNAPSHOT" name="PortletConfigTests_Config"/>
-<portlet context="/tck-V3PortletConfigTests-3.0-SNAPSHOT" name="PortletConfigTests_ConfigInit"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletConfigTests_Config"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletConfigTests_ConfigInit"/>
</page>
</render-config>
</pluto-portal-driver>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3PortletContextTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletContextTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3PortletContextTests/src/main/resources/xml-resources/additionalPages.xml
index 4869a2e..67c7054 100644
--- a/portlet-tck_3.0/V3PortletContextTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3PortletContextTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,7 +32,7 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3PortletContextTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3PortletContextTests-3.0-SNAPSHOT" name="PortletContextTests_Context"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletContextTests_Context"/>
</page>
</render-config>
</pluto-portal-driver>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3PortletHubTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3PortletHubTests/src/main/resources/xml-resources/additionalPages.xml
index 34a618c..8906364 100644
--- a/portlet-tck_3.0/V3PortletHubTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,16 +32,16 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3PortletHubTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSPRP_TX"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSPRP_RX"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JS"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSState"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSExc"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSListener"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSURL"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSRS"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSAction"/>
-<portlet context="/tck-V3PortletHubTests-3.0-SNAPSHOT" name="PortletHubTests_SPEC_23_JSPA"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSPRP_TX"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSPRP_RX"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JS"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSState"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSExc"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSListener"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSURL"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSRS"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSAction"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletHubTests_SPEC_23_JSPA"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3PortletParametersTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletParametersTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3PortletParametersTests/src/main/resources/xml-resources/additionalPages.xml
index 060bd71..3ce09f5 100644
--- a/portlet-tck_3.0/V3PortletParametersTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3PortletParametersTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,13 +32,13 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3PortletParametersTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3PortletParametersTests-3.0-SNAPSHOT" name="PortletParametersTests_SPEC11_1"/>
+<portlet context="/${project.artifactId}-${project.version}" name="PortletParametersTests_SPEC11_1"/>
</page>
<page xmlns="" name="V3ActionParametersTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/tck-V3PortletParametersTests-3.0-SNAPSHOT" name="PortletParametersTests_SPEC11_3"/>
+ <portlet context="/${project.artifactId}-${project.version}" name="PortletParametersTests_SPEC11_3"/>
</page>
<page xmlns="" name="V3ResourceParametersTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
- <portlet context="/tck-V3PortletParametersTests-3.0-SNAPSHOT" name="PortletParametersTests_SPEC11_4"/>
+ <portlet context="/${project.artifactId}-${project.version}" name="PortletParametersTests_SPEC11_4"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3RenderStateTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3RenderStateTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3RenderStateTests/src/main/resources/xml-resources/additionalPages.xml
index d26212d..07460bc 100644
--- a/portlet-tck_3.0/V3RenderStateTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3RenderStateTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,10 +32,10 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3RenderStateTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3RenderStateTests-3.0-SNAPSHOT" name="RenderStateTests_SPEC1_12_RenderState"/>
-<portlet context="/tck-V3RenderStateTests-3.0-SNAPSHOT" name="RenderStateTests_SPEC1_12_RenderState2"/>
-<portlet context="/tck-V3RenderStateTests-3.0-SNAPSHOT" name="RenderStateTests_SPEC2_12_MutableRenderState"/>
-<portlet context="/tck-V3RenderStateTests-3.0-SNAPSHOT" name="RenderStateTests_SPEC2_12_MutableRenderState2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RenderStateTests_SPEC1_12_RenderState"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RenderStateTests_SPEC1_12_RenderState2"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RenderStateTests_SPEC2_12_MutableRenderState"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RenderStateTests_SPEC2_12_MutableRenderState2"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/xml-resources/additionalPages.xml
index 4492b3f..5d74c7f 100644
--- a/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,8 +32,8 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3ResourceAsyncTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3ResourceAsyncTests-3.0-SNAPSHOT" name="ResourceAsyncTests_SPEC_21_NoAsync"/>
-<portlet context="/tck-V3ResourceAsyncTests-3.0-SNAPSHOT" name="ResourceAsyncTests_SPEC_21_Async"/>
+<portlet context="/${project.artifactId}-${project.version}" name="ResourceAsyncTests_SPEC_21_NoAsync"/>
+<portlet context="/${project.artifactId}-${project.version}" name="ResourceAsyncTests_SPEC_21_Async"/>
</page>
</render-config>
</pluto-portal-driver>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/V3URLTests/src/main/resources/xml-resources/additionalPages.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3URLTests/src/main/resources/xml-resources/additionalPages.xml b/portlet-tck_3.0/V3URLTests/src/main/resources/xml-resources/additionalPages.xml
index 67e9993..8c50854 100644
--- a/portlet-tck_3.0/V3URLTests/src/main/resources/xml-resources/additionalPages.xml
+++ b/portlet-tck_3.0/V3URLTests/src/main/resources/xml-resources/additionalPages.xml
@@ -19,7 +19,7 @@
-->
<pluto-portal-driver xmlns="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" xmlns:pa="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd http://portals.apache.org/pluto/pluto-portal/1.1/pluto-portal-driver-config.xsd" version="1.1">
<portal-name>pluto-portal-driver</portal-name>
-<portal-version>3.0-SNAPSHOT</portal-version>
+<portal-version>${project.version}</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
<portlet-mode>view</portlet-mode>
@@ -32,10 +32,10 @@
</supports>
<render-config default="About Apache Pluto">
<page xmlns="" name="V3URLTests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-<portlet context="/tck-V3URLTests-3.0-SNAPSHOT" name="BaseURLTests"/>
-<portlet context="/tck-V3URLTests-3.0-SNAPSHOT" name="ActionURLTests"/>
-<portlet context="/tck-V3URLTests-3.0-SNAPSHOT" name="ResourceURLTests"/>
-<portlet context="/tck-V3URLTests-3.0-SNAPSHOT" name="RenderURLTests"/>
+<portlet context="/${project.artifactId}-${project.version}" name="BaseURLTests"/>
+<portlet context="/${project.artifactId}-${project.version}" name="ActionURLTests"/>
+<portlet context="/${project.artifactId}-${project.version}" name="ResourceURLTests"/>
+<portlet context="/${project.artifactId}-${project.version}" name="RenderURLTests"/>
</page>
</render-config>
</pluto-portal-driver>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/driver/src/main/resources/xml-resources/plutoPageCombiner.xsl
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/driver/src/main/resources/xml-resources/plutoPageCombiner.xsl b/portlet-tck_3.0/driver/src/main/resources/xml-resources/plutoPageCombiner.xsl
index 510918b..9a92c5a 100644
--- a/portlet-tck_3.0/driver/src/main/resources/xml-resources/plutoPageCombiner.xsl
+++ b/portlet-tck_3.0/driver/src/main/resources/xml-resources/plutoPageCombiner.xsl
@@ -36,7 +36,7 @@
<portal-name>pluto-portal-driver</portal-name>
- <portal-version>3.0-SNAPSHOT</portal-version>
+ <portal-version>3.0.0</portal-version>
<container-name>Pluto Portal Driver</container-name>
<supports>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/cd97dfd1/portlet-tck_3.0/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/pom.xml b/portlet-tck_3.0/pom.xml
index ea4fd81..1d42737 100644
--- a/portlet-tck_3.0/pom.xml
+++ b/portlet-tck_3.0/pom.xml
@@ -256,8 +256,13 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<webResources>
<webResource>
- <directory>${project.build.directory}/${test.file.dir}</directory>
- <targetPath>${test.file.dir}</targetPath>
+ <filtering>true</filtering>
+ <directory>${project.build.directory}/${test.file.dir}</directory>
+ <includes>
+ <include>${project.artifactId}-pages.xml</include>
+ <include>${project.artifactId}-tests.xml</include>
+ </includes>
+ <targetPath>${test.file.dir}</targetPath>
</webResource>
</webResources>
</configuration>