SAK-29569 Rearange the OAuth project for Eclipse

Eclipse doesn't support nested projects and so some projects weren't getting imported into Eclipse. This was resulting in workspace build errors. Although maven was building all these projects fine.
rifqioe · Jun 23, 2015 · 9a71a35 · 9a71a35
1 parent 3a7207e
commit 9a71a35
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 6 deletions.
diff --git a/oauth/impl/dao-hbm/pom.xml → oauth/dao-hbm/pom.xml b/oauth/impl/dao-hbm/pom.xml → oauth/dao-hbm/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
         <version>1.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>oauth-dao-hbm</artifactId>

diff --git a/...oject/oauth/dao/HibernateAccessorDao.java → ...oject/oauth/dao/HibernateAccessorDao.java b/...oject/oauth/dao/HibernateAccessorDao.java → ...oject/oauth/dao/HibernateAccessorDao.java
diff --git a/...oject/oauth/dao/HibernateConsumerDao.java → ...oject/oauth/dao/HibernateConsumerDao.java b/...oject/oauth/dao/HibernateConsumerDao.java → ...oject/oauth/dao/HibernateConsumerDao.java
diff --git a/...g/sakaiproject/oauth/dao/Accessor.hbm.xml → ...g/sakaiproject/oauth/dao/Accessor.hbm.xml b/...g/sakaiproject/oauth/dao/Accessor.hbm.xml → ...g/sakaiproject/oauth/dao/Accessor.hbm.xml
diff --git a/...g/sakaiproject/oauth/dao/Consumer.hbm.xml → ...g/sakaiproject/oauth/dao/Consumer.hbm.xml b/...g/sakaiproject/oauth/dao/Consumer.hbm.xml → ...g/sakaiproject/oauth/dao/Consumer.hbm.xml
diff --git a/oauth/impl/dao-memory/pom.xml → oauth/dao-memory/pom.xml b/oauth/impl/dao-memory/pom.xml → oauth/dao-memory/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
         <version>1.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>oauth-dao-memory</artifactId>

diff --git a/...iproject/oauth/dao/MemoryAccessorDao.java → ...iproject/oauth/dao/MemoryAccessorDao.java b/...iproject/oauth/dao/MemoryAccessorDao.java → ...iproject/oauth/dao/MemoryAccessorDao.java
diff --git a/...iproject/oauth/dao/MemoryConsumerDao.java → ...iproject/oauth/dao/MemoryConsumerDao.java b/...iproject/oauth/dao/MemoryConsumerDao.java → ...iproject/oauth/dao/MemoryConsumerDao.java
diff --git a/oauth/impl/dao-server-config/pom.xml → oauth/dao-server-config/pom.xml b/oauth/impl/dao-server-config/pom.xml → oauth/dao-server-config/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.sakaiproject.oauth</groupId>
         <artifactId>oauth-base</artifactId>
         <version>1.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>oauth-dao-server-config</artifactId>

diff --git a/...ct/oauth/dao/ServerConfigConsumerDao.java → ...ct/oauth/dao/ServerConfigConsumerDao.java b/...ct/oauth/dao/ServerConfigConsumerDao.java → ...ct/oauth/dao/ServerConfigConsumerDao.java
diff --git a/oauth/pom.xml b/oauth/pom.xml
@@ -55,9 +55,9 @@
     <modules>
         <module>api</module>
         <module>impl</module>
-        <module>impl/dao-hbm</module>
-        <module>impl/dao-memory</module>
-        <module>impl/dao-server-config</module>
+        <module>dao-hbm</module>
+        <module>dao-memory</module>
+        <module>dao-server-config</module>
         <module>pack</module>
         <module>tool</module>
     </modules>