Allow template name to be specified when creating a site.

Author: nscavell

src/main/java/org/gatein/api/Portal.java

@@ -51,10 +51,11 @@ public interface Portal {
      * @throws ApiException if something prevented this operation to succeed
      */
     Site getSite(SiteId siteId);
-    
+
     /**
      * Creates a a site given the <code>SiteId</code>. This site is not saved until
-     * {@link Portal#saveSite(org.gatein.api.site.Site)} is called.
+     * {@link Portal#saveSite(org.gatein.api.site.Site)} is called. Will use the default site template configured by
+     * the portal.
      *
      * @param siteId the site id
      * @return the new site which has not been saved yet.
@@ -64,6 +65,19 @@ public interface Portal {
      */
     Site createSite(SiteId siteId);
 
+    /**
+     * Creates a a site given the <code>SiteId</code>. This site is not saved until
+     * {@link Portal#saveSite(org.gatein.api.site.Site)} is called.
+     *
+     * @param siteId the site id
+     * @param templateName the name of the template to use to create the site
+     * @return the new site which has not been saved yet.
+     * @throws IllegalArgumentException if siteId is null
+     * @throws EntityAlreadyExistsException if the site already exists
+     * @throws ApiException if something prevented this operation to succeed
+     */
+    Site createSite(SiteId siteId, String templateName);
+
     /**
      * Finds sites given the <code>SiteQuery</code>
      *

src/main/java/org/gatein/api/site/Site.java

@@ -129,15 +129,14 @@ public interface Site extends Displayable, Describable, Comparable<Site>, Serial
      */
     public static final class AttributeKeys {
         /**
-         * The site attribute that sets if a session is kept alive or not
+         * The site attribute that sets if a session is kept alive or not. Valid values are 'onDemand', 'always',
+         * and 'never' with the default being 'onDemand'.
          */
-        public static final Attributes.Key<String> SESSION_BEHAVIOR = Attributes.key("org.gatein.api.portal.session_behavior",
-                String.class);
+        public static final Attributes.Key<String> SESSION_BEHAVIOR = Attributes.key("sessionAlive", String.class);
         /**
-         * The site attribute that sets if the info bar is shown by default
+         * The site attribute that sets if the info bar is shown by default when adding applications to pages, default 'false'
          */
-        public static final Attributes.Key<Boolean> SHOW_PORTLET_INFO_BAR = Attributes.key(
-                "org.gatein.api.portal.show_info_bar", Boolean.class);
+        public static final Attributes.Key<Boolean> SHOW_PORTLET_INFO_BAR = Attributes.key("showPortletInfo", Boolean.class);
 
         private AttributeKeys() {
         }