[openmeetings-dev] [openmeetings] r2821 committed - Update Issue 1094...

openmeetings Thu, 21 Jan 2010 06:06:53 -0800

Revision: 2821
Author: seba.wagner
Date: Thu Jan 21 05:58:03 2010
Log: Update Issue 1094
Add Table for Sip-User Data
http://code.google.com/p/openmeetings/source/detail?r=2821


Added:

/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xml/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/UserSipData.java

Modified:
 /trunk/singlewebapp/WebContent/conf/any_hibernate.cfg.xml
 /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml
 /trunk/singlewebapp/WebContent/conf/mysql_hibernate.cfg.xml
 /trunk/singlewebapp/WebContent/conf/postgres_hibernate.cfg.xml
 /trunk/singlewebapp/src/app/logback.xml

/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/Users.hbm.xml/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/Users.java


=======================================
--- /dev/null

+++/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xmlThu Jan 21 05:58:03 2010

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>

+
+<hibernate-mapping>

+ <class table="user_sip_data" lazy="false"name="org.openmeetings.app.hibernate.beans.user.UserSipData">

+    <id column="user_sip_data_id" name="userSipDataId">
+      <generator class="increment"/>
+    </id>
+    <property name="username" type="string" column="username"/>
+    <property name="userpass" type="string" column="userpass"/>
+    <property name="authId" type="string" column="authId"/>
+    <property name="inserted" type="java.util.Date" column="inserted"/>
+    <property name="updated" type="java.util.Date" column="updated"/>
+  </class>
+</hibernate-mapping>
=======================================
--- /dev/null

+++/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/UserSipData.javaThu Jan 21 05:58:03 2010

@@ -0,0 +1,94 @@
+package org.openmeetings.app.hibernate.beans.user;
+
+import java.util.Date;
+
+/**
+ *
+ * @hibernate.class table="user_sip_data"
+ * lazy="false"
+ *
+ */
+public class UserSipData {
+
+       private long userSipDataId;
+       private String username;
+       private String userpass;
+       private String authId;
+       private Date inserted;
+       private Date updated;
+
+    /**
+     *
+     * @hibernate.id
+     *  column="user_sip_data_id"
+     *  generator-class="increment"
+     */
+       public long getUserSipDataId() {
+               return userSipDataId;
+       }
+       public void setUserSipDataId(long userSipDataId) {
+               this.userSipDataId = userSipDataId;
+       }
+
+    /**
+     * @hibernate.property
+     *  column="username"
+     *  type="string"
+     */
+       public String getUsername() {
+               return username;
+       }
+       public void setUsername(String username) {
+               this.username = username;
+       }
+
+    /**
+     * @hibernate.property
+     *  column="userpass"
+     *  type="string"
+     */
+       public String getUserpass() {
+               return userpass;
+       }
+       public void setUserpass(String userpass) {
+               this.userpass = userpass;
+       }
+
+    /**
+     * @hibernate.property
+     *  column="authId"
+     *  type="string"
+     */
+       public String getAuthId() {
+               return authId;
+       }
+       public void setAuthId(String authId) {
+               this.authId = authId;
+       }
+
+    /**
+     * @hibernate.property
+     *  column="inserted"
+     *  type="java.util.Date"
+     */
+       public Date getInserted() {
+               return inserted;
+       }
+       public void setInserted(Date inserted) {
+               this.inserted = inserted;
+       }
+
+    /**
+     * @hibernate.property
+     *  column="updated"
+     *  type="java.util.Date"
+     */
+       public Date getUpdated() {
+               return updated;
+       }
+       public void setUpdated(Date updated) {
+               this.updated = updated;
+       }
+
+
+}
=======================================

--- /trunk/singlewebapp/WebContent/conf/any_hibernate.cfg.xml Wed Jan 1312:59:26 2010+++ /trunk/singlewebapp/WebContent/conf/any_hibernate.cfg.xml Thu Jan 2105:58:03 2010

@@ -77,16 +77,18 @@

<mappingresource="org/openmeetings/app/hibernate/beans/recording/RoomRecording.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/recording/RoomStream.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.hbm.xml"/>+ <mappingresource="org/openmeetings/app/hibernate/beans/rooms/RoomModerators.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/>- <mappingresource="org/openmeetings/app/hibernate/beans/rooms/RoomModerators.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/>+ <mappingresource="org/openmeetings/app/hibernate/beans/user/UserSipData.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/user/Usergroups.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/user/Userlevel.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/user/Users.hbm.xml"/><mappingresource="org/openmeetings/app/hibernate/beans/user/Users_Usergroups.hbm.xml"/>

