[portal-commits] JBoss Portal SVN: r6635 - in trunk: core/src/resources/portal-core-sar/conf/identity and 2 other directories.

Author: bdaw Date: 2007-03-12 08:58:18 -0400 (Mon, 12 Mar 2007) New Revision: 6635 Added: trunk/identity/src/resources/dtd/identity-config_2_6.dtd trunk/identity/src/resources/dtd/profile-config_2_6.dtd Removed: trunk/identity/src/resources/dtd/identity-config_1_0.dtd trunk/identity/src/resources/dtd/profile-config_1_0.dtd Modified: trunk/core/build.xml trunk/core/src/resources/portal-core-sar/conf/identity/identity-config.xml trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml trunk/identity/src/resources/example/portal-sample-local.ldif Log: - correct and plug in identity dtd files Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/core/build.xml 2007-03-12 12:58:18 UTC (rev 6635) @@ -344,6 +344,12 @@ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> </copy> + + <!--dtd--> + <copy todir="${build.resources}/jboss-portal/dtd"> + <fileset dir="${jboss.portal-identity.root}/resources/dtd" includes="*.dtd"/> + </copy> + </target> Modified: trunk/core/src/resources/portal-core-sar/conf/identity/identity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/identity-config.xml 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/core/src/resources/portal-core-sar/conf/identity/identity-config.xml 2007-03-12 12:58:18 UTC (rev 6635) @@ -22,9 +22,9 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!--<!DOCTYPE identity-configuration PUBLIC + <!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> + "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd"> <identity-configuration> <datasources/> Modified: trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-03-12 12:58:18 UTC (rev 6635) @@ -22,9 +22,9 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!--<!DOCTYPE profile PUBLIC + <!DOCTYPE profile PUBLIC "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/profile-config_1_0.dtd">--> + "http://www.jboss.org/portal/dtd/profile-config_2_6.dtd"> <profile> <!--Database mapping - jbp_user table column mapping--> Modified: trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2007-03-12 12:58:18 UTC (rev 6635) @@ -26,7 +26,7 @@ <!-- <!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> + "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd"> --> <identity-configuration> Deleted: trunk/identity/src/resources/dtd/identity-config_1_0.dtd =================================================================== --- trunk/identity/src/resources/dtd/identity-config_1_0.dtd 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/identity/src/resources/dtd/identity-config_1_0.dtd 2007-03-12 12:58:18 UTC (rev 6635) @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!-- -<!DOCTYPE identity-configuration PUBLIC - "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd"> ---> - -<!-- -. ---> -<!ELEMENT identity-configuration (datasources,modules, options) > - -<!-- -. ---> -<!ELEMENT datasources (datasource*) > - -<!-- -. ---> -<!ELEMENT datasource (name, service-name?, class?, config) > - -<!-- -. ---> -<!ELEMENT name (#PCDATA) > - -<!-- -. ---> -<!ELEMENT service-name (#PCDATA) > - -<!-- -. ---> -<!ELEMENT class (#PCDATA) > - -<!-- -. ---> -<!ELEMENT config (option*)> - -<!-- -. ---> -<!ELEMENT option (name, value+) > - -<!-- -. ---> -<!ELEMENT value (#PCDATA) > - -<!-- -. ---> -<!ELEMENT modules (module*) > - -<!-- -. ---> -<!ELEMENT module (type, implementation, service-name?, class?, config) > - -<!-- -. ---> -<!ELEMENT type (#PCDATA) > - -<!-- -. ---> -<!ELEMENT implementation (#PCDATA) > - -<!-- -. ---> -<!ELEMENT options (option-group*)> - -<!-- -. ---> -<!ELEMENT option-group (group-name, option+)> - -<!-- -. ---> -<!ELEMENT group-name (#PCDATA) > - Copied: trunk/identity/src/resources/dtd/identity-config_2_6.dtd (from rev 6631, trunk/identity/src/resources/dtd/identity-config_1_0.dtd) =================================================================== --- trunk/identity/src/resources/dtd/identity-config_2_6.dtd (rev 0) +++ trunk/identity/src/resources/dtd/identity-config_2_6.dtd 2007-03-12 12:58:18 UTC (rev 6635) @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!-- +<!DOCTYPE identity-configuration PUBLIC + "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" + "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd"> +--> + +<!-- +. +--> +<!ELEMENT identity-configuration (datasources,modules, options) > + +<!-- +. +--> +<!ELEMENT datasources (datasource*) > + +<!-- +. +--> +<!ELEMENT datasource (name, service-name?, class?, config) > + +<!-- +. +--> +<!ELEMENT name (#PCDATA) > + +<!-- +. +--> +<!ELEMENT service-name (#PCDATA) > + +<!-- +. +--> +<!ELEMENT class (#PCDATA) > + +<!-- +. +--> +<!ELEMENT config (option*)> + +<!-- +. +--> +<!ELEMENT option (name, value+) > + +<!-- +. +--> +<!ELEMENT value (#PCDATA) > + +<!-- +. +--> +<!ELEMENT modules (module*) > + +<!-- +. +--> +<!ELEMENT module (type, implementation, service-name?, class?, config) > + +<!-- +. +--> +<!ELEMENT type (#PCDATA) > + +<!-- +. +--> +<!ELEMENT implementation (#PCDATA) > + +<!-- +. +--> +<!ELEMENT options (option-group*)> + +<!-- +. +--> +<!ELEMENT option-group (group-name, option+)> + +<!-- +. +--> +<!ELEMENT group-name (#PCDATA) > + Deleted: trunk/identity/src/resources/dtd/profile-config_1_0.dtd =================================================================== --- trunk/identity/src/resources/dtd/profile-config_1_0.dtd 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/identity/src/resources/dtd/profile-config_1_0.dtd 2007-03-12 12:58:18 UTC (rev 6635) @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated by the @authors tag. See the ~ - ~ copyright.txt in the distribution for a full listing of ~ - ~ individual contributors. ~ - ~ ~ - ~ 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!-- -<!DOCTYPE profile PUBLIC - "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/profile-config_1_0.dtd"> ---> - - -<!--<profile> - --><!--Database mapping - jbp_user table column mapping--><!-- - <property> - <name>portal.user.name.given</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Name</display-name> - <description xml:lang="en">The user name</description> - <mapping> - <database> - <type>column</type> - <value>jbp_username</value> - </database> - </mapping> - </property>--> - -<!-- -. ---> -<!ELEMENT profile (property+) > - -<!-- -. ---> -<!ELEMENT property (name, type, access-mode, usage, display-name, description, mapping> - -<!-- -. ---> -<!ELEMENT name (#PCDATA) > - -<!-- -. ---> -<!ELEMENT type (#PCDATA)> - -<!-- -. ---> -<!ELEMENT access-mode (#PCDATA) > - -<!-- -. ---> -<!ELEMENT usage (#PCDATA) > - -<!-- -. ---> -<!ELEMENT display-name (#PCDATA) > - -<!ATTLIST display-name - xml:lang #PCDATA> - -<!-- -. ---> -<!ELEMENT description (#PCDATA) > - -<!ATTLIST description - xml:lang #PCDATA> -<!-- -. ---> -<!ELEMENT mapping (database?, ldap?) > - -<!-- -. ---> -<!ELEMENT database (type, value) > - -<!-- -. ---> -<!ELEMENT type (#PCDATA) > - -<!-- -. ---> -<!ELEMENT value (#PCDATA) > - -<!-- -. ---> -<!ELEMENT ldap (value) > - - - - Copied: trunk/identity/src/resources/dtd/profile-config_2_6.dtd (from rev 6631, trunk/identity/src/resources/dtd/profile-config_1_0.dtd) =================================================================== --- trunk/identity/src/resources/dtd/profile-config_2_6.dtd (rev 0) +++ trunk/identity/src/resources/dtd/profile-config_2_6.dtd 2007-03-12 12:58:18 UTC (rev 6635) @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!-- +<!DOCTYPE profile PUBLIC + "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN" + "http://www.jboss.org/portal/dtd/profile-config_2_6.dtd"> +--> + + +<!--<profile> + --><!--Database mapping - jbp_user table column mapping--><!-- + <property> + <name>portal.user.name.given</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Name</display-name> + <description xml:lang="en">The user name</description> + <mapping> + <database> + <type>column</type> + <value>jbp_username</value> + </database> + </mapping> + </property>--> + +<!-- +. +--> +<!ELEMENT profile (property+) > + +<!-- +. +--> +<!ELEMENT property (name, type, access-mode, usage, display-name, description, mapping) > + +<!-- +. +--> +<!ELEMENT name (#PCDATA) > + +<!-- +. +--> +<!ELEMENT type (#PCDATA)> + +<!-- +. +--> +<!ELEMENT access-mode (#PCDATA) > + +<!-- +. +--> +<!ELEMENT usage (#PCDATA) > + +<!-- +. +--> +<!ELEMENT display-name (#PCDATA) > + +<!ATTLIST display-name + xml:lang CDATA #IMPLIED> + +<!-- +. +--> +<!ELEMENT description (#PCDATA) > + +<!ATTLIST description + xml:lang CDATA #IMPLIED> +<!-- +. +--> +<!ELEMENT mapping (database?, ldap?) > + +<!-- +. +--> +<!ELEMENT database (type, value) > + +<!-- +. +--> +<!--<!ELEMENT type (#PCDATA) >--> + +<!-- +. +--> +<!ELEMENT value (#PCDATA) > + +<!-- +. +--> +<!ELEMENT ldap (value) > + + + + Modified: trunk/identity/src/resources/example/portal-sample-local.ldif =================================================================== --- trunk/identity/src/resources/example/portal-sample-local.ldif 2007-03-12 12:24:31 UTC (rev 6634) +++ trunk/identity/src/resources/example/portal-sample-local.ldif 2007-03-12 12:58:18 UTC (rev 6635) @@ -143,4 +143,4 @@ objectClass: top cn: TheDuke description: TheDuke role context -member: uid=jduke,ou=People,o=test,dc=portal,dc=example,dc=com \ No newline at end of file +member: uid=jduke,ou=People,o=test,dc=portal,dc=example,dc=com