Author: hfnukal Date: 2011-08-16 10:10:49 -0400 (Tue, 16 Aug 2011) New Revision: 7157 Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/configuration.xml Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml Log: JBEPP-998 Error is thrown from UsersRolesLoginModule during every logout Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml 2011-08-16 12:45:21 UTC (rev 7156) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration.xml 2011-08-16 14:10:49 UTC (rev 7157) @@ -2,17 +2,17 @@ <!-- Copyright (C) 2009 eXo Platform SAS. - + This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA @@ -25,67 +25,15 @@ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> - <component> + <component> <key>org.exoplatform.container.PropertyConfigurator</key> <type>org.exoplatform.container.PropertyConfigurator</type> <init-params> - <!-- The name of the default portal container --> <value-param> <name>properties.url</name> <value>configuration.properties</value> </value-param> - <!-- The name of the default rest ServletContext --> - <value-param> - <name>default.rest.context</name> - <value>rest</value> - </value-param> - <!-- The name of the default realm --> - <value-param> - <name>default.realm.name</name> - <value>gatein-domain</value> - </value-param> - <!-- The default portal container definition --> - <!-- It cans be used to avoid duplicating configuration --> - <object-param> - <name>default.portal.definition</name> - <object type="org.exoplatform.container.definition.PortalContainerDefinition"> - <!-- The path to the external properties file --> - <field name="externalSettingsPath"> - <string>configuration.properties</string> - </field> - <field name="dependencies"> - <collection type="java.util.ArrayList"> - <value> - <string>eXoResources</string> - </value> - <value> - <string>portal</string> - </value> - <value> - <string>dashboard</string> - </value> - <value> - <string>exoadmin</string> - </value> - <value> - <string>eXoGadgets</string> - </value> - <value> - <string>eXoGadgetServer</string> - </value> - <value> - <string>rest</string> - </value> - <value> - <string>wsrp-producer</string> - </value> - <value> - <string>web</string> - </value> - </collection> - </field> - </object> - </object-param> </init-params> </component> + </configuration> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml 2011-08-16 12:45:21 UTC (rev 7156) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml 2011-08-16 14:10:49 UTC (rev 7157) @@ -17,10 +17,10 @@ <destName>configuration.properties</destName> <outputDirectory>conf/gatein</outputDirectory> </file> - <file> - <source>../../../component/common/src/main/java/conf/configuration.xml</source> - <outputDirectory>conf/gatein</outputDirectory> - </file> + <!--<file>--> + <!--<source>../../../component/common/src/main/java/conf/configuration.xml</source>--> + <!--<outputDirectory>conf/gatein</outputDirectory>--> + <!--</file>--> </files> <fileSets> Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/configuration.xml 2011-08-16 14:10:49 UTC (rev 7157) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <!-- The full qualified name of the PortalContainerConfig --> + <type>org.exoplatform.container.definition.PortalContainerConfig</type> + <init-params> + <!-- The name of the default portal container --> + <value-param> + <name>default.portal.container</name> + <value>portal</value> + </value-param> + <!-- The name of the default rest ServletContext --> + <value-param> + <name>default.rest.context</name> + <value>rest</value> + </value-param> + <!-- The name of the default realm --> + <value-param> + <name>default.realm.name</name> + <value>gatein-domain</value> + </value-param> + <!-- The default portal container definition --> + <!-- It cans be used to avoid duplicating configuration --> + <object-param> + <name>default.portal.definition</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinition"> + <!-- The path to the external properties file --> + <field name="externalSettingsPath"> + <string>configuration.properties</string> + </field> + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value> + <string>eXoResources</string> + </value> + <value> + <string>portal</string> + </value> + <value> + <string>dashboard</string> + </value> + <value> + <string>exoadmin</string> + </value> + <value> + <string>eXoGadgets</string> + </value> + <value> + <string>eXoGadgetServer</string> + </value> + <value> + <string>rest</string> + </value> + <value> + <string>wsrp-producer</string> + </value> + <value> + <string>web</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component> +</configuration>