Author: fdesbois Date: 2010-01-06 16:42:04 +0100 (Wed, 06 Jan 2010) New Revision: 1748 Added: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml Modified: trunk/topia-service-history/src/main/xmi/TopiaHistory.zargo trunk/topia-service-security/src/main/xmi/TopiaSecurity.zargo Log: change model version to 1.1 (change mapping from #177) Added: trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml =================================================================== --- trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml (rev 0) +++ trunk/topia-service-history/src/main/resources/oldmappings/TopiaHistory/1.1/org/nuiton/topia/history/entities/HistoryImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.history.entities"> + <class name="org.nuiton.topia.history.entities.HistoryImpl" table="history" node="org.nuiton.topia.history.entities.HistoryImpl" abstract="false" proxy="org.nuiton.topia.history.entities.History" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="actionDate" type="java.util.Date" access="field" column="actionDate" node="actionDate"/> + <property name="userId" type="text" access="field" column="userId" node="userId"/> + <property name="action" type="int" access="field" column="action" node="action"/> + <property name="type" type="text" access="field" column="type" node="type"/> + <property name="target" type="text" access="field" column="target" node="target"/> + </class> +</hibernate-mapping> Modified: trunk/topia-service-history/src/main/xmi/TopiaHistory.zargo =================================================================== (Binary files differ) Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization" > + <!--key column="topiaId"/--> + <property name="idBeginAssociation" type="text" access="field" column="idBeginAssociation" node="idBeginAssociation"/> + <property name="nameAssociation" type="text" access="field" column="nameAssociation" node="nameAssociation"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + <property name="principals" type="serializable" access="field" column="principals" node="principals"/> + </union-subclass> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization" > + <!--key column="topiaId"/--> + <property name="expression" type="text" access="field" column="expression" node="expression"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + <property name="principals" type="serializable" access="field" column="principals" node="principals"/> + </union-subclass> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> + <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="replace" type="text" access="field" column="replace" node="replace"/> + <property name="by" type="text" access="field" column="by" node="by"/> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> + <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="description" type="text" access="field" column="description" node="description"/> + <bag name="topiaUser" table="topiagroup_topiauser" lazy="true" node="topiaUser" embed-xml="true"> + <key column="topiaGroup"/> + <many-to-many class="org.nuiton.topia.security.entities.user.TopiaUserImpl" column="topiaUser" node="topiaId"/> + </bag> + <many-to-one name="superGroup" class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" column="superGroup" node="superGroup/@topiaId" embed-xml="false"/> + <bag name="subGroup" inverse="true" lazy="true" node="subGroup" embed-xml="false"> + <key column="superGroup"/> + <one-to-many class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> + <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="note" type="text" access="field" column="note" node="note"/> + <property name="linkApplication" type="text" access="field" column="linkApplication" node="linkApplication"/> + <bag name="topiaGroup" table="topiagroup_topiauser" inverse="true" lazy="true" node="topiaGroup" embed-xml="true"> + <key column="topiaUser"/> + <many-to-many class="org.nuiton.topia.security.entities.user.TopiaGroupImpl" column="topiaGroup" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> + <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="expression" type="text" access="field" column="expression" node="expression"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> + <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <bag name="authorizations" table="authorizations_principals" lazy="false" node="authorizations" embed-xml="true"> + <key column="principals"/> + <many-to-many class="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" column="authorizations" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml (rev 0) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-01-06 15:42:04 UTC (rev 1748) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> + <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="enabled" type="boolean" access="field" column="enabled" node="enabled"/> + <property name="lastConnectionDate" type="java.util.Date" access="field" column="lastConnectionDate" node="lastConnectionDate"/> + <property name="numberOfConnection" type="int" access="field" column="numberOfConnection" node="numberOfConnection"/> + <property name="link" type="text" access="field" column="link" node="link"/> + <bag name="principals" table="principals_users" lazy="true" node="principals" embed-xml="true"> + <key column="users"/> + <many-to-many class="org.nuiton.topia.taas.entities.TaasPrincipalImpl" column="principals" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Modified: trunk/topia-service-security/src/main/xmi/TopiaSecurity.zargo =================================================================== (Binary files differ)