+
        </session-factory>

 </hibernate-configuration>
=======================================

--- /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Thu Jan 1409:28:56 2010+++ /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Thu Jan 2105:58:03 2010

@@ -83,16 +83,18 @@

+
        </session-factory>

 </hibernate-configuration>
=======================================

--- /trunk/singlewebapp/WebContent/conf/mysql_hibernate.cfg.xml Wed Jan 1312:59:26 2010+++ /trunk/singlewebapp/WebContent/conf/mysql_hibernate.cfg.xml Thu Jan 2105:58:03 2010

@@ -83,16 +83,18 @@

+
        </session-factory>

 </hibernate-configuration>
=======================================

--- /trunk/singlewebapp/WebContent/conf/postgres_hibernate.cfg.xml Wed Jan13 12:59:26 2010+++ /trunk/singlewebapp/WebContent/conf/postgres_hibernate.cfg.xml Thu Jan21 05:58:03 2010

@@ -66,15 +66,17 @@

+
  </session-factory>
 </hibernate-configuration>
=======================================
--- /trunk/singlewebapp/src/app/logback.xml     Fri Dec 18 08:09:48 2009
+++ /trunk/singlewebapp/src/app/logback.xml     Thu Jan 21 05:58:03 2010
@@ -48,7 +48,7 @@
                </layout>
        </appender>
        <root>
-               <level value="DEBUG" />
+               <level value="ERROR" />
                <appender-ref ref="CONSOLE" />
                <appender-ref ref="FILE" />
                <appender-ref ref="ERRORFILE" />
=======================================

---/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/Users.hbm.xmlMon Oct 12 02:51:43 2009+++/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/Users.hbm.xmlThu Jan 21 05:58:03 2010

@@ -32,5 +32,6 @@
     <property name="activatehash" type="string" column="activatehash"/>
     <property name="externalUserId" type="long" column="externalUserId"/>

<property name="externalUserType" type="string"column="externalUserType"/>+ <many-to-one outer-join="true" insert="true" column="userSipDataId"lazy="false" update="true" name="userSipData"class="org.openmeetings.app.hibernate.beans.user.UserSipData"/>

   </class>
 </hibernate-mapping>
=======================================

---/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/Users.javaFri Nov 13 06:57:43 2009+++/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/user/Users.javaThu Jan 21 05:58:03 2010

@@ -45,20 +45,31 @@

     private Set organisation_users;

+    private UserSipData userSipData;
+
     //Vars to simulate external Users
     private Long externalUserId;
     private String externalUserType;

     private Sessiondata sessionData;

-
-    //TODO: Fehlende adressids fuer rechnung und lieferadresse
-
        public Users() {
                super();
                // TODO Auto-generated constructor stub
        }

+    /**
+     *
+     * @hibernate.id
+     *  column="user_id"
+     *  generator-class="increment"
+     */
+       public Long getUser_id() {
+               return user_id;
+       }
+       public void setUser_id(Long user_id) {
+               this.user_id = user_id;
+       }

     /**
         * @hibernate.many-to-one
@@ -75,8 +86,7 @@
        public void setAdresses(Adresses adresses) {
                this.adresses = adresses;
        }
-
-
+
     /**
      * @hibernate.property
      *  column="age"
@@ -236,20 +246,6 @@
        public void setTitle_id(Integer title_id) {
                this.title_id = title_id;
        }
-
-    /**
-     *
-     * @hibernate.id
-     *  column="user_id"
-     *  generator-class="increment"
-     */
-       public Long getUser_id() {
-               return user_id;
-       }
-       public void setUser_id(Long user_id) {
-               this.user_id = user_id;
-       }
-

        public Usergroups[] getUsergroups() {
                return usergroups;
@@ -401,7 +397,21 @@
        public void setSessionData(Sessiondata sessionData) {
                this.sessionData = sessionData;
        }
-
-
+
+    /**
+        * @hibernate.many-to-one
+        * column = "userSipDataId"
+        * class = "org.openmeetings.app.hibernate.beans.user.UserSipData"
+        * insert="true"
+        * update="true"
+        * outer-join="true"
+        * lazy="false"
+     */
+       public UserSipData getUserSipData() {
+               return userSipData;
+       }
+       public void setUserSipData(UserSipData userSipData) {
+               this.userSipData = userSipData;
+       }

 }

-- 
You received this message because you are subscribed to the Google Groups 
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/openmeetings-dev?hl=en.

[openmeetings-dev] [openmeetings] r2821 committed - Update Issue 1094...

Reply via email to