Bug 975920 Part 2: Make JBoss Portal 6.1 Beta quickstarts available on

JDF
jboss-developer · Jun 25, 2013 · d00af9f · d00af9f
1 parent 6b5ffda
commit d00af9f
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 43 deletions.
diff --git a/cdi-generic-portlet/pom.xml b/cdi-generic-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/cdi-jsf-portlet/pom.xml b/cdi-jsf-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
@@ -70,7 +70,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/cdi-scopes-portlet/pom.xml b/cdi-scopes-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- Other dependencies -->
         <pc-portlet.version>2.4.1.Final</pc-portlet.version>
@@ -75,7 +75,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/gatein-portal-extension/ear/pom.xml b/gatein-portal-extension/ear/pom.xml
@@ -41,12 +41,10 @@
         <dependency>
             <artifactId>gatein-portal-extension-config</artifactId>
             <groupId>org.gatein.portal.quickstarts</groupId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <artifactId>gatein-portal-extension-war</artifactId>
             <groupId>org.gatein.portal.quickstarts</groupId>
-            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>

diff --git a/gatein-portal-extension/pom.xml b/gatein-portal-extension/pom.xml
@@ -42,7 +42,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- Plugin versions and settings -->
         <maven.ear.plugin.version>2.5</maven.ear.plugin.version>
@@ -67,10 +67,22 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <artifactId>gatein-portal-extension-config</artifactId>
+                <groupId>org.gatein.portal.quickstarts</groupId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <artifactId>gatein-portal-extension-war</artifactId>
+                <groupId>org.gatein.portal.quickstarts</groupId>
+                <version>${project.version}</version>
+                <type>war</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/gatein-sample-portal/ear/pom.xml b/gatein-sample-portal/ear/pom.xml
@@ -41,18 +41,15 @@
         <dependency>
             <groupId>org.gatein.portal.quickstarts</groupId>
             <artifactId>gatein-sample-portal-config</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gatein.portal.quickstarts</groupId>
             <artifactId>gatein-sample-portal-war</artifactId>
-            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.gatein.portal.quickstarts</groupId>
             <artifactId>gatein-sample-portal-rest-war</artifactId>
-            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>

diff --git a/gatein-sample-portal/pom.xml b/gatein-sample-portal/pom.xml
@@ -44,7 +44,7 @@
         <version.org.gatein>3.6.0.Beta02-SNAPSHOT</version.org.gatein>
 
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
         <!-- <version.org.gatein.common>2.1.0.Final-redhat-1</version.org.gatein.common> -->
         <version.org.gatein.common>2.1.0.Final</version.org.gatein.common>
 
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -89,6 +89,24 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.gatein.portal.quickstarts</groupId>
+                <artifactId>gatein-sample-portal-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gatein.portal.quickstarts</groupId>
+                <artifactId>gatein-sample-portal-war</artifactId>
+                <version>${project.version}</version>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>org.gatein.portal.quickstarts</groupId>
+                <artifactId>gatein-sample-portal-rest-war</artifactId>
+                <version>${project.version}</version>
+                <type>war</type>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

diff --git a/jsf2-hello-world-portlet/pom.xml b/jsf2-hello-world-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
@@ -70,7 +70,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/jsf2-rf4-hello-world-portlet/pom.xml b/jsf2-rf4-hello-world-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/navigation-api-portlet/pom.xml b/navigation-api-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- Other dependencies -->
         <pc-portlet.version>2.4.1.Final</pc-portlet.version>
@@ -73,7 +73,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
 
     <properties>
         <org.jboss.ide.target.nameAndVersion>jbt4.1</org.jboss.ide.target.nameAndVersion>
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
         <!-- descriptor.suffix history:
             GateIn:
              JBT 4.0.0.Alpha1 - <empty>
@@ -189,7 +189,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -287,8 +287,8 @@
                             </includes>
                             <replacements>
                                 <replacement>
-                                    <token>&lt;org.jboss.bom.gatein-bom.version>[^&lt;]*&lt;/org.jboss.bom.gatein-bom.version></token>
-                                    <value>&lt;org.jboss.bom.gatein-bom.version>${org.jboss.bom.gatein-bom.version}&lt;/org.jboss.bom.gatein-bom.version></value>
+                                    <token>&lt;verson.jboss.gatein.bom>[^&lt;]*&lt;/verson.jboss.gatein.bom></token>
+                                    <value>&lt;verson.jboss.gatein.bom>${verson.jboss.gatein.bom}&lt;/verson.jboss.gatein.bom></value>
                                 </replacement>
                             </replacements>
                         </configuration>

diff --git a/simplest-hello-world-portlet/pom.xml b/simplest-hello-world-portlet/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/social-portlets/pom.xml b/social-portlets/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- GateIn Bill of Materials (BOM) version -->
-        <org.jboss.bom.gatein-bom.version>1.0.1.Final</org.jboss.bom.gatein-bom.version>
+        <verson.jboss.gatein.bom>1.0.1.Final</verson.jboss.gatein.bom>
 
         <!-- Versions of social libraries used by portlets. All those libs are available in Maven central -->
         <twitter4j.version>2.2.6</twitter4j.version>
