hq r1151 - in trunk/sql: . appdef authz

[jtravis_hyperic]

Why does Virtual belong in Authz vs Appdef?

-- Jon


On Nov 4, 2006, at 10:20 PM, clee@hyperic.com wrote:

> Author: clee
> Date: 2006-11-04 22:20:21 -0800 (Sat, 04 Nov 2006)
> New Revision: 1151
> URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=1151
>
> Added:
> trunk/sql/authz/Virutal.hq-xml
> Removed:
> trunk/sql/appdef-view.xml
> trunk/sql/appdef/Virutal.hq-xml
> Log:
> Move Virtual table definition from appdef to authz
>
>
> Deleted: trunk/sql/appdef/Virutal.hq-xml
> ===================================================================
> --- trunk/sql/appdef/Virutal.hq-xml 2006-11-04 17:55:10 UTC (rev 1150)
> +++ trunk/sql/appdef/Virutal.hq-xml 2006-11-05 06:20:21 UTC (rev 1151)
> @@ -1,29 +0,0 @@
> -<?xml version="1.0" encoding="iso-8859-1"?>
> -
> -<!DOCTYPE hibernate-mapping PUBLIC
> - "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
> - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
> -
> -<hibernate-mapping
> - package="org.hyperic.hq.appdef">
> -
> - <class name="Virtual" table="EAM_VIRTUAL">
> - <id name="resourceId" type="integer">
> - <column name="RESOURCE_ID" not-null="true" />
> - <generator class="assigned" />
> - </id>
> -
> - <version name="_version_" type="long">
> - <column name ="VERSION_COL" default="0" />
> - </version>
> -
> - <property name="processId" type="integer">
> - <column name="PROCESS_ID" not-null="true" />
> - </property>
> -
> - <property name="physicalId" type="integer">
> - <column name="PHYSICAL_ID" />
> - </property>
> - </class>
> -
> -</hibernate-mapping>
>
> Deleted: trunk/sql/appdef-view.xml
> ===================================================================
> --- trunk/sql/appdef-view.xml 2006-11-04 17:55:10 UTC (rev 1150)
> +++ trunk/sql/appdef-view.xml 2006-11-05 06:20:21 UTC (rev 1151)
> @@ -1,44 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<Covalent.DBSetup name="appdef-schema.xml" notice="DBSetup,
> Copyright (C) 2002, Covalent Technologies, Inc., All Rights
> Reserved.">
> - <view name="EAM_VIRT_PLAT_VIEW">
> - <query>
> - SELECT
> - p.*, v.RESOURCE_ID, PROCESS_ID, PHYSICAL_ID
> - FROM
> - EAM_PLATFORM p, EAM_RESOURCE r, EAM_RESOURCE_TYPE rt,
> - EAM_VIRTUAL v
> - WHERE rt.name = 'covalentEAMPlatform' AND
> - r.resource_type_id = rt.id AND
> - r.instance_id = p.id AND
> - r.id = v.resource_id
> - </query>
> - </view>
> -
> - <view name="EAM_VIRT_SVR_VIEW">
> - <query>
> - SELECT
> - s.*, v.RESOURCE_ID, PROCESS_ID, PHYSICAL_ID
> - FROM
> - EAM_SERVER s, EAM_RESOURCE r, EAM_RESOURCE_TYPE rt,
> - EAM_VIRTUAL v
> - WHERE rt.name = 'covalentEAMServer' AND
> - r.resource_type_id = rt.id AND
> - r.instance_id = s.id AND
> - r.id = v.resource_id
> - </query>
> - </view>
> -
> - <view name="EAM_VIRT_SVC_VIEW">
> - <query>
> - SELECT
> - s.*, v.RESOURCE_ID, PROCESS_ID, PHYSICAL_ID
> - FROM
> - EAM_SERVICE s, EAM_RESOURCE r, EAM_RESOURCE_TYPE rt,
> - EAM_VIRTUAL v
> - WHERE rt.name = 'covalentEAMService' AND
> - r.resource_type_id = rt.id AND
> - r.instance_id = s.id AND
> - r.id = v.resource_id
> - </query>
> - </view>
> -</Covalent.DBSetup>
>
> Copied: trunk/sql/authz/Virutal.hq-xml (from rev 1150, trunk/sql/
> appdef/Virutal.hq-xml)
> ===================================================================
> --- trunk/sql/authz/Virutal.hq-xml (rev 0)
> +++ trunk/sql/authz/Virutal.hq-xml 2006-11-05 06:20:21 UTC (rev 1151)
> @@ -0,0 +1,34 @@
> +<?xml version="1.0" encoding="iso-8859-1"?>
> +
> +<!DOCTYPE hibernate-mapping PUBLIC
> + "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
> + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
> +
> +<hibernate-mapping
> + package="org.hyperic.hq.authz">
> +
> + <class name="Virtual" table="EAM_VIRTUAL">
> + <id name="id" type="integer">
> + <column name="RESOURCE_ID" not-null="true" />
> + <generator class="assigned" />
> + </id>
> +
> + <version name="_version_" type="long">
> + <column name ="VERSION_COL" default="0" />
> + </version>
> +
> + <property name="processId" type="integer">
> + <column name="PROCESS_ID" not-null="true" />
> + </property>
> +
> + <property name="physicalId" type="integer">
> + <column name="PHYSICAL_ID" />
> + </property>
> +
> + <many-to-one name="resource" class="Resource" insert="false"
> update="false">
> + <column name="RESOURCE_ID" />
> + </many-to-one>
> +
> + </class>
> +
> +</hibernate-mapping>
>

