← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19955: Moved Oath2Client to appropriate folder

 

------------------------------------------------------------
revno: 19955
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-09-03 10:26:45 +0200
message:
  Moved Oath2Client to appropriate folder
removed:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/oauth2.hibernate/
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/oauth2.hibernate/OAuth2Client.hbm.xml
added:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate/
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate/OAuth2Client.hbm.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/oauth2.hibernate'
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/oauth2.hibernate/OAuth2Client.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/oauth2.hibernate/OAuth2Client.hbm.xml	2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/oauth2.hibernate/OAuth2Client.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
-  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-  >
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.security.oauth2.OAuth2Client" table="oauth2client">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="oauth2clientid">
-      <generator class="native" />
-    </id>
-    &identifiableProperties;
-
-    <property name="name" column="name" not-null="true" unique="true" length="230" />
-
-    <property name="cid" column="cid" not-null="true" unique="true" length="230" />
-
-    <property name="secret" column="secret" not-null="true" unique="false" length="512" />
-
-    <list name="redirectUris" table="oauth2clientredirecturis" cascade="all-delete-orphan">
-      <cache usage="read-write" />
-      <key column="oauth2clientid" foreign-key="fk_oauth2clientredirecturis_oauth2clientid" />
-      <list-index column="sort_order" base="0" />
-      <element type="string" column="redirecturi" />
-    </list>
-
-    <list name="grantTypes" table="oauth2clientgranttypes" cascade="all-delete-orphan">
-      <cache usage="read-write" />
-      <key column="oauth2clientid" foreign-key="fk_oauth2clientgranttypes_oauth2clientid" />
-      <list-index column="sort_order" base="0" />
-      <element type="string" column="granttype" />
-    </list>
-
-  </class>
-</hibernate-mapping>

=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security'
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2'
=== added directory 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate'
=== added file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate/OAuth2Client.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate/OAuth2Client.hbm.xml	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate/OAuth2Client.hbm.xml	2015-09-03 08:26:45 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.security.oauth2.OAuth2Client" table="oauth2client">
+
+    <cache usage="read-write" />
+
+    <id name="id" column="oauth2clientid">
+      <generator class="native" />
+    </id>
+    &identifiableProperties;
+
+    <property name="name" column="name" not-null="true" unique="true" length="230" />
+
+    <property name="cid" column="cid" not-null="true" unique="true" length="230" />
+
+    <property name="secret" column="secret" not-null="true" unique="false" length="512" />
+
+    <list name="redirectUris" table="oauth2clientredirecturis" cascade="all-delete-orphan">
+      <cache usage="read-write" />
+      <key column="oauth2clientid" foreign-key="fk_oauth2clientredirecturis_oauth2clientid" />
+      <list-index column="sort_order" base="0" />
+      <element type="string" column="redirecturi" />
+    </list>
+
+    <list name="grantTypes" table="oauth2clientgranttypes" cascade="all-delete-orphan">
+      <cache usage="read-write" />
+      <key column="oauth2clientid" foreign-key="fk_oauth2clientgranttypes_oauth2clientid" />
+      <list-index column="sort_order" base="0" />
+      <element type="string" column="granttype" />
+    </list>
+
+  </class>
+</hibernate-mapping>