10:51 p.m.
Author: kien_nguyen
Date: 2011-08-02 23:51:37 -0400 (Tue, 02 Aug 2011)
New Revision: 6987
Added:
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem
Removed:
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/exokey.pem
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/oauthkey.pem
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/exokey.pem
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/oauthkey.pem
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem
Modified:
portal/trunk/
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoOAuthModule.java
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java
Log:
merge branch branch-GTNPORTAL-1963 of portal sprint 57 into trunk
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_Branch:6841
/portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/branch-GTNPORTAL-1872:6327-6594
/portal/branches/branch-GTNPORTAL-1921:6597-6803
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
+ /epp/portal/branches/EPP_5_1_Branch:6841
/portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/branch-GTNPORTAL-1872:6327-6594
/portal/branches/branch-GTNPORTAL-1921:6597-6803
/portal/branches/branch-GTNPORTAL-1963:6902-6986
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-08-03
03:51:37 UTC (rev 6987)
@@ -62,5 +62,6 @@
# Global portlet.xml
gatein.portlet.config=${gatein.conf.dir}/portlet.xml
-# Web
-gatein.web.compressor.js.level=simple
\ No newline at end of file
+# key files for gadget
+gatein.gadgets.securityTokenKeyFile=${gatein.conf.dir}/gadgets/key.txt
+gatein.gadgets.signingKeyFile=${gatein.conf.dir}/gadgets/oauthkey.pem
\ No newline at end of file
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-08-03
03:51:37 UTC (rev 6987)
@@ -65,5 +65,6 @@
# Global portlet.xml
gatein.portlet.config=${gatein.conf.dir}/portlet.xml
-# Web
-gatein.web.compressor.js.level=simple
\ No newline at end of file
+# Key files for gadget
+gatein.gadgets.securityTokenKeyFile=${gatein.conf.dir}/gadgets/key.txt
+gatein.gadgets.signingKeyFile=${gatein.conf.dir}/gadgets/oauthkey.pem
\ No newline at end of file
Modified:
portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
===================================================================
---
portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/docs/reference-guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-08-03
03:51:37 UTC (rev 6987)
@@ -8,7 +8,7 @@
<section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Overview">
<title>Overview</title>
<para>
- There are three types of navigation available to portal users:
+ There are three navigation types available to portal users:
</para>
<itemizedlist>
<listitem>
@@ -28,134 +28,303 @@
</listitem>
</itemizedlist>
<para>
- These navigations are configured using standard XML syntax in the file;
"<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
+ These navigations are configured using the standard XML syntax in the file;
"<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
</para>
-<programlisting role="XML"><component>
-
<key>org.exoplatform.portal.config.UserPortalConfigService</key>
-
<type>org.exoplatform.portal.config.UserPortalConfigService</type>
- <component-plugins>
- <component-plugin>
- <name>new.portal.config.user.listener</name>
- <set-method>initListener</set-method>
-
<type>org.exoplatform.portal.config.NewPortalConfigListener</type>
- <description>this listener init the portal
configuration</description>
- <init-params>
- <value-param>
- <name>default.portal</name>
- <description>The default portal for checking db is empty or
not</description>
- <value>classic</value>
- </value-param>
- <object-param>
- <name>portal.configuration</name>
- <description>description</description>
- <object
type="org.exoplatform.portal.config.NewPortalConfig">
- <field name="predefinedOwner">
- <collection type="java.util.HashSet">
-
<value><string>classic</string></value>
-
<value><string>webos</string></value>
- </collection>
- </field>
- <field
name="ownerType"><string>portal</string></field>
- <field
name="templateLocation"><string>war:/conf/portal</string></field>
- </object>
- </object-param>
- <object-param>
- <name>group.configuration</name>
- <description>description</description>
- <object
type="org.exoplatform.portal.config.NewPortalConfig">
- <field name="predefinedOwner">
- <collection type="java.util.HashSet">
-
<value><string>platform/administrators</string></value>
-
<value><string>platform/users</string></value>
-
<value><string>platform/guests</string></value>
-
<value><string>organization/management/executive-board</string></value>
- </collection>
- </field>
- <field
name="ownerType"><string>group</string></field>
- <field
name="templateLocation"><string>war:/conf/portal</string></field>
- </object>
- </object-param>
- <object-param>
- <name>user.configuration</name>
- <description>description</description>
- <object
type="org.exoplatform.portal.config.NewPortalConfig">
- <field name="predefinedOwner">
- <collection type="java.util.HashSet">
-
<value><string>root</string></value>
-
<value><string>john</string></value>
-
<value><string>mary</string></value>
-
<value><string>demo</string></value>
- </collection>
- </field>
- <field
name="ownerType"><string>user</string></field>
- <field
name="templateLocation"><string>war:/conf/portal</string></field>
- </object>
- </object-param>
- </init-params>
- </component-plugin>
-</component-plugins>
+<programlisting role="XML"><![CDATA[<component>
+ <key>org.exoplatform.portal.config.UserPortalConfigService</key>
+ <type>org.exoplatform.portal.config.UserPortalConfigService</type>
+ <component-plugins>
+ <component-plugin>
+ <name>new.portal.config.user.listener</name>
+ <set-method>initListener</set-method>
+ <type>org.exoplatform.portal.config.NewPortalConfigListener
+ </type>
+ <description>this listener init the portal configuration
+ </description>
+ <init-params>
+ <value-param>
+ <name>default.portal</name>
+ <description>The default portal for checking db is empty or
not</description>
+ <value>classic</value>
+ </value-param>
+ <value-param>
+ <name>page.templates.location</name>
+ <description>the path to the location that contains Page
templates</description>
+ <value>war:/conf/portal/template/pages</value>
+ </value-param>
+ <value-param>
+ <name>override</name>
+ <description>The flag parameter to decide if portal metadata is
overriden on restarting server
+ </description>
+ <value>false</value>
+ </value-param>
+ <object-param>
+ <name>site.templates.location</name>
+ <description>description</description>
+ <object
type="org.exoplatform.portal.config.SiteConfigTemplates">
+ <field name="location">
+ <string>war:/conf/portal</string>
+ </field>
+ <field name="portalTemplates">
+ <collection type="java.util.HashSet">
+ <value><string>basic</string></value>
+ <value><string>classic</string></value>
+ </collection>
+ </field>
+ <field name="groupTemplates">
+ <collection type="java.util.HashSet">
+ <value><string>group</string></value>
+ </collection>
+ </field>
+ <field name="userTemplates">
+ <collection type="java.util.HashSet">
+ <value><string>user</string></value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ <object-param>
+ <name>portal.configuration</name>
+ <description>description</description>
+ <object
type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>classic</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>portal</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal/</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param>
+ <name>group.configuration</name>
+ <description>description</description>
+ <object
type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+
<value><string>/platform/administrators</string></value>
+
<value><string>/platform/users</string></value>
+
<value><string>/platform/guests</string></value>
+
<value><string>/organization/management/executive-board</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>group</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+ </object-param>
+ <object-param>
+ <name>user.configuration</name>
+ <description>description</description>
+ <object
type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>root</string></value>
+ <value><string>john</string></value>
+ <value><string>mary</string></value>
+ <value><string>demo</string></value>
+ <value><string>user</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>user</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </component-plugins>
+</component>]]>
</programlisting>
- <para>
- This XML configuration defines where in the portal's war to look for
configuration, and what portals, groups, and user specific views
- to include in portal/group/user navigation. Those files will be used to create
an initial navigation, the first time the portal is launched.
- That information will then be stored in JCR content repository, and can then be
modified, and managed from the portal UI.
- </para>
+<para>
+ This XML configuration defines where in the portal's war to look for configuration,
and which portals, groups, and user specific views
+ to include in <literal>portal/group/user</literal> navigation. Those files
will be used to create an initial navigation when the portal is launched in the first
time.
+ That information will then be stored in the JCR content repository, and can then be
modified and managed from the portal UI.
+ </para>
+
+<para>
+Each portal, groups and users navigation is indicated by a configuration paragraph, for
example:
+
+<programlistingco>
+ <areaspec>
+ <area coords="5"
id="area-Reference_Guide.Portalconf.predifinedOwner" />
+ <area coords="10"
id="area-Reference_Guide.Portalconf.ownerType" />
+ <area coords="13"
id="area-Reference_Guide.Portalconf.templateLocation" />
+ <area coords="16"
id="area-Reference_Guide.Portalconf.importMode" />
+ </areaspec>
+<programlisting language="xml"><![CDATA[<object-param>
+ <name>portal.configuration</name>
+ <description>description</description>
+ <object type="org.exoplatform.portal.config.NewPortalConfig">
+ <field name="predefinedOwner">
+ <collection type="java.util.HashSet">
+ <value><string>classic</string></value>
+ </collection>
+ </field>
+ <field name="ownerType">
+ <string>portal</string>
+ </field>
+ <field name="templateLocation">
+ <string>war:/conf/portal/</string>
+ </field>
+ <field name="importMode">
+ <string>conserve</string>
+ </field>
+ </object>
+</object-param>]]>
+</programlisting>
+</programlistingco>
+
+<calloutlist>
+ <callout arearefs="area-Reference_Guide.Portalconf.predifinedOwner">
+ <para>
+ <emphasis> predefinedOwner</emphasis> define the navigation owner,
portal will look for the configuration files in folder with this name, if there is no
suiable folder, a default portal will be created with name is this value.
+ </para>
+ </callout>
+ <callout arearefs="area-Reference_Guide.Portalconf.ownerType">
+ <para>
+ <emphasis> ownerType</emphasis> define the type of portal navigation.
It may be a portal, group or user
+ </para>
+ </callout>
+ <callout
arearefs="area-Reference_Guide.Portalconf.templateLocation">
+ <para>
+ <emphasis> templateLocation</emphasis> the classpath where contains all
portal configuration files
+ </para>
+ </callout>
+ <callout arearefs="area-Reference_Guide.Portalconf.importMode">
+ <para>
+ <emphasis> importMode</emphasis> The mode for navigation import. There
are 4 types of import mode:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <emphasis>conserve</emphasis>: Import data when it does not exist,
otherwise do nothing.
+ </listitem>
+ <listitem>
+ <emphasis>insert</emphasis>: Import data when it does not exist,
otherwise performs a strategy that adds new data only.
+ </listitem>
+ <listitem>
+ <emphasis>merge</emphasis>: Import data when it does not exist, update
data when it exists.
+ </listitem>
+ <listitem>
+ <emphasis>rewrite</emphasis>: Overwrite data whatsoever.
+ </listitem>
+ </itemizedlist>
+ </callout>
+</calloutlist>
+ </para>
+
+ <para>
+Base on these parameters, portal will look for the configuration files and create a
relevant portal navigation, pages and data import strategy. The portal configuration files
will be stored in folders with path look like
<literal>{templateLocation}/{ownerType}/{predefinedOwner}</literal>, all
navigations are defined in the <literal>navigation.xml</literal> file, pages
are defined in pages.xml and portal configuration is defined in
<literal>{ownerType}.xml</literal>.
+For example, with the above configuration, prtal will look for all configuration files
from <literal>war:/conf/portal/portal/classic path.</literal>
+ </para>
</section>
<section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation">
<title>Portal Navigation</title>
<para>
- The portal navigation incorporates the pages that can be accessed even when a user is
not logged in
- (assuming the applicable permissions allow public access). For example; several
portal navigations are used
- when a company owns multiple trademarks, and sets up a web site for each of
them.
+ The portal navigation incorporates the pages that can be accessed even when the user is
not logged in assuming the applicable permissions allow the public access). For example,
several portal navigations are used when a company owns multiple trademarks, and sets up a
website for each of them.
</para>
<para>
- The <emphasis role="bold">classic</emphasis> portal is
configured by four XML files in
<filename>02portal.war:/WEB-INF/conf/portal/portal/classic</filename>
directory:
+ The <emphasis role="bold">classic</emphasis> portal is
configured by four XML files in the
<filename>02portal.war:/WEB-INF/conf/portal/portal/classic</filename>
directory:
</para>
<variablelist>
<varlistentry>
<term>portal.xml</term>
<listitem>
<para>
- This file describes the layout and portlets that will be shown on all pages.
Usually the layout contains the banner, footer, menu and breadcrumbs portlets.
+ This file describes the layout and portlets that will be shown on all pages. The
layout usually contains the banner, footer, menu and breadcrumbs portlets.
&PRODUCT; is extremely configurable as every view element (even the
banner and footer) is a portlet.
</para>
-<programlisting role="XML"><?xml version="1.0"
encoding="ISO-8859-1"?>
-<portal-config>
- <portal-name>classic</portal-name>
- <locale>en</locale>
- <factory-id>office</factory-id>
- <access-permissions>Everyone</access-permissions>
-
<edit-permission>*:/platform/administrators</edit-permission>
- <creator>root</creator>
-
- <portal-layout>
- <application>
-
<instance-id>portal#classic:/web/BannerPortlet/banner</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- <application>
-
<instance-id>portal#classic:/web/NavigationPortlet/toolbar</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
-
- <application>
-
<instance-id>portal#classic:/web/BreadcumbsPortlet/breadcumbs</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
+<programlisting role="XML"><![CDATA[<portal-config
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0
http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+ <portal-name>classic</portal-name>
+ <locale>en</locale>
+ <access-permissions>Everyone</access-permissions>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <properties>
+ <entry key="sessionAlive">onDemand</entry>
+ <entry key="showPortletInfo">1</entry>
+ </properties>
+
+ <portal-layout>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>BannerPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>template</name>
+
<value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>NavigationPortlet</portlet-ref>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>BreadcumbsPortlet</portlet-ref>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ <page-body> </page-body>
+
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>FooterPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>template</name>
+
<value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+
+ </portal-layout>
-
- <page-body> </page-body>
-
- <application>
-
<instance-id>portal#classic:/web/FooterPortlet/footer</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- </portal-layout>
-
-</portal-config>
+</portal-config>]]>
</programlisting>
<para>
It is also possible to apply a nested container that can also contain portlets.
Row, column or tab containers are then responsible for the layout of their child
portlets.
@@ -175,51 +344,43 @@
<term>navigation.xml</term>
<listitem>
<para>
- This file defines all the navigation nodes the portal will have. The syntax is
simple, using nested node tags. Each node references a page defined in pages.xml file
(explained next).
+ This file defines all the navigation nodes of the portal. The syntax is simple
using the nested node tags. Each node refers to a page defined in the
<literal>pages.xml</literal> file (explained next).
</para>
<para>
- When <literal>#{...}</literal> syntax is used, the enclosed property
name serves as a key that is automatically passed to internationalization mechanism
- so the literal property name is replaced by a localized value taken
from the associated properties file matching the current locale.
+ If the administrator want to create node labels for each language, they will have
to use <literal>xml:lang</literal> attribute in the label tag with value of
<literal>xml:lang</literal> is the relevant locale.
</para>
+ <para>
+ Otherwise, if they want the node label is localized by resource bundle files, the
<literal>#{...}</literal> syntax will be used, the enclosed property name
serves as a key that is automatically passed to the internationalization mechanism. Thus
the literal property name is replaced by a localized value taken from the associated
properties file matching the current locale.
+ <para>
+ For example:
+ </para>
+ </para>
-<programlisting role="XML">
- <![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<node-navigation
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0
http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
- <priority>1</priority>
- <page-nodes>
- <node>
- <uri>home</uri>
- <name>home</name>
- <label>#{portal.classic.home}</label>
- <page-reference>portal::classic::homepage</page-reference>
- </node>
- <node>
- <uri>sitemap</uri>
- <name>sitemap</name>
- <label>#{portal.classic.sitemap}</label>
- <visibility>DISPLAYED</visibility>
- <page-reference>portal::classic::sitemap</page-reference>
- </node>
- </page-nodes>
-</node-navigation>
-
- ]]>
+<programlisting role="XML"><![CDATA[<node-navigation
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2
http://www.gatein.org/xml/ns/gatein_objects_1_2"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2">
+ <priority>1</priority>
+ <page-nodes>
+ <node>
+ <name>home</name>
+ <label xml:lang="en">Home</label>
+ <page-reference>portal::classic::homepage</page-reference>
+ </node>
+ <node>
+ <name>sitemap</name>
+ <label xml:lang="en">SiteMap</label>
+ <visibility>DISPLAYED</visibility>
+ <page-reference>portal::classic::sitemap</page-reference>
+ </node>
+ ..........
+ </page-nodes>
+</node-navigation>]]>
</programlisting>
-
<para>
This navigation tree can have multiple views inside portlets (such as the
breadcrumbs portlet) that render the current view node, the site map or the menu
portlets.
</para>
- <warning>
- <para>
- For top nodes, the <emphasis role="bold">uri</emphasis> and
the <emphasis role="bold">name</emphasis> of your navigation nodes
must have the <emphasis>same</emphasis> value.
- For other nodes the <emphasis
role="bold">uri</emphasis> is a relative path. For example,
<emphasis><uri>contentmanagement/fileexplorer</uri></emphasis>
where '<literal>contentmanagement</literal> ' is the name of
the parent node and '<literal>fileexplorer</literal>' is the
name of the node (
<emphasis><name>fileexplorer</name>
</emphasis> ).
- </para>
- </warning>
</listitem>
</varlistentry>
<varlistentry>
@@ -230,428 +391,82 @@
Each application can decide whether to render the portlet border, the
window state, the icons or portlet's mode.
</para>
-<programlisting role="XML">
- <![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<page-set
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0
http://www.gatein.org/xml/ns/gatein_objects_1_0"
- xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
+<programlisting role="XML"><![CDATA[<page-set
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0
http://www.gatein.org/xml/ns/gatein_objects_1_0"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
- <page>
- <name>homepage</name>
- <title>Home Page</title>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>web</application-ref>
- <portlet-ref>HomePagePortlet</portlet-ref>
- <preferences>
- <preference>
- <name>template</name>
-
<value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </preferences>
- </portlet>
- <title>Home Page portlet</title>
+ <page>
+ <name>homepage</name>
+ <title>Home Page</title>
<access-permissions>Everyone</access-permissions>
- <show-info-bar>false</show-info-bar>
- <show-application-state>false</show-application-state>
- <show-application-mode>false</show-application-mode>
- </portlet-application>
- </page>
- <page>
- <name>sitemap</name>
- <title>Site Map</title>
- <access-permissions>Everyone</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>web</application-ref>
- <portlet-ref>SiteMapPortlet</portlet-ref>
- </portlet>
- <title>SiteMap</title>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>HomePagePortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>template</name>
+
<value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value>
+ <read-only>false</read-only>
+ </preference>
+ </preferences>
+ </portlet>
+ <title>Home Page portlet</title>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ <show-application-state>false</show-application-state>
+ <show-application-mode>false</show-application-mode>
+ </portlet-application>
+ </page>
+
+ <page>
+ <name>sitemap</name>
+ <title>Site Map</title>
<access-permissions>Everyone</access-permissions>
- <show-info-bar>false</show-info-bar>
- </portlet-application>
- </page>
-</page-set>
-]]>
+ <edit-permission>*:/platform/administrators</edit-permission>
+ <portlet-application>
+ <portlet>
+ <application-ref>web</application-ref>
+ <portlet-ref>SiteMapPortlet</portlet-ref>
+ </portlet>
+ <title>SiteMap</title>
+ <access-permissions>Everyone</access-permissions>
+ <show-info-bar>false</show-info-bar>
+ </portlet-application>
+ </page>
+ .......
+</page-set>]]>
</programlisting>
</listitem>
</varlistentry>
- <varlistentry>
- <term>portlet-preferences.xml</term>
- <listitem>
- <para>
- Porlet instances can be associated with
<literal>portlet-preferences</literal> that override the ones defined in
<filename>portlet.xml</filename> of the portlet application
<literal>war</literal> (TODO: clarify which file in which war).
- </para>
-
-<programlisting role="XML"><?xml version="1.0"
encoding="ISO-8859-1"?>
-<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/BannerPortlet/banner</window-id>
- <preference>
- <name>template</name>
-
<value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/NavigationPortlet/toolbar</window-id>
- <preference>
- <name>useAJAX</name>
- <value>true</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/FooterPortlet/footer</window-id>
- <preference>
- <name>template</name>
-
<value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
-
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/GroovyPortlet/groovyportlet</window-id>
- <preference>
- <name>template</name>
-
<value>par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-</portlet-preferences-set>
-</programlisting>
- </listitem>
- </varlistentry>
</variablelist>
</section>
- <!-- <section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal.xml">
- <title>Portal.xml</title>
- <para>
- That file describes the layout and portlets that will be shown for all pages. Usually
the layout contains the banner, footer, menu, breadcrumbs portlets. Indeed, in GateIn,
every area is a portlet even the banner and footer which makes the platform extremely
configurable.
- </para>
-
-<programlisting role="XML"><?xml version="1.0"
encoding="ISO-8859-1"?>
-<portal-config>
- <portal-name>classic</portal-name>
- <locale>en</locale>
- <factory-id>office</factory-id>
- <access-permissions>Everyone</access-permissions>
-
<edit-permission>*:/platform/administrators</edit-permission>
- <creator>root</creator>
-
- <portal-layout>
- <application>
-
<instance-id>portal#classic:/web/BannerPortlet/banner</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- <application>
-
<instance-id>portal#classic:/web/NavigationPortlet/toolbar</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
-
- <application>
-
<instance-id>portal#classic:/web/BreadcumbsPortlet/breadcumbs</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
-
-
- <page-body> </page-body>
-
- <application>
-
<instance-id>portal#classic:/web/FooterPortlet/footer</instance-id>
- <show-info-bar>false</show-info-bar>
- </application>
- </portal-layout>
-
-</portal-config>
-</programlisting>
- <para>
- Even if not shown in the previous XML file, it is also possible to apply a nested
container that can also contain portlets. Containers are then responsible of the layout of
their children (row, column or tabs containers exist).
- </para>
- <para>
- Each application references a portlet using the id
portal#{portalName}:/{portletWarName}/{portletName}/{uniqueId}
- </para>
- <para>
- In order to define at which location GateIn Portal shall render the current page use
the page-body tag.
- </para>
- <para>
- The defined classic portal is accessible to "Everyone" (that means it can be
accessed through the URL /portal/public/classic) but only members of the group
/platform/administrators can edit it.
- </para>
- </section>
-
- <section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Navigation.xml">
- <title>Navigation.xml</title>
- <para>
- This file defines all the navigation nodes the portal will have. The syntax is simple
as we get nested node tags. Each node references a page that is defined in the next XML
file.
- </para>
- <para>
- If the label #{} is used then it means the i18n mechanism is activated and that the
real label to render is taken from an associated properties file for the current locale.
- </para>
-
-<programlisting role="XML"><?xml version="1.0"
encoding="UTF-8"?>
-<node-navigation>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <priority>1</priority>
- <page-nodes>
- <node>
- <uri>home</uri>
- <name>home</name>
- <label>#{portal.classic.home}</label>
-
<page-reference>portal::classic::homepage</page-reference>
- </node>
- <node>
- <uri>webexplorer</uri>
- <name>webexplorer</name>
- <label>#{portal.classic.webexplorer}</label>
-
<page-reference>portal::classic::webexplorer</page-reference>
- </node>
- </page-nodes>
-</node-navigation>
-</programlisting>
- <para>
- This navigation tree can have multiple views inside portlets such as the breadcrumbs
that render the current view node, the site map or the menu portlets.
- </para>
- <warning>
- <para>
- For top nodes, the <emphasis role="bold">uri</emphasis> and the
<emphasis role="bold">name</emphasis> of your navigation nodes must
have the <emphasis role="bold">same</emphasis> value. For the other
nodes the uri is composed like
<emphasis><uri>contentmanagement/fileexplorer</uri></emphasis>
where 'contentmanagement' is the name of the parent node and
'fileexplorer' the name of the node (
<emphasis><name>fileexplorer</name> </emphasis>
).
- </para>
- </warning>
- </section>
-
- <section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Pages.xml">
- <title>Pages.xml</title>
- <para>
- This XML file structure is very similar to portal.xml and it can also contain
container tags. Each application can decide if it wishes to render the portlet border, the
window state icons or the mode.
- </para>
-
-<programlisting role="XML"><?xml version="1.0"
encoding="ISO-8859-1"?>
-<page-set>
- <page>
- <page-id>portal::classic::homepage</page-id>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <name>homepage</name>
- <title>Home Page</title>
- <access-permissions>Everyone</access-permissions>
-
<edit-permission>*:/platform/administrators</edit-permission>
- <application>
-
<instance-id>portal#classic:/web/HomePagePortlet/homepageportlet</instance-id>
- <title>Home Page portlet</title>
- <show-info-bar>false</show-info-bar>
- <show-application-state>false</show-application-state>
- <show-application-mode>false</show-application-mode>
- </application>
- </page>
-
- <page>
- <page-id>portal::classic::webexplorer</page-id>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
- <name>webexplorer</name>
- <title>Web Explorer</title>
-
<access-permissions>*:/platform/users</access-permissions>
-
<edit-permission>*:/platform/administrators</edit-permission>
- <application>
-
<instance-id>group#platform/users:/web/BrowserPortlet/WebExplorer</instance-id>
- <title>Web Explorer</title>
- <show-info-bar>false</show-info-bar>
- </application>
- </page>
-</page-set>
-</programlisting>
- </section>
-
- <section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Portlet_preferences.xml">
- <title>Portlet-preferences.xml</title>
- <para>
- Porlet instances can be associated with portlet-preferences that override the one
defined in the usual portlet.xml file of the portlet application WAR.
- </para>
-
-<programlisting role="XML"><?xml version="1.0"
encoding="ISO-8859-1"?>
-<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/BannerPortlet/banner</window-id>
- <preference>
- <name>template</name>
-
<value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/NavigationPortlet/toolbar</window-id>
- <preference>
- <name>useAJAX</name>
- <value>true</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/FooterPortlet/footer</window-id>
- <preference>
- <name>template</name>
-
<value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
-
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>classic</owner-id>
-
<window-id>portal#classic:/web/GroovyPortlet/groovyportlet</window-id>
- <preference>
- <name>template</name>
-
<value>par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-</portlet-preferences-set>
-</programlisting>
- </section> -->
<section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Group_Navigation">
<title>Group Navigation</title>
<para>
- Group navigations are dynamically added to the user navigation at login. This allows
users to see in the menu all the pages assigned to any groups they belong to.
+ Group navigations are dynamically added to the user navigation at login. This allows
users to see the menu of all pages assigned to any groups they belong to.
</para>
<para>
The group navigation menu is configured by three XML files
(<filename>navigation.xml</filename>,
<filename>pages.xml</filename> and
<filename>portlet-preferences.xml</filename>). The syntax used in these files
is the same as those covered in <xref
linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation"
/>.
</para>
<para>
- They are located in
<filename>portal.war/WEB-INF/conf/portal/group<replaceable>/group-name-path/</replaceable></filename>
directory (For example;
<filename>portal.war/WEB-INF/conf/portal/group/platform/administrators/</filename>).
+ They are also located in the
<filename>{templateLocation}/{ownerType}/{predefinedOwner}</filename>
directory with <literal>ownerType</literal> is
<literal>group</literal> and <literal>predefinedOwner</literal> is
the path to the group. For example,
<filename>portal.war/WEB-INF/conf/portal/group/platform/administrators/</filename>.
</para>
</section>
<section
id="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation">
<title>User Navigation</title>
<para>
- User navigation is the set of nodes and pages that are owned by a user. They are part
of the user's dashboard.
+ User navigation is the set of nodes and pages that are owned by the user. They are
part of the user's dashboard.
</para>
<para>
- Three files configure the user navigation
(<filename>navigation.xml</filename>,
<filename>pages.xml</filename> and
<filename>portlet-preferences.xml</filename>). They are located in the
directory
"<filename>portal.war/WEB-INF/conf/portal/users/{userName}</filename>".
+ Three files configure the user navigation
(<filename>navigation.xml</filename>,
<filename>pages.xml</filename> and
<filename>portlet-preferences.xml</filename>). They are located in the
<filename>{templateLocation}/{ownerType}/{predefinedOwner}</filename>
directory with <literal>ownerType</literal> is
<literal>user</literal> and <literal>predefinedOwner</literal> is
username that want to create the navigation. For example, if administrator want to create
navigation for user <literal>root</literal>, he has to locate the
configuration files in <filename>portal.war/WEB-INF/conf/portal/user/root
</filename>
</para>
- <para>
- This directory also contains a <filename>gadgets.xml</filename> file
(formerly called <filename>widgets.xml</filename>). This file defines the
gadgets located in the user's workspace.
- </para>
- <para>
- The user's workspace is located at the left hand side of the page and access is
restricted to some privileged users, see <xref
linkend="sect-Reference_Guide-Predefined_User_Configuration" />
- </para>
-
-<programlisting role="XML"><?xml version="1.0"
encoding="ISO-8859-1"?>
-<widgets>
- <owner-type>user</owner-type>
- <owner-id>root</owner-id>
-
- <container id="Information">
- <name>Information</name>
- <description>Information's
Description</description>
- <application>
-
<instance-id>user#root:/GateInWidgetWeb/WelcomeWidget/WelcomeWidget1</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
-
- <application>
-
<instance-id>user#root:/GateInWidgetWeb/StickerWidget/StickerWidget</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
-
- <application>
-
<instance-id>user#root:/GateInWidgetWeb/InfoWidget/InfoWidget1</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
- </container>
-
- <container id="Calendar">
- <name>Calendar</name>
- <description>Calendar's
Description</description>
- <application>
-
<instance-id>user#root:/GateInWidgetWeb/CalendarWidget/CalendarWidget</instance-id>
- <application-type>GateInWidget</application-type>
- </application>
- </container>
-
-</widgets>
-</programlisting>
- <!-- <para>
- Note that when you develop a portal, we advise you to use the XML instead of the User
Interface as XML will allow you to provide a preconfigured package to your customer. But
as each time you start the server the first time, the XML files are stored in the JCR, it
will be necessary to remove the database (the jcr leverages a database). During the
development phase using tomcat it simply means to delete the directory: exo-tomcat/temp
- </para> -->
</section>
-
- <section
id="sect-Reference_Guide-Portal_Navigation_Configuration-Tips">
- <title>Tips</title>
- <section id="sect-Reference_Guide-Tips-Direct_External_Links">
- <title>Direct External Links</title>
- <para>
- If you wish to add a link to a URL outside the portal you first have to define a
"page" that will only serve as a navigation placeholder for external
redirect - it will not be used for any portlets.
- Then add the URL to the navigation. (TODO: check for correctness)
- </para>
- <variablelist>
- <varlistentry>
- <term>pages.xml</term>
- <listitem>
- <para>
-
-<programlisting><page>
- <owner-type>portal</owner-type>
- <owner-id>website</owner-id>
- <name>documentation</name>
- <title>Documentation</title>
- <access-permissions>Everyone</access-permissions>
-
<edit-permission>*:/platform/administrators</edit-permission>
-</page>
-</programlisting>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>navigation.xml</term>
- <listitem>
- <para>
-
-<programlisting><node>
-
<uri>http://wiki.exoplatform.com/xwiki/bin/view/Main/WebHome</uri>
- <name>documentation</name>
- <label>#{portal.classic.documentation}</label>
-
<page-reference>portal::website::documentation</page-reference>
-</node>
-</programlisting>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <warning>
- <title>Direct external links were not a design goal</title>
- <para>
- Currently you cannot modify the URL using the portal interface, you must change it
in the configuration files or modify the underlying database table.
- </para>
- </warning>
- </section>
-
- </section>
-
</section>
Modified:
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java
===================================================================
---
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoContainerConfig.java 2011-08-03
03:51:37 UTC (rev 6987)
@@ -28,8 +28,9 @@
import org.apache.shindig.auth.BlobCrypterSecurityTokenDecoder;
import org.apache.shindig.config.ContainerConfigException;
import org.apache.shindig.expressions.Expressions;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.commons.utils.Safe;
-import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
+import org.exoplatform.container.RootContainer;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -41,19 +42,19 @@
import java.security.SecureRandom;
/**
- * <p>The goal of the container config subclass is to integrate security key file
along
+ * <p>The goal of the container config subclass is to integrate security key files
along
* with exo configuration.</p>
- *
- * <p>The implementation first determine the most relevant directory for performing
the key lookup.
- * It will look for a <i>gadgets</i> directory under the configuration
directory returned by the
- * {@link
org.exoplatform.container.monitor.jvm.J2EEServerInfo#getExoConfigurationDirectory()}
- * method. If no such valid directory can be found then the implementation use the
current execution directory
+ * <p>
+ * The implementation first determine the most relevant locations of key files for
performing the lookup.
+ * Ideally it will take ones configured as properties
<i>gatein.gadgets.securityTokenKeyFile</i>
+ * and <i>gatein.gadgets.signingKeyFile</i> in the
<i>configuration.properties</i>.
+ * If these properties are not configured, then the implementation uses the current
execution directory
* (which should be /bin in tomcat and jboss).</p>
*
- * <p>When the lookup directory is determined, the implementation looks for a file
named key.txt.
- * If no such file is found, then it will attempt to create it with a base 64 value
encoded from
+ * <p>When the lookup file locations are determined, the implementation looks for
these key files.
+ * If no such files are found, then it will attempt to create them with a base 64 value
encoded from
* a 32 bytes random sequence generated by {@link SecureRandom} seeded by the current
time. If the
- * file exist already but is a directory then no acton is done.<p>
+ * file exist already but is a directory then no action is done.<p>
*
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
@@ -68,7 +69,8 @@
private Log log = ExoLogger.getLogger(ExoContainerConfig.class);
/** . */
- private static volatile String _keyPath;
+ private static volatile String tokenKey_;
+ private String signingKey_;
@Inject
public ExoContainerConfig((a)Named("shindig.containers.default") String s,
Expressions expressions)
@@ -76,109 +78,134 @@
{
super(s, expressions);
- //
- J2EEServerInfo info = new J2EEServerInfo();
+ // This ensures RootContainer initialized first
+ // to populate properties in configuration.properties into PropertyManager
+ RootContainer.getInstance();
+
+ initializeTokenKeyFile();
+ initializeSigningKeyFile();
+ }
+
+ private void initializeTokenKeyFile()
+ {
+ String keyPath =
PropertyManager.getProperty("gatein.gadgets.securityTokenKeyFile");
+
+ File tokenKeyFile = null;
+ if (keyPath == null)
+ {
+ log.warn("The gadgets token key is not configured. The default key.txt file
in /bin will be used");
+ tokenKeyFile = new File("key.txt");
+ }
+ else
+ {
+ tokenKeyFile = new File(keyPath);
+ }
+
+ boolean isCreated = initializeKeyFile(tokenKeyFile);
+ if (isCreated)
+ {
+ setTokenKeyPath(tokenKeyFile.getAbsolutePath());
+ }
+ }
- //
- String confPath = info.getExoConfigurationDirectory();
-
- File keyFile = null;
- if (confPath != null)
+ private void initializeSigningKeyFile()
+ {
+ String signingKey =
PropertyManager.getProperty("gatein.gadgets.signingKeyFile");
+
+ File signingKeyFile;
+ if (signingKey == null)
{
- File confDir = new File(confPath);
- if (!confDir.exists())
+ log.warn("The gadgets signing key is not configured. The default
oauthkey.pem file in /bin will be used");
+ signingKeyFile = new File("oauthkey.pem");
+ }
+ else
+ {
+ signingKeyFile = new File(signingKey);
+ }
+
+ boolean isCreated = initializeKeyFile(signingKeyFile);
+ if (isCreated)
+ {
+ signingKey_ = signingKeyFile.getAbsolutePath();
+ }
+ }
+
+ private boolean initializeKeyFile(File file)
+ {
+ String keyPath = file.getAbsolutePath();
+ if (file.exists())
+ {
+ if (file.isFile())
{
- log.debug("Exo conf directory (" + confPath + ") does not
exist");
+ log.info("Found key file " + keyPath + " for gadgets
security");
}
else
{
- if (!confDir.isDirectory())
- {
- log.debug("Exo conf directory (" + confPath + ") is not a
directory");
- }
- else
- {
- keyFile = new File(confDir, "gadgets/key.txt");
- }
+ log.error("Found path file " + keyPath + " but it's not a
key file");
}
}
-
- if (keyFile == null)
+ else
{
- keyFile = new File("key.txt");
- }
-
- String keyPath = keyFile.getAbsolutePath();
-
- if (!keyFile.exists())
- {
- log.debug("No key file found at path " + keyPath + " generating a
new key and saving it");
- File fic = keyFile.getAbsoluteFile();
+ log.debug("No key file found at path " + keyPath + ". it's
generating a new key and saving it");
+ File fic = file.getAbsoluteFile();
File parentFolder = fic.getParentFile();
- if (!parentFolder.exists())
- parentFolder.mkdirs();
+ if (!parentFolder.exists()) {
+ if (!parentFolder.mkdirs())
+ {
+ log.error("Coult not create parent folder/s for the key file " +
keyPath);
+ return false;
+ }
+ }
String key = generateKey();
Writer out = null;
try
{
- out = new FileWriter(keyFile);
+ out = new FileWriter(file);
out.write(key);
out.write('\n');
- log.info("Generated key file " + keyPath + " for eXo
Gadgets");
- setKeyPath(keyPath);
+ log.debug("Generated key file " + keyPath + " for eXo
Gadgets");
}
catch (IOException e)
{
- log.error("Coult not create key file " + keyPath, e);
+ log.error("Could not create key file " + keyPath, e);
+ return false;
}
finally
{
Safe.close(out);
}
}
- else if (!keyFile.isFile())
- {
- log.debug("Found key file " + keyPath + " but it's not a
file");
- }
- else
- {
- log.info("Found key file " + keyPath + " for gadgets
security");
- setKeyPath(keyPath);
- }
+ return true;
}
-
- private void setKeyPath(String keyPath)
+
+ private void setTokenKeyPath(String keyPath)
{
// _keyPath is volatile so no concurrent writes and read are safe
synchronized (ExoContainerConfig.class)
{
- if (_keyPath != null && !_keyPath.equals(keyPath))
+ if (tokenKey_ != null && !tokenKey_.equals(keyPath))
{
- throw new IllegalStateException("There is already a configured key path
old=" + _keyPath + " new="
+ throw new IllegalStateException("There is already a configured key path
old=" + tokenKey_ + " new="
+ keyPath);
}
- _keyPath = keyPath;
+ tokenKey_ = keyPath;
}
}
@Override
public Object getProperty(String container, String property)
{
- if (property.equals(BlobCrypterSecurityTokenDecoder.SECURITY_TOKEN_KEY_FILE)
&& _keyPath != null)
+ if (property.equals(BlobCrypterSecurityTokenDecoder.SECURITY_TOKEN_KEY_FILE)
&& tokenKey_ != null)
{
- return _keyPath;
+ return tokenKey_;
}
+ if (property.equals(ExoOAuthModule.SIGNING_KEY_FILE) && signingKey_ !=
null)
+ {
+ return signingKey_;
+ }
return super.getProperty(container, property);
}
- // @Override
- // public Object getJson(String container, String parameter) {
- // if (parameter.equals(BlobCrypterSecurityTokenDecoder.SECURITY_TOKEN_KEY_FILE)
&& _keyPath != null) {
- // return _keyPath;
- // }
- // return super.getJson(container, parameter);
- // }
-
/**
* It's not public as we don't want to expose it to the outter world. The fact
that this class
* is instantiated by Guice and the ExoDefaultSecurityTokenGenerator is managed by exo
kernel
@@ -186,9 +213,9 @@
*
* @return the key path
*/
- static String getKeyPath()
+ static String getTokenKeyPath()
{
- return _keyPath;
+ return tokenKey_;
}
/**
Modified:
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java
===================================================================
---
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoDefaultSecurityTokenGenerator.java 2011-08-03
03:51:37 UTC (rev 6987)
@@ -27,70 +27,23 @@
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypterException;
import org.apache.shindig.common.util.TimeSource;
-import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
import org.exoplatform.web.application.RequestContext;
public class ExoDefaultSecurityTokenGenerator implements SecurityTokenGenerator
{
- private String containerKey;
-
private final TimeSource timeSource;
public ExoDefaultSecurityTokenGenerator() throws Exception
{
- // TODO should be moved to config
- // generateKeys("RSA", 1024);
- this.containerKey = getKeyFilePath();
this.timeSource = new TimeSource();
}
- // private static void generateKeys(String keyAlgorithm, int numBits) {
- // FileOutputStream keyFile = null;
- // try {
- // keyFile = new FileOutputStream("exokey.pem");
- //
- // // RSA private key
- //
- // CertAndKeyGen cakg = new CertAndKeyGen(keyAlgorithm,
"SHA1WithRSA");
- // cakg.generate(1024);
- //
- // PrivateKey privateKey = cakg.getPrivateKey();
- //
- // keyFile.write("-----BEGIN RSA PRIVATE KEY-----\n".getBytes());
- // // wrap at 64
- // int wrapIndex = 64;
- // StringBuffer sb = new StringBuffer(new
String(Base64.encode(privateKey.getEncoded())));
- // for (int i = wrapIndex; i < sb.length(); i = i + wrapIndex + 1) {
- // sb.insert(i, "\n");
- // }
- // keyFile.write((sb.toString()).getBytes());
- // keyFile.write("\n-----END RSA PRIVATE KEY-----\n".getBytes());
- //
- // X500Name name = new X500Name("One", "Two",
"Three", "Four", "Five", "Six");
- //
- // X509Certificate certificate = cakg.getSelfCertificate(name, 2000000);
- // System.out.println("\n CN: " + certificate.getSubjectDN());
- // keyFile.write("-----BEGIN CERTIFICATE-----\n".getBytes());
- // // wrap at 64
- // wrapIndex = 64;
- // sb = new StringBuffer(new String(Base64.encode(certificate.getEncoded())));
- // for (int i = wrapIndex; i < sb.length(); i = i + wrapIndex + 1) {
- // sb.insert(i, "\n");
- // }
- // keyFile.write(sb.toString().getBytes());
- // keyFile.write("\n-----END CERTIFICATE-----".getBytes());
- // } catch (Exception e) {
- // e.printStackTrace();
- // } finally {
- // Safe.close(keyFile);
- // }
- // }
-
protected String createToken(String gadgetURL, String owner, String viewer, Long
moduleId, String container)
{
try
{
- BlobCrypterSecurityToken t = new
BlobCrypterSecurityToken(getBlobCrypter(this.containerKey), container, null);
+ BlobCrypter blobCrypter = getBlobCrypter();
+ BlobCrypterSecurityToken t = new BlobCrypterSecurityToken(blobCrypter,
container, null);
t.setAppUrl(gadgetURL);
t.setModuleId(moduleId);
@@ -102,13 +55,11 @@
}
catch (IOException e)
{
- e.printStackTrace(); // To change body of catch statement use File |
- // Settings | File Templates.
+ e.printStackTrace();
}
catch (BlobCrypterException e)
{
- e.printStackTrace(); // To change body of catch statement use File |
- // Settings | File Templates.
+ e.printStackTrace();
}
return null;
}
@@ -123,8 +74,9 @@
return createToken(gadgetURL, viewer, rUser, moduleId, "default");
}
- private BlobCrypter getBlobCrypter(String fileName) throws IOException
+ protected BlobCrypter getBlobCrypter() throws IOException
{
+ String fileName = getKeyFilePath();
BasicBlobCrypter c = new BasicBlobCrypter(new File(fileName));
c.timeSource = timeSource;
return c;
@@ -133,22 +85,19 @@
/**
* Method returns a path to the file containing the encryption key
*/
- private String getKeyFilePath(){
- J2EEServerInfo info = new J2EEServerInfo();
- String confPath = info.getExoConfigurationDirectory();
- File keyFile = null;
-
- if (confPath != null) {
- File confDir = new File(confPath);
- if (confDir != null && confDir.exists() &&
confDir.isDirectory()) {
- keyFile = new File(confDir, "gadgets/key.txt");
- }
- }
+ protected String getKeyFilePath()
+ {
+ String keyPath = ExoContainerConfig.getTokenKeyPath();
+ File keyFile = null;
+ if (keyPath != null)
+ {
+ keyFile = new File(keyPath);
+ }
+ else
+ {
+ keyFile = new File("key.txt");
+ }
- if (keyFile == null) {
- keyFile = new File("key.txt");
- }
-
- return keyFile.getAbsolutePath();
+ return keyFile.getAbsolutePath();
}
}
Modified:
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoOAuthModule.java
===================================================================
---
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoOAuthModule.java 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ExoOAuthModule.java 2011-08-03
03:51:37 UTC (rev 6987)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.gadget.core;
+import com.google.inject.Singleton;
+
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -28,7 +30,6 @@
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.config.ContainerConfig;
-import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.oauth.BasicOAuthStore;
import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret;
import org.apache.shindig.gadgets.oauth.OAuthFetcherConfig;
@@ -50,18 +51,14 @@
*/
public class ExoOAuthModule extends OAuthModule
{
- private static final String SIGNING_KEY_FILE = "gadgets.signingKeyFile";
+ public static final String SIGNING_KEY_FILE = "gadgets.signingKeyFile";
private static final String SIGNING_KEY_NAME = "gadgets.signingKeyName";
private static final String CALLBACK_URL =
"gadgets.signing.global-callback-url";
private static final String OAUTH_CONFIG = "config/oauth.json";
- private static final String OAUTH_SIGNING_KEY_FILE =
"shindig.signing.key-file";
- private static final String OAUTH_SIGNING_KEY_NAME =
"shindig.signing.key-name";
- private static final String OAUTH_CALLBACK_URL =
"shindig.signing.global-callback-url";
-
private static final Logger logger = Logger.getLogger(OAuthModule.class.getName());
@Override
@@ -80,6 +77,7 @@
Boolean.TRUE);
}
+ @Singleton
public static class ExoOAuthStoreProvider implements Provider<OAuthStore>
{
@@ -88,18 +86,13 @@
@Inject
public ExoOAuthStoreProvider(ContainerConfig config)
{
- //super(config.getString(ContainerConfig.DEFAULT_CONTAINER, SIGNING_KEY_FILE),
config.getString(ContainerConfig.DEFAULT_CONTAINER, SIGNING_KEY_NAME));
-// super(config.getString(ContainerConfig.DEFAULT_CONTAINER, SIGNING_KEY_FILE),
config.getString(
-// ContainerConfig.DEFAULT_CONTAINER, SIGNING_KEY_NAME),
config.getString(ContainerConfig.DEFAULT_CONTAINER,
-// CALLBACK_URL));
-
store = new ExoOAuthStore();
String signingKeyFile = config.getString(ContainerConfig.DEFAULT_CONTAINER,
SIGNING_KEY_FILE);
String signingKeyName = config.getString(ContainerConfig.DEFAULT_CONTAINER,
SIGNING_KEY_NAME);
- String defaultCallbackUrl =
config.getString(ContainerConfig.DEFAULT_CONTAINER,CALLBACK_URL);
-
loadDefaultKey(signingKeyFile, signingKeyName);
+
+ String defaultCallbackUrl =
config.getString(ContainerConfig.DEFAULT_CONTAINER,CALLBACK_URL);
store.setDefaultCallbackUrl(defaultCallbackUrl);
loadConsumers();
}
@@ -128,8 +121,7 @@
" openssl pkcs8 -in testkey.pem -out oauthkey.pem -topk8 -nocrypt
-outform PEM\n" +
'\n' +
"Then edit gadgets.properties and add these lines:\n" +
- OAUTH_SIGNING_KEY_FILE + "=<path-to-oauthkey.pem>\n" +
- OAUTH_SIGNING_KEY_NAME + "=mykey\n");
+ SIGNING_KEY_FILE + "=<path-to-oauthkey.pem>\n");
}
}
@@ -146,24 +138,4 @@
return store;
}
}
-
- public static class ExoOAuthRequestProvider extends OAuthRequestProvider
- {
- private final HttpFetcher fetcher;
-
- private final OAuthFetcherConfig config;
-
- @Inject
- public ExoOAuthRequestProvider(HttpFetcher fetcher, OAuthFetcherConfig config)
- {
- super(fetcher, config);
- this.fetcher = fetcher;
- this.config = config;
- }
-
- public OAuthRequest get()
- {
- return new OAuthRequest(config, fetcher);
- }
- }
}
Deleted: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/exokey.pem
===================================================================
---
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/exokey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/exokey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,29 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu
-+v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E
-4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB
-AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb
-Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb
-X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m
-wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8
-bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC
-O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk
-cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX
-IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO
-eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1
-b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV
-BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx
-EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu
-HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg
-ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O
-BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT
-4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e
-TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7
-wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3
-WNlNt2SavfSi3d60wd5o
------END CERTIFICATE-----
Deleted: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/oauthkey.pem
===================================================================
---
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/bin/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Deleted:
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
===================================================================
---
portal/branches/branch-GTNPORTAL-1963/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Copied:
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
(from rev 6986,
portal/branches/branch-GTNPORTAL-1963/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem)
===================================================================
---
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
(rev 0)
+++
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
+GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
+LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
+Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
+fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
+ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
+bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
+XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
+hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
+s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
+4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
+6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
+AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
+CPS2uizmGzwXCQ==
+-----END PRIVATE KEY-----
Deleted: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/exokey.pem
===================================================================
---
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/exokey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/exokey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,29 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu
-+v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E
-4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB
-AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb
-Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb
-X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m
-wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8
-bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC
-O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk
-cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX
-IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO
-eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1
-b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV
-BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx
-EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu
-HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg
-ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O
-BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT
-4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e
-TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7
-wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3
-WNlNt2SavfSi3d60wd5o
------END CERTIFICATE-----
Deleted: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/oauthkey.pem
===================================================================
---
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/bin/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Deleted:
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
===================================================================
---
portal/branches/branch-GTNPORTAL-1963/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Copied:
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
(from rev 6986,
portal/branches/branch-GTNPORTAL-1963/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem)
===================================================================
---
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem
(rev 0)
+++
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
+GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
+LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
+Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
+fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
+ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
+bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
+XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
+hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
+s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
+4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
+6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
+AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
+CPS2uizmGzwXCQ==
+-----END PRIVATE KEY-----
Deleted: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/exokey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,29 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu
-+v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E
-4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB
-AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb
-Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb
-X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m
-wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8
-bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC
-O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk
-cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX
-IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO
-eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1
-b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV
-BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx
-EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu
-HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg
-ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O
-BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT
-4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e
-TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7
-wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3
-WNlNt2SavfSi3d60wd5o
------END CERTIFICATE-----
Deleted: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Deleted:
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem
===================================================================
---
portal/branches/branch-GTNPORTAL-1963/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Copied:
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem
(from rev 6986,
portal/branches/branch-GTNPORTAL-1963/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem)
===================================================================
---
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem
(rev 0)
+++
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
+GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
+LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
+Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
+fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
+ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
+bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
+XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
+hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
+s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
+4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
+6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
+AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
+CPS2uizmGzwXCQ==
+-----END PRIVATE KEY-----
Deleted: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/exokey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,29 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu
-+v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E
-4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB
-AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb
-Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb
-X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m
-wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8
-bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC
-O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk
-cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX
-IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO
-eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1
-b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV
-BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx
-EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu
-HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg
-ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O
-BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT
-4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e
-TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7
-wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3
-WNlNt2SavfSi3d60wd5o
------END CERTIFICATE-----
Deleted: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem
===================================================================
---
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Deleted:
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem
===================================================================
---
portal/branches/branch-GTNPORTAL-1963/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
-GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
-LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
-Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
-fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
-ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
-bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
-XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
-hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
-s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
-4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
-6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
-AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
-CPS2uizmGzwXCQ==
------END PRIVATE KEY-----
Copied:
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem
(from rev 6986,
portal/branches/branch-GTNPORTAL-1963/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem)
===================================================================
---
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem
(rev 0)
+++
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/gadgets/oauthkey.pem 2011-08-03
03:51:37 UTC (rev 6987)
@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H
+GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx
+LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK
+Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb
+fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g
+ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25
+bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT
+XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV
+hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o
+s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8
+4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy
+6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia
+AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE
+CPS2uizmGzwXCQ==
+-----END PRIVATE KEY-----
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
---
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2011-08-03
03:51:37 UTC (rev 6987)
@@ -254,9 +254,12 @@
}
};
- UIDashboard.prototype.onLoad = function(windowId, canEdit) {
- var portletWindow = document.getElementById(windowId) ?
document.getElementById(windowId) : document.getElementById("UIPortlet-" +
windowId);
- if(!portletWindow) return;
+ UIDashboard.prototype.onLoad = function(windowId, canEdit) {
+ var portletWindow = document.getElementById(windowId);
+ if(!portletWindow) {
+ windowId = "UIPortlet-" + windowId;
+ portletWindow = document.getElementById(windowId);
+ }
var DOMUtil = eXo.core.DOMUtil;
var uiDashboard = DOMUtil.findFirstDescendantByClass(portletWindow, "div",
"UIDashboard");
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java
===================================================================
---
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java 2011-08-02
21:52:08 UTC (rev 6986)
+++
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java 2011-08-03
03:51:37 UTC (rev 6987)
@@ -54,51 +54,11 @@
public UIApplicationList() throws Exception
{
- ApplicationRegistryService service =
getApplicationComponent(ApplicationRegistryService.class);
- String remoteUser = Util.getPortalRequestContext().getRemoteUser();
- if (remoteUser == null || remoteUser.equals(""))
- return;
- UserACL userACL =
Util.getUIPortalApplication().getApplicationComponent(UserACL.class);
-
- PortletComparator portletComparator = new PortletComparator();
- categories = service.getApplicationCategories(remoteUser);
-
- Iterator<ApplicationCategory> cateItr = categories.iterator();
- while (cateItr.hasNext())
- {
- ApplicationCategory cate = cateItr.next();
- List<Application> applications = cate.getApplications();
- boolean hasPermission = false;
- List<String> accessPermission = cate.getAccessPermissions();
- if (accessPermission == null)
- {
- accessPermission = new ArrayList<String>();
- }
- if (accessPermission.size() == 0)
- {
- accessPermission.add(null);
- }
- for (String permssion : accessPermission)
- {
- hasPermission = userACL.hasPermission(permssion);
- if (hasPermission)
- break;
- }
-
- if (!hasPermission || applications.size() < 1)
- cateItr.remove();
- else
- Collections.sort(applications, portletComparator);
- }
- if (categories.size() > 0)
- setSelectedCategory(categories.get(0).getName());
-
- Collections.sort(categories, new PortletCategoryComparator());
}
public Application getApplication(String id) throws Exception
{
- for (ApplicationCategory category : categories)
+ for (ApplicationCategory category : getCategories())
{
List<Application> items = category.getApplications();
for (Application item : items)
@@ -117,7 +77,7 @@
public void setSelectedCategory(String categoryName)
{
- for (ApplicationCategory category : categories)
+ for (ApplicationCategory category : getCategories())
{
if (category.getName().equals(categoryName))
{
@@ -155,22 +115,76 @@
public List<ApplicationCategory> getCategories()
{
- return categories;
+ try
+ {
+ //TODO: Handle concurrent requests associated with current session
+ if (categories == null)
+ {
+ initAllCategories();
+ }
+ return categories;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
}
- static class PortletCategoryComparator implements
Comparator<ApplicationCategory>
+ private void initAllCategories() throws Exception
{
- public int compare(ApplicationCategory cat1, ApplicationCategory cat2)
+ String remoteUser = Util.getPortalRequestContext().getRemoteUser();
+ if (remoteUser == null || remoteUser.equals(""))
+ { return; }
+
+ ApplicationRegistryService service =
getApplicationComponent(ApplicationRegistryService.class);
+ UserACL userACL =
Util.getUIPortalApplication().getApplicationComponent(UserACL.class);
+
+ final Comparator<Application> appComparator = new
Comparator<Application>()
{
- return cat1.getDisplayName().compareToIgnoreCase(cat2.getDisplayName());
+ public int compare(Application p_1, Application p_2)
+ {
+ return p_1.getDisplayName().compareToIgnoreCase(p_2.getDisplayName());
+ }
+ };
+ final Comparator<ApplicationCategory> cateComparator = new
Comparator<ApplicationCategory>()
+ {
+ public int compare(ApplicationCategory p_1, ApplicationCategory p_2)
+ {
+ return p_1.getDisplayName().compareToIgnoreCase(p_2.getDisplayName());
+ }
+ };
+
+ List<ApplicationCategory> allCategories =
service.getApplicationCategories(remoteUser);
+ categories = new ArrayList<ApplicationCategory>();
+
+ for (ApplicationCategory category : allCategories)
+ {
+ List<Application> apps = category.getApplications();
+ List<String> accessPermission = category.getAccessPermissions();
+ if(accessPermission == null)
+ {
+ continue;
+ }
+
+ accessCheck:
+ for (String p : accessPermission)
+ {
+ if (userACL.hasPermission(p))
+ {
+ if (apps.size() > 0)
+ {
+ Collections.sort(apps, appComparator);
+ }
+ categories.add(category);
+ }
+ break accessCheck;
+ }
}
- }
- static class PortletComparator implements Comparator<Application>
- {
- public int compare(Application p1, Application p2)
+ if (categories.size() > 0)
{
- return p1.getDisplayName().compareToIgnoreCase(p2.getDisplayName());
+ Collections.sort(categories, cateComparator);
+ selectedCategory = categories.get(0);
}
}