Author: chris.laprun(a)jboss.com Date: 2009-12-14 16:14:23 -0500 (Mon, 14 Dec 2009) New Revision: 1010 Removed: portal/branches/wsrp-integration/component/portal/src/main/java/conf/configuration.xml portal/branches/wsrp-integration/component/portal/src/main/java/conf/portal/ portal/branches/wsrp-integration/component/portal/src/main/java/org/exoplatform/portal/pom/registry/ Log: - Merged trunk changes from revision 991 to 992 Deleted: portal/branches/wsrp-integration/component/portal/src/main/java/conf/configuration.xml =================================================================== --- portal/branches/wsrp-integration/component/portal/src/main/java/conf/configuration.xml 2009-12-14 20:48:00 UTC (rev 1009) +++ portal/branches/wsrp-integration/component/portal/src/main/java/conf/configuration.xml 2009-12-14 21:14:23 UTC (rev 1010) @@ -1,27 +0,0 @@ -<?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_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -</configuration>