GTNPORTAL-2888 Prepare quickstarts and descriptor for JBoss Tools

4.1.Alpha2
jboss-developer · Apr 4, 2013 · b3e5214 · b3e5214
1 parent 31b0947
commit b3e5214
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/...al-extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl b/...al-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
@@ -36,13 +36,14 @@
     </licenses>
 
     <properties>
-        <org.jboss.ide.target.version>4.0</org.jboss.ide.target.version>
+        <org.jboss.ide.target.version>4.1</org.jboss.ide.target.version>
         <org.jboss.bom.gatein-bom.version>1.0.0.Alpha01-SNAPSHOT</org.jboss.bom.gatein-bom.version>
         <!-- descriptor.suffix history:
             GateIn:
              JBT 4.0.0.Alpha1 - <empty>
              JBT 4.0.0.Alpha2 - '-001'
              JBT 4.0.0.Beta1 - '-002'
+             JBT 4.1.0.Alpha2 - '-001'
             JPP:
              JBT 4.0.0.Final - '-001'
         -->
@@ -102,7 +103,7 @@
         <!-- External links used in READMEs -->
         <mvnrepo.redhat.all.url>http://maven.repository.redhat.com/techpreview/all</mvnrepo.redhat.all.url>
 
-        <gatein.quickstarts.downloads.url>https://github.com/downloads/gatein/gatein-portal-quickstart</gatein.quickstarts.downloads.url>
+        <gatein.quickstarts.downloads.url>http://download.jboss.org/gatein/quickstarts/${compatibility.portal.projectNameShort}-${compatibility.portal.versionMm}</gatein.quickstarts.downloads.url>
 
         <gatein.user.forum.label>GateIn Forums</gatein.user.forum.label>
         <gatein.user.forum.url>https://community.jboss.org/en/gatein?view=discussions</gatein.user.forum.url>

diff --git 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
@@ -56,7 +56,7 @@
                 <property name="id">org.jboss.tools.maven.core</property>
                 <property name="versions">[1.3.0,2.0)</property>
                 <property name="description">JBoss Maven Tools</property>
-                <property name="connectorIds">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
+                <property name="connectorIds">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
                 </property>
             </fix>
         </fixes>
@@ -98,7 +98,7 @@
                 <property name="id">org.jboss.tools.maven.core</property>
                 <property name="versions">[1.3.0,2.0)</property>
                 <property name="description">JBoss Maven Tools</property>
-                <property name="connectorIds">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
+                <property name="connectorIds">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
                 </property>
             </fix>
         </fixes>
@@ -140,7 +140,7 @@
                 <property name="id">org.jboss.tools.maven.core</property>
                 <property name="versions">[1.3.0,2.0)</property>
                 <property name="description">JBoss Maven Tools</property>
-                <property name="connectorIds">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
+                <property name="connectorIds">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
                 </property>
             </fix>
         </fixes>
@@ -182,7 +182,7 @@
                 <property name="id">org.jboss.tools.maven.core</property>
                 <property name="versions">[1.3.0,2.0)</property>
                 <property name="description">JBoss Maven Tools</property>
-                <property name="connectorIds">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
+                <property name="connectorIds">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
                 </property>
             </fix>
         </fixes>
@@ -192,7 +192,7 @@
         </importTypeDescription>
         <tags>central</tags>
         <icon path="icons/gatein.png" />
-    </project>    
+    </project>
     <project>
         <category></category>
         <name>gatein-portal-extension</name>
@@ -224,7 +224,7 @@
                 <property name="id">org.jboss.tools.maven.core</property>
                 <property name="versions">[1.3.0,2.0)</property>
                 <property name="description">JBoss Maven Tools</property>
-                <property name="connectorIds">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
+                <property name="connectorIds">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
                 </property>
             </fix>
         </fixes>
@@ -266,7 +266,7 @@
                 <property name="id">org.jboss.tools.maven.core</property>
                 <property name="versions">[1.3.0,2.0)</property>
                 <property name="description">JBoss Maven Tools</property>
-                <property name="connectorIds">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
+                <property name="connectorIds">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
                 </property>
             </fix>
         </fixes>