[admin]

Virtual table is a mapping of resources (based on resource IDs).  It seemed like it belonged with the rest of the resources schema stuff.

Charles

On Nov 6, 2006, at 9:44 AM, Jon Travis wrote:

Why does Virtual belong in Authz vs Appdef?

-- Jon

On Nov 4, 2006, at 10:20 PM, clee@hyperic.com wrote:

Author: clee

Date: 2006-11-04 22:20:21 -0800 (Sat, 04 Nov 2006)

New Revision: 1151

URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=1151

Added:

   trunk/sql/authz/Virutal.hq-xml

Removed:

   trunk/sql/appdef-view.xml

   trunk/sql/appdef/Virutal.hq-xml

Log:

Move Virtual table definition from appdef to authz

Deleted: trunk/sql/appdef/Virutal.hq-xml

===================================================================

--- trunk/sql/appdef/Virutal.hq-xml 2006-11-04 17:55:10 UTC (rev 1150)

+++ trunk/sql/appdef/Virutal.hq-xml 2006-11-05 06:20:21 UTC (rev 1151)

@@ -1,29 +0,0 @@

-<?xml version="1.0" encoding="iso-8859-1"?>

-

-<!DOCTYPE hibernate-mapping PUBLIC

-      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"

-      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">

-

-<hibernate-mapping

-  package="org.hyperic.hq.appdef">

-

-  <class name="Virtual" table="EAM_VIRTUAL">

-    <id name="resourceId" type="integer">

-      <column name="RESOURCE_ID" not-null="true" />

-      <generator class="assigned" />

-    </id>

-

-    <version name="_version_" type="long">

-      <column name ="VERSION_COL" default="0" />

-    </version>

-

-    <property name="processId" type="integer">

-      <column name="PROCESS_ID" not-null="true" />

-    </property>

-

-    <property name="physicalId" type="integer">

-      <column name="PHYSICAL_ID" />

-    </property>

-  </class>

-

-</hibernate-mapping>

Deleted: trunk/sql/appdef-view.xml

===================================================================

--- trunk/sql/appdef-view.xml 2006-11-04 17:55:10 UTC (rev 1150)

+++ trunk/sql/appdef-view.xml 2006-11-05 06:20:21 UTC (rev 1151)

@@ -1,44 +0,0 @@

-<?xml version="1.0" encoding="UTF-8"?>

-<Covalent.DBSetup name="appdef-schema.xml" notice="DBSetup, Copyright (C) 2002, Covalent Technologies, Inc., All Rights Reserved.">

-    <view name="EAM_VIRT_PLAT_VIEW">

-        <query>

-        SELECT

-          p.*, v.RESOURCE_ID, PROCESS_ID, PHYSICAL_ID

-        FROM

-           EAM_PLATFORM p, EAM_RESOURCE r, EAM_RESOURCE_TYPE rt,

-           EAM_VIRTUAL v

-        WHERE rt.name = 'covalentEAMPlatform' AND

-              r.resource_type_id = rt.id AND

-              r.instance_id = p.id AND

-              r.id = v.resource_id

-        </query>

-    </view>

-

-    <view name="EAM_VIRT_SVR_VIEW">

-        <query>

-        SELECT

-          s.*, v.RESOURCE_ID, PROCESS_ID, PHYSICAL_ID

-        FROM

-           EAM_SERVER s, EAM_RESOURCE r, EAM_RESOURCE_TYPE rt,

-           EAM_VIRTUAL v

-        WHERE rt.name = 'covalentEAMServer' AND

-              r.resource_type_id = rt.id AND

-              r.instance_id = s.id AND

-              r.id = v.resource_id

-        </query>

-    </view>

-

-    <view name="EAM_VIRT_SVC_VIEW">

-        <query>

-        SELECT

-          s.*, v.RESOURCE_ID, PROCESS_ID, PHYSICAL_ID

-        FROM

-           EAM_SERVICE s, EAM_RESOURCE r, EAM_RESOURCE_TYPE rt,

-           EAM_VIRTUAL v

-        WHERE rt.name = 'covalentEAMService' AND

-              r.resource_type_id = rt.id AND

-              r.instance_id = s.id AND

-              r.id = v.resource_id

-        </query>

-    </view>

-</Covalent.DBSetup>

Copied: trunk/sql/authz/Virutal.hq-xml (from rev 1150, trunk/sql/appdef/Virutal.hq-xml)

===================================================================

--- trunk/sql/authz/Virutal.hq-xml                         (rev 0)

+++ trunk/sql/authz/Virutal.hq-xml 2006-11-05 06:20:21 UTC (rev 1151)

@@ -0,0 +1,34 @@

+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!DOCTYPE hibernate-mapping PUBLIC

+      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"

+      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">

+

+<hibernate-mapping

+  package="org.hyperic.hq.authz">

+

+  <class name="Virtual" table="EAM_VIRTUAL">

+     <id name="id" type="integer">

+       <column name="RESOURCE_ID" not-null="true" />

+       <generator class="assigned" />

+     </id>

+

+    <version name="_version_" type="long">

+      <column name ="VERSION_COL" default="0" />

+    </version>

+

+    <property name="processId" type="integer">

+      <column name="PROCESS_ID" not-null="true" />

+    </property>

+

+    <property name="physicalId" type="integer">

+      <column name="PHYSICAL_ID" />

+    </property>

+

+    <many-to-one name="resource" class="Resource" insert="false" update="false">

+      <column name="RESOURCE_ID" />

+    </many-to-one>

+

+  </class>

+

+</hibernate-mapping>