@@ -80,7 +80,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>gatein-3.6-bom</artifactId>
-                <version>${org.jboss.bom.gatein-bom.version}</version>
+                <version>${verson.jboss.gatein.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/...tlets/src/main/java/org/gatein/security/oauth/portlet/facebook/FacebookClientWrapper.java b/...tlets/src/main/java/org/gatein/security/oauth/portlet/facebook/FacebookClientWrapper.java
@@ -52,7 +52,7 @@ public class FacebookClientWrapper {
     private final FacebookClient facebookClient;
 
     FacebookClientWrapper(RenderRequest request, RenderResponse response, PortletContext portletContext, OAuthProvider oauthPr,
-            String accessToken) {
+        String accessToken) {
         this.request = request;
         this.response = response;
         this.portletContext = portletContext;
@@ -72,7 +72,7 @@ public UserWithPicture getMe() throws IOException, PortletException {
      */
     public User getMeWithDetails() throws IOException, PortletException {
         return this.fetchObject("me", User.class,
-                Parameter.with("fields", "id,name,username,first_name,last_name,gender,timezone,locale,email"));
+            Parameter.with("fields", "id,name,username,first_name,last_name,gender,timezone,locale,email"));
     }
 
     /**
@@ -121,7 +121,7 @@ public List<String> getIdsOfFilteredFriends(String filter) throws PortletExcepti
      */
     public List<NamedFacebookType> getPageOfFriends(int offset, int limit) throws PortletException, IOException {
         Connection<NamedFacebookType> con = this.fetchConnection("me/friends", NamedFacebookType.class,
-                Parameter.with("offset", offset), Parameter.with("limit", limit));
+            Parameter.with("offset", offset), Parameter.with("limit", limit));
         if (con != null) {
             return con.getData();
         } else {
@@ -142,7 +142,7 @@ public List<FacebookUserBean> getFriends(final List<String> idsOfFriendsToDispla
         if (idsOfFriendsToDisplay.size() > 0) {
             // Fetch all required friends with obtained ids
             JsonObject friendsResult = this.fetchObjects(idsOfFriendsToDisplay, JsonObject.class,
-                    Parameter.with("fields", "id,name,picture"));
+                Parameter.with("fields", "id,name,picture"));
 
             if (friendsResult == null) {
                 return fbFriends;
@@ -167,9 +167,9 @@ public List<FacebookUserBean> getFriends(final List<String> idsOfFriendsToDispla
      * @return FacebookUserBean with filled status messages
      */
     public FacebookUserBean getStatusesOfPerson(String friendId, String myId, AccessToken accessToken) throws PortletException,
-            IOException {
+        IOException {
         Connection<StatusMessage> statusMessageConnection = this.fetchConnection(friendId + "/statuses", StatusMessage.class,
-                Parameter.with("limit", 5));
+            Parameter.with("limit", 5));
         if (statusMessageConnection == null) {
             return null;
         }
@@ -192,7 +192,7 @@ public FacebookUserBean getStatusesOfPerson(String friendId, String myId, Access
             }
         } else {
             NamedFacebookType currentFriendToDisplay = this.fetchObject(friendId, NamedFacebookType.class,
-                    Parameter.with("fields", "id,name"));
+                Parameter.with("fields", "id,name"));
             if (currentFriendToDisplay != null) {
                 ffb.setName(currentFriendToDisplay.getName());
             }
@@ -202,9 +202,9 @@ public FacebookUserBean getStatusesOfPerson(String friendId, String myId, Access
     }
 
     private <T> T fetchObject(final String object, final Class<T> objectType, final Parameter... parameters)
-            throws PortletException, IOException {
+        throws PortletException, IOException {
         FacebookPortletRequest<T> facebookRequest = new FacebookPortletRequest<T>(request, response, portletContext,
-                oauthProvider) {
+            oauthProvider) {
 
             @Override
             protected T invokeRequest() throws FacebookException {
@@ -216,9 +216,9 @@ protected T invokeRequest() throws FacebookException {
     }
 
     private <T> Connection<T> fetchConnection(final String connection, final Class<T> connectionType,
-            final Parameter... parameters) throws PortletException, IOException {
+        final Parameter... parameters) throws PortletException, IOException {
         FacebookPortletRequest<Connection<T>> facebookRequest = new FacebookPortletRequest<Connection<T>>(request, response,
-                portletContext, oauthProvider) {
+            portletContext, oauthProvider) {
 
             @Override
             protected Connection<T> invokeRequest() throws FacebookException {
@@ -230,9 +230,9 @@ protected Connection<T> invokeRequest() throws FacebookException {
     }
 
     private <T> T fetchObjects(final List<String> objects, final Class<T> objectType, final Parameter... parameters)
-            throws PortletException, IOException {
+        throws PortletException, IOException {
         FacebookPortletRequest<T> facebookRequest = new FacebookPortletRequest<T>(request, response, portletContext,
-                oauthProvider) {
+            oauthProvider) {
 
             @Override
             protected T invokeRequest() throws FacebookException {

diff --git a/src/build/groovy/FreeMarkerMerger.groovy b/src/build/groovy/FreeMarkerMerger.groovy
@@ -308,7 +308,7 @@ model.putModel(project);
 model.putModel("parent", project);
 model.putString("derivedFileNotice", "Do not edit this derived file! See ${project.artifactId}/src/main/freemarker/");
 
-model.putProperties(session, "org.jboss.bom", "gatein-3.6-bom", project.getProperties().get("org.jboss.bom.gatein-bom.version"));
+model.putProperties(session, "org.jboss.bom", "gatein-3.6-bom", project.getProperties().get("verson.jboss.gatein.bom"));
 Properties topProperties = project.getProperties();
 model.putProperties(topProperties);