[gatein-commits] gatein SVN: r2236 - in portal/trunk: component/web/src/main/java/org/exoplatform/web/security/security and 3 other directories.

Author: julien_viet Date: 2010-03-13 14:38:07 -0500 (Sat, 13 Mar 2010) New Revision: 2236 Modified: portal/trunk/component/web/src/main/java/conf/autologin-nodetypes.xml portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java portal/trunk/gadgets/core/src/main/java/conf/gadgettoken-nodetypes.xml portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenContainer.java portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenEntry.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml Log: rename autologin namespace to token Modified: portal/trunk/component/web/src/main/java/conf/autologin-nodetypes.xml =================================================================== --- portal/trunk/component/web/src/main/java/conf/autologin-nodetypes.xml 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/component/web/src/main/java/conf/autologin-nodetypes.xml 2010-03-13 19:38:07 UTC (rev 2236) @@ -20,22 +20,22 @@ --> <nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"> - <nodeType name="lgn:tokencontainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <nodeType name="tkn:tokencontainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> <supertype>mix:referenceable</supertype> </supertypes> <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="lgn:tokenentry" autoCreated="false" mandatory="false" + <childNodeDefinition name="*" defaultPrimaryType="tkn:tokenentry" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> <requiredPrimaryTypes> - <requiredPrimaryType>lgn:tokenentry</requiredPrimaryType> + <requiredPrimaryType>tkn:tokenentry</requiredPrimaryType> </requiredPrimaryTypes> </childNodeDefinition> </childNodeDefinitions> </nodeType> - <nodeType name="lgn:tokenentry" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <nodeType name="tkn:tokenentry" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> <supertype>mix:referenceable</supertype> Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-03-13 19:38:07 UTC (rev 2236) @@ -32,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@PrimaryType(name = "lgn:tokencontainer") +@PrimaryType(name = "tkn:tokencontainer") public abstract class TokenContainer { Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-03-13 19:38:07 UTC (rev 2236) @@ -31,7 +31,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@PrimaryType(name = "lgn:tokenentry") +@PrimaryType(name = "tkn:tokenentry") public abstract class TokenEntry { Modified: portal/trunk/gadgets/core/src/main/java/conf/gadgettoken-nodetypes.xml =================================================================== --- portal/trunk/gadgets/core/src/main/java/conf/gadgettoken-nodetypes.xml 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/gadgets/core/src/main/java/conf/gadgettoken-nodetypes.xml 2010-03-13 19:38:07 UTC (rev 2236) @@ -20,22 +20,22 @@ --> <nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"> - <nodeType name="lgn:gadgettokencontainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <nodeType name="tkn:gadgettokencontainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> <supertype>mix:referenceable</supertype> </supertypes> <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="lgn:gadgettoken" autoCreated="false" mandatory="false" + <childNodeDefinition name="*" defaultPrimaryType="tkn:gadgettoken" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> <requiredPrimaryTypes> - <requiredPrimaryType>lgn:gadgettoken</requiredPrimaryType> + <requiredPrimaryType>tkn:gadgettoken</requiredPrimaryType> </requiredPrimaryTypes> </childNodeDefinition> </childNodeDefinitions> </nodeType> - <nodeType name="lgn:gadgettoken" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <nodeType name="tkn:gadgettoken" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> <supertype>mix:referenceable</supertype> Modified: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenContainer.java =================================================================== --- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenContainer.java 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenContainer.java 2010-03-13 19:38:07 UTC (rev 2236) @@ -8,7 +8,7 @@ import java.util.Map; -@PrimaryType(name = "lgn:gadgettokencontainer") +@PrimaryType(name = "tkn:gadgettokencontainer") public abstract class GadgetTokenContainer { @Create Modified: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenEntry.java =================================================================== --- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenEntry.java 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenEntry.java 2010-03-13 19:38:07 UTC (rev 2236) @@ -5,7 +5,7 @@ import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; -@PrimaryType(name = "lgn:gadgettoken") +@PrimaryType(name = "tkn:gadgettoken") public abstract class GadgetTokenEntry { Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-13 18:34:27 UTC (rev 2235) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-13 19:38:07 UTC (rev 2236) @@ -94,14 +94,14 @@ <init-params> <properties-param> <name>namespaces</name> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/> - <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> - <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/> - <property name="lgn" value="http://www.gatein.org/jcr/autologin/1.0/"/> - <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> - <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/> - </properties-param> + <property name="dc" value="http://purl.org/dc/elements/1.1/"/> + <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/> + <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> + <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/> + <property name="tkn" value="http://www.gatein.org/jcr/token/1.0/"/> + <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> + <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/> + </properties-param> </init-params> </component-plugin> <component-plugin>