From b3e5214dbbe5dfeb356cf38070be3c9e70b95f1f Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Thu, 4 Apr 2013 16:08:15 +0200 Subject: [PATCH] GTNPORTAL-2888 Prepare quickstarts and descriptor for JBoss Tools 4.1.Alpha2 --- .../webui/component/UIHomePagePortlet.gtmpl | 2 +- pom.xml | 5 ++-- src/build/groovy/Packager.groovy | 24 +++++++++---------- .../project-examples-gatein.xml | 14 +++++------ 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/gatein-portal-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl b/gatein-portal-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl index 65e969f1..e650449b 100644 --- a/gatein-portal-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl +++ b/gatein-portal-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl @@ -274,7 +274,7 @@ public static class LinksAndVersions { public static final String gatein_devguide_starting_portlet_project_url = "https://docs.jboss.org/author/display/GTNPORTAL36/Starting+a+Portlet+Project"; public static final String gatein_devguide_url = "https://docs.jboss.org/author/display/GTNPORTAL36/Developer+Guide"; public static final String gatein_docs_url = "https://docs.jboss.org/author/display/GTNPORTAL36"; - public static final String gatein_quickstarts_downloads_url = "https://github.com/downloads/gatein/gatein-portal-quickstart"; + public static final String gatein_quickstarts_downloads_url = "http://downloads.jboss.org/gatein/quickstarts/GateIn-3.6"; public static final String gatein_refguide_pbr_url = "https://docs.jboss.org/author/display/GTNPORTAL36/Reference_Guide/chap-Reference_Guide-Building_JSF_Portlets.html"; public static final String gatein_refguide_portlet_primer_url = "https://docs.jboss.org/author/display/GTNPORTAL36/Portlet+Primer"; public static final String gatein_user_forum_url = "https://community.jboss.org/en/gatein?view=discussions"; diff --git a/pom.xml b/pom.xml index addc1c03..cc6a8b40 100644 --- a/pom.xml +++ b/pom.xml @@ -36,13 +36,14 @@ - 4.0 + 4.1 1.0.0.Alpha01-SNAPSHOT @@ -102,7 +103,7 @@ http://maven.repository.redhat.com/techpreview/all - https://github.com/downloads/gatein/gatein-portal-quickstart + http://download.jboss.org/gatein/quickstarts/${compatibility.portal.projectNameShort}-${compatibility.portal.versionMm} GateIn Forums https://community.jboss.org/en/gatein?view=discussions diff --git a/src/build/groovy/Packager.groovy b/src/build/groovy/Packager.groovy index b471498e..200241b5 100644 --- a/src/build/groovy/Packager.groovy +++ b/src/build/groovy/Packager.groovy @@ -96,8 +96,8 @@ def enhanceProjectDescriptor(xPath, descriptorDom, moduleProject, zipFile, proje String product = project.properties.get("compatibility.portal.projectName"); String productNameShort = project.properties.get("compatibility.portal.projectNameShort"); String majorVersion = project.properties.get("compatibility.portal.versionMajor"); - String downloadsRootUrl = project.properties.get("gatein.quickstarts.downloads.url"); - + String downloadsRootUrl = project.properties.get("gatein.quickstarts.downloads.url").toLowerCase(); + Node projectNode = xPath.evaluate("/projects/project[name/text() = '${moduleProject.artifactId}']", descriptorDom, XPathConstants.NODE) if (projectNode == null) { projectNode = descriptorDom.createElement("project") @@ -113,16 +113,16 @@ def enhanceProjectDescriptor(xPath, descriptorDom, moduleProject, zipFile, proje setTextContent(projectNode, "description", moduleProject.description) setTextContent(projectNode, "size", String.valueOf(zipFile.length())) setTextContent(projectNode, "url", "${downloadsRootUrl}/"+ zipFile.getName()) - - setTextContentByXPath(xPath, "fixes/fix[@type='wtpruntime']/property[@name='description']", + + setTextContentByXPath(xPath, "fixes/fix[@type='wtpruntime']/property[@name='description']", projectNode, "This project example requires ${product} ${majorVersion}.x"); - + String runtimeInfix = productNameShort.equals("GateIn") ? "" : "eap."; setTextContentByXPath( - xPath, - "fixes/fix[@type='wtpruntime']/property[@name='allowed-types']", - projectNode, - "org.jboss.ide.eclipse.as.runtime.${runtimeInfix}"+ + xPath, + "fixes/fix[@type='wtpruntime']/property[@name='allowed-types']", + projectNode, + "org.jboss.ide.eclipse.as.runtime.${runtimeInfix}"+ project.properties.get("compatibility.as.major.version") + project.properties.get("compatibility.as.minor.version") ); @@ -180,11 +180,11 @@ stripMdFile("${project.basedir}/target/assembly-prepare/README.md", COMMENT_PATT String product = project.properties.get("compatibility.portal.projectName"); String productVersion = project.properties.get("compatibility.portal.versionMm"); -String gateinQuickstartsZipPath = "target/assembly/"+ +String gateinQuickstartsZipPath = "target/assembly/"+ project.properties.get("compatibility.portal.projectNameShort") + - "-"+ + "-"+ productVersion +"-Quickstarts.zip"; - + ant.zip ( destfile: gateinQuickstartsZipPath, basedir: "target/assembly-prepare", diff --git a/src/main/project-examples-xml/project-examples-gatein.xml b/src/main/project-examples-xml/project-examples-gatein.xml index 28873978..944b5cad 100644 --- a/src/main/project-examples-xml/project-examples-gatein.xml +++ b/src/main/project-examples-xml/project-examples-gatein.xml @@ -56,7 +56,7 @@ org.jboss.tools.maven.core [1.3.0,2.0) JBoss Maven Tools - org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature + org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature @@ -98,7 +98,7 @@ org.jboss.tools.maven.core [1.3.0,2.0) JBoss Maven Tools - org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature + org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature @@ -140,7 +140,7 @@ org.jboss.tools.maven.core [1.3.0,2.0) JBoss Maven Tools - org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature + org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature @@ -182,7 +182,7 @@ org.jboss.tools.maven.core [1.3.0,2.0) JBoss Maven Tools - org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature + org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature @@ -192,7 +192,7 @@ central - + gatein-portal-extension @@ -224,7 +224,7 @@ org.jboss.tools.maven.core [1.3.0,2.0) JBoss Maven Tools - org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature + org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature @@ -266,7 +266,7 @@ org.jboss.tools.maven.core [1.3.0,2.0) JBoss Maven Tools - org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature,org.jboss.tools.maven.seam.feature + org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature,org.jboss.tools.maven.portlet.feature