Author: dkatayev Date: 2009-10-20 04:49:45 -0400 (Tue, 20 Oct 2009) New Revision: 308 Added: core/trunk/component/database/src/main/resources/ core/trunk/component/database/src/main/resources/conf/ core/trunk/component/database/src/main/resources/conf/portal/ core/trunk/component/database/src/main/resources/conf/standalone/ core/trunk/component/database/src/test/resources/ core/trunk/component/database/src/test/resources/conf/ core/trunk/component/database/src/test/resources/conf/portal/ core/trunk/component/document/src/main/resources/ core/trunk/component/document/src/main/resources/conf/ core/trunk/component/document/src/main/resources/conf/configuration.xml core/trunk/component/document/src/main/resources/conf/portal/ core/trunk/component/ldap/src/main/resources/conf/ core/trunk/component/ldap/src/main/resources/conf/portal/ core/trunk/component/ldap/src/test/resources/ core/trunk/component/ldap/src/test/resources/conf/ core/trunk/component/ldap/src/test/resources/conf/portal/ core/trunk/component/organization/api/src/main/resources/ core/trunk/component/organization/api/src/main/resources/conf/ core/trunk/component/organization/api/src/main/resources/conf/portal/ core/trunk/component/organization/api/src/test/resources/conf/ core/trunk/component/organization/api/src/test/resources/conf/standalone/ core/trunk/component/organization/jdbc/src/main/resources/ core/trunk/component/organization/jdbc/src/main/resources/conf/ core/trunk/component/organization/jdbc/src/main/resources/conf/portal/ core/trunk/component/organization/jdbc/src/test/resources/ core/trunk/component/organization/jdbc/src/test/resources/conf/ core/trunk/component/organization/jdbc/src/test/resources/conf/portal/ core/trunk/component/organization/ldap/src/main/resources/ core/trunk/component/organization/ldap/src/main/resources/conf/ core/trunk/component/organization/ldap/src/main/resources/conf/portal/ core/trunk/component/organization/ldap/src/test/resources/ core/trunk/component/organization/ldap/src/test/resources/conf/ core/trunk/component/organization/ldap/src/test/resources/conf/portal/ core/trunk/component/script/groovy/src/main/resources/ core/trunk/component/script/groovy/src/main/resources/conf/ core/trunk/component/script/groovy/src/main/resources/conf/portal/ core/trunk/component/script/groovy/src/test/resources/conf/ core/trunk/component/script/groovy/src/test/resources/conf/standalone/ core/trunk/component/security/core/src/main/resources/ core/trunk/component/security/core/src/main/resources/conf/ core/trunk/component/security/core/src/main/resources/conf/portal/ core/trunk/component/security/core/src/test/resources/conf/ core/trunk/component/security/core/src/test/resources/conf/standalone/ core/trunk/component/xml-processing/src/main/resources/conf/ core/trunk/component/xml-processing/src/main/resources/conf/configuration.xml core/trunk/component/xml-processing/src/main/resources/conf/portal/ core/trunk/component/xml-processing/src/test/resources/conf/ core/trunk/component/xml-processing/src/test/resources/conf/standalone/ Removed: core/trunk/component/database/src/main/java/conf/portal/ core/trunk/component/database/src/main/java/conf/standalone/ core/trunk/component/database/src/test/java/conf/portal/ core/trunk/component/document/src/main/java/conf/configuration.xml core/trunk/component/document/src/main/java/conf/portal/ core/trunk/component/ldap/src/main/java/conf/portal/ core/trunk/component/ldap/src/test/java/conf/portal/ core/trunk/component/organization/api/src/main/java/conf/portal/ core/trunk/component/organization/api/src/test/java/conf/standalone/ core/trunk/component/organization/jdbc/src/main/java/conf/portal/ core/trunk/component/organization/jdbc/src/test/java/conf/portal/ core/trunk/component/organization/ldap/src/main/java/conf/portal/ core/trunk/component/organization/ldap/src/test/java/conf/portal/ core/trunk/component/script/groovy/src/main/java/conf/portal/ core/trunk/component/script/groovy/src/test/java/conf/standalone/ core/trunk/component/security/core/src/main/java/conf/portal/ core/trunk/component/security/core/src/test/java/conf/standalone/ core/trunk/component/xml-processing/src/main/java/conf/configuration.xml core/trunk/component/xml-processing/src/main/java/conf/portal/ core/trunk/component/xml-processing/src/test/java/conf/standalone/ Modified: core/trunk/pom.xml Log: EXOJCR-165 Resources moved from main folder to resource Copied: core/trunk/component/database/src/main/resources/conf/portal (from rev 293, core/trunk/component/database/src/main/java/conf/portal) Copied: core/trunk/component/database/src/main/resources/conf/standalone (from rev 293, core/trunk/component/database/src/main/java/conf/standalone) Copied: core/trunk/component/database/src/test/resources/conf/portal (from rev 293, core/trunk/component/database/src/test/java/conf/portal) Deleted: core/trunk/component/document/src/main/java/conf/configuration.xml =================================================================== --- core/trunk/component/document/src/main/java/conf/configuration.xml 2009-10-20 08:19:49 UTC (rev 307) +++ core/trunk/component/document/src/main/java/conf/configuration.xml 2009-10-20 08:49:45 UTC (rev 308) @@ -1,40 +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"> - - <!-- component> - <key>org.exoplatform.services.document.diff.DiffAlgorithm</key> - <type>org.exoplatform.services.document.impl.diff.SimpleDiff</type> - </component --> - - <!-- component> - <key>org.exoplatform.services.document.diff.DiffService</key> - <type>org.exoplatform.services.document.impl.diff.DiffServiceImpl</type> - </component --> - - <!-- component> - <key>org.exoplatform.services.document.impl.image.ImageProcessingService</key> - <type>org.exoplatform.services.document.impl.image.ImageProcessingServiceImpl</type> - </component --> - -</configuration> Copied: core/trunk/component/document/src/main/resources/conf/configuration.xml (from rev 293, core/trunk/component/document/src/main/java/conf/configuration.xml) =================================================================== --- core/trunk/component/document/src/main/resources/conf/configuration.xml (rev 0) +++ core/trunk/component/document/src/main/resources/conf/configuration.xml 2009-10-20 08:49:45 UTC (rev 308) @@ -0,0 +1,40 @@ +<?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"> + + <!-- component> + <key>org.exoplatform.services.document.diff.DiffAlgorithm</key> + <type>org.exoplatform.services.document.impl.diff.SimpleDiff</type> + </component --> + + <!-- component> + <key>org.exoplatform.services.document.diff.DiffService</key> + <type>org.exoplatform.services.document.impl.diff.DiffServiceImpl</type> + </component --> + + <!-- component> + <key>org.exoplatform.services.document.impl.image.ImageProcessingService</key> + <type>org.exoplatform.services.document.impl.image.ImageProcessingServiceImpl</type> + </component --> + +</configuration> Copied: core/trunk/component/document/src/main/resources/conf/portal (from rev 293, core/trunk/component/document/src/main/java/conf/portal) Copied: core/trunk/component/ldap/src/main/resources/conf/portal (from rev 293, core/trunk/component/ldap/src/main/java/conf/portal) Copied: core/trunk/component/ldap/src/test/resources/conf/portal (from rev 293, core/trunk/component/ldap/src/test/java/conf/portal) Copied: core/trunk/component/organization/api/src/main/resources/conf/portal (from rev 293, core/trunk/component/organization/api/src/main/java/conf/portal) Copied: core/trunk/component/organization/api/src/test/resources/conf/standalone (from rev 293, core/trunk/component/organization/api/src/test/java/conf/standalone) Copied: core/trunk/component/organization/jdbc/src/main/resources/conf/portal (from rev 293, core/trunk/component/organization/jdbc/src/main/java/conf/portal) Copied: core/trunk/component/organization/jdbc/src/test/resources/conf/portal (from rev 293, core/trunk/component/organization/jdbc/src/test/java/conf/portal) Copied: core/trunk/component/organization/ldap/src/main/resources/conf/portal (from rev 293, core/trunk/component/organization/ldap/src/main/java/conf/portal) Copied: core/trunk/component/organization/ldap/src/test/resources/conf/portal (from rev 293, core/trunk/component/organization/ldap/src/test/java/conf/portal) Copied: core/trunk/component/script/groovy/src/main/resources/conf/portal (from rev 293, core/trunk/component/script/groovy/src/main/java/conf/portal) Copied: core/trunk/component/script/groovy/src/test/resources/conf/standalone (from rev 293, core/trunk/component/script/groovy/src/test/java/conf/standalone) Copied: core/trunk/component/security/core/src/main/resources/conf/portal (from rev 293, core/trunk/component/security/core/src/main/java/conf/portal) Copied: core/trunk/component/security/core/src/test/resources/conf/standalone (from rev 293, core/trunk/component/security/core/src/test/java/conf/standalone) Deleted: core/trunk/component/xml-processing/src/main/java/conf/configuration.xml =================================================================== --- core/trunk/component/xml-processing/src/main/java/conf/configuration.xml 2009-10-20 08:19:49 UTC (rev 307) +++ core/trunk/component/xml-processing/src/main/java/conf/configuration.xml 2009-10-20 08:49:45 UTC (rev 308) @@ -1,89 +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"> - <component> - <type>org.exoplatform.services.xml.resolving.impl.XMLResolvingServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.resolving.table</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.xml.resolving.impl.AddXMLResolvingContextPlugin</type> - <init-params> - <properties-param> - <name>xhtml1-transitional.dtd</name> - <property name="uri" value="dtd/xhtml1-transitional.dtd" /> - <property name="publicId" value="-//W3C//DTD XHTML 1.0 Transitional//EN" /> - <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" /> - </properties-param> - <properties-param> - <name>web-app_2_3.dtd</name> - <property name="uri" value="dtd/web-app_2_3.dtd" /> - <property name="publicId" value="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" /> - <property name="systemId" value="http://java.sun.com/dtd/web-app_2_3.dtd" /> - </properties-param> - <properties-param> - <name>datatypes.dtd</name> - <property name="uri" value="dtd/datatypes.dtd" /> - <property name="systemId" value="http://www.w3.org/2001/datatypes.dtd" /> - </properties-param> - <properties-param> - <name>XMLSchema.dtd</name> - <property name="uri" value="dtd/XMLSchema.dtd" /> - <property name="publicId" value="-//W3C//DTD XMLSCHEMA 200102//EN" /> - <property name="systemId" value="http://www.w3.org/2001/XMLSchema.dtd" /> - </properties-param> - <properties-param> - <name>xhtml1-frameset.dtd</name> - <property name="uri" value="dtd/xhtml1-frameset.dtd" /> - <property name="publicId" value="-//W3C//DTD XHTML 1.0 Frameset//EN" /> - <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd" /> - </properties-param> - <properties-param> - <name>xhtml1-strict.dtd</name> - <property name="uri" value="dtd/xhtml1-strict.dtd" /> - <property name="publicId" value="-//W3C//DTD XHTML 1.0 Strict//EN" /> - <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" /> - </properties-param> - <properties-param> - <name>xhtml-lat1.ent</name> - <property name="uri" value="dtd/xhtml-lat1.ent" /> - <property name="publicId" value="-//W3C//ENTITIES Latin 1 for XHTML//EN" /> - <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" /> - </properties-param> - <properties-param> - <name>xhtml-special.ent</name> - <property name="uri" value="dtd/xhtml-special.ent" /> - <property name="publicId" value="-//W3C//ENTITIES Special for XHTML//EN" /> - <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent" /> - </properties-param> - <properties-param> - <name>xhtml-symbol.ent</name> - <property name="uri" value="dtd/xhtml-symbol.ent" /> - <property name="publicId" value="-//W3C//ENTITIES Symbols for XHTML//EN" /> - <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent" /> - </properties-param> - </init-params> - </component-plugin> - </component-plugins> - </component> -</configuration> Copied: core/trunk/component/xml-processing/src/main/resources/conf/configuration.xml (from rev 293, core/trunk/component/xml-processing/src/main/java/conf/configuration.xml) =================================================================== --- core/trunk/component/xml-processing/src/main/resources/conf/configuration.xml (rev 0) +++ core/trunk/component/xml-processing/src/main/resources/conf/configuration.xml 2009-10-20 08:49:45 UTC (rev 308) @@ -0,0 +1,89 @@ +<?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"> + <component> + <type>org.exoplatform.services.xml.resolving.impl.XMLResolvingServiceImpl</type> + <component-plugins> + <component-plugin> + <name>add.resolving.table</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.xml.resolving.impl.AddXMLResolvingContextPlugin</type> + <init-params> + <properties-param> + <name>xhtml1-transitional.dtd</name> + <property name="uri" value="dtd/xhtml1-transitional.dtd" /> + <property name="publicId" value="-//W3C//DTD XHTML 1.0 Transitional//EN" /> + <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" /> + </properties-param> + <properties-param> + <name>web-app_2_3.dtd</name> + <property name="uri" value="dtd/web-app_2_3.dtd" /> + <property name="publicId" value="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" /> + <property name="systemId" value="http://java.sun.com/dtd/web-app_2_3.dtd" /> + </properties-param> + <properties-param> + <name>datatypes.dtd</name> + <property name="uri" value="dtd/datatypes.dtd" /> + <property name="systemId" value="http://www.w3.org/2001/datatypes.dtd" /> + </properties-param> + <properties-param> + <name>XMLSchema.dtd</name> + <property name="uri" value="dtd/XMLSchema.dtd" /> + <property name="publicId" value="-//W3C//DTD XMLSCHEMA 200102//EN" /> + <property name="systemId" value="http://www.w3.org/2001/XMLSchema.dtd" /> + </properties-param> + <properties-param> + <name>xhtml1-frameset.dtd</name> + <property name="uri" value="dtd/xhtml1-frameset.dtd" /> + <property name="publicId" value="-//W3C//DTD XHTML 1.0 Frameset//EN" /> + <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd" /> + </properties-param> + <properties-param> + <name>xhtml1-strict.dtd</name> + <property name="uri" value="dtd/xhtml1-strict.dtd" /> + <property name="publicId" value="-//W3C//DTD XHTML 1.0 Strict//EN" /> + <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" /> + </properties-param> + <properties-param> + <name>xhtml-lat1.ent</name> + <property name="uri" value="dtd/xhtml-lat1.ent" /> + <property name="publicId" value="-//W3C//ENTITIES Latin 1 for XHTML//EN" /> + <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" /> + </properties-param> + <properties-param> + <name>xhtml-special.ent</name> + <property name="uri" value="dtd/xhtml-special.ent" /> + <property name="publicId" value="-//W3C//ENTITIES Special for XHTML//EN" /> + <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent" /> + </properties-param> + <properties-param> + <name>xhtml-symbol.ent</name> + <property name="uri" value="dtd/xhtml-symbol.ent" /> + <property name="publicId" value="-//W3C//ENTITIES Symbols for XHTML//EN" /> + <property name="systemId" value="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent" /> + </properties-param> + </init-params> + </component-plugin> + </component-plugins> + </component> +</configuration> Copied: core/trunk/component/xml-processing/src/main/resources/conf/portal (from rev 293, core/trunk/component/xml-processing/src/main/java/conf/portal) Copied: core/trunk/component/xml-processing/src/test/resources/conf/standalone (from rev 293, core/trunk/component/xml-processing/src/test/java/conf/standalone) Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-10-20 08:19:49 UTC (rev 307) +++ core/trunk/pom.xml 2009-10-20 08:49:45 UTC (rev 308) @@ -357,42 +357,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.groovy</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.groovy</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.groovy</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.groovy</include> - </includes> - </testResource> - </testResources> <plugins> <plugin>