Sak-33633 sakai-common-api (sakaiproject#5031)

* SAK-33633 sakai-common-api <= edu-person-api (7) manager-api (2) type-api (5) * SAK-33633 rm type-api manager-api
bot2012 · Dec 5, 2017 · 2b30f54 · 2b30f54
1 parent 8c8881f
commit 2b30f54
Show file tree

Hide file tree

Showing 29 changed files with 14 additions and 169 deletions.
diff --git a/common/manager-api/pom.xml → common/common-api/pom.xml b/common/manager-api/pom.xml → common/common-api/pom.xml
@@ -7,9 +7,9 @@
     <version>13-SNAPSHOT</version><!-- ProjectVersion -->
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <name>Sakai Common Manager API</name>
+  <name>Sakai Common API</name>
   <groupId>org.sakaiproject.common</groupId>
-  <artifactId>sakai-common-manager-api</artifactId>
+  <artifactId>sakai-common-api</artifactId>
   <organization>
     <name>Sakai Project</name>
     <url>http://sakaiproject.org/</url>
@@ -19,7 +19,6 @@
   <properties>
     <deploy.target>shared</deploy.target>
   </properties>
-  <dependencies />
   <build>
     <resources />
 <!-- java source -->

diff --git a/...i/common/edu/person/BasePhotoService.java → ...i/common/edu/person/BasePhotoService.java b/...i/common/edu/person/BasePhotoService.java → ...i/common/edu/person/BasePhotoService.java
diff --git a/...ject/api/common/edu/person/EduPerson.java → ...ject/api/common/edu/person/EduPerson.java b/...ject/api/common/edu/person/EduPerson.java → ...ject/api/common/edu/person/EduPerson.java
diff --git a/.../api/common/edu/person/InetOrgPerson.java → .../api/common/edu/person/InetOrgPerson.java b/.../api/common/edu/person/InetOrgPerson.java → .../api/common/edu/person/InetOrgPerson.java
diff --git a/...mmon/edu/person/OrganizationalPerson.java → ...mmon/edu/person/OrganizationalPerson.java b/...mmon/edu/person/OrganizationalPerson.java → ...mmon/edu/person/OrganizationalPerson.java
diff --git a/...project/api/common/edu/person/Person.java → ...project/api/common/edu/person/Person.java b/...project/api/common/edu/person/Person.java → ...project/api/common/edu/person/Person.java
diff --git a/...t/api/common/edu/person/PhotoService.java → ...t/api/common/edu/person/PhotoService.java b/...t/api/common/edu/person/PhotoService.java → ...t/api/common/edu/person/PhotoService.java
diff --git a/...ct/api/common/edu/person/SakaiPerson.java → ...ct/api/common/edu/person/SakaiPerson.java b/...ct/api/common/edu/person/SakaiPerson.java → ...ct/api/common/edu/person/SakaiPerson.java
diff --git a/...common/edu/person/SakaiPersonManager.java → ...common/edu/person/SakaiPersonManager.java b/...common/edu/person/SakaiPersonManager.java → ...common/edu/person/SakaiPersonManager.java
diff --git a/...ct/api/common/manager/LifeCycleAware.java → ...ct/api/common/manager/LifeCycleAware.java b/...ct/api/common/manager/LifeCycleAware.java → ...ct/api/common/manager/LifeCycleAware.java
diff --git a/...oject/api/common/manager/Persistable.java → ...oject/api/common/manager/Persistable.java b/...oject/api/common/manager/Persistable.java → ...oject/api/common/manager/Persistable.java
diff --git a/...rg/sakaiproject/api/common/type/Type.java → ...rg/sakaiproject/api/common/type/Type.java b/...rg/sakaiproject/api/common/type/Type.java → ...rg/sakaiproject/api/common/type/Type.java
diff --git a/...iproject/api/common/type/TypeManager.java → ...iproject/api/common/type/TypeManager.java b/...iproject/api/common/type/TypeManager.java → ...iproject/api/common/type/TypeManager.java
diff --git a/...akaiproject/api/common/type/Typeable.java → ...akaiproject/api/common/type/Typeable.java b/...akaiproject/api/common/type/Typeable.java → ...akaiproject/api/common/type/Typeable.java
diff --git a/...common/type/UnsupportedTypeException.java → ...common/type/UnsupportedTypeException.java b/...common/type/UnsupportedTypeException.java → ...common/type/UnsupportedTypeException.java
diff --git a/...t/api/common/type/UuidTypeResolvable.java → ...t/api/common/type/UuidTypeResolvable.java b/...t/api/common/type/UuidTypeResolvable.java → ...t/api/common/type/UuidTypeResolvable.java
diff --git a/common/common-composite-component/pom.xml b/common/common-composite-component/pom.xml
@@ -47,17 +47,7 @@
 <!--  compile time dependencies -->
     <dependency>
       <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-edu-person-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-manager-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-type-api</artifactId>
-      <scope>provided</scope>
+      <artifactId>sakai-common-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>

diff --git a/common/edu-person-api/pom.xml b/common/edu-person-api/pom.xml
diff --git a/common/impl/pom.xml b/common/impl/pom.xml
@@ -31,15 +31,7 @@
 <!--  compile time dependencies -->
     <dependency>
       <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-edu-person-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-manager-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-type-api</artifactId>
+      <artifactId>sakai-common-api</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/common/pom.xml b/common/pom.xml
@@ -15,9 +15,7 @@
   <modules>
     <module>common-composite-component</module>
     <module>impl</module>
-    <module>edu-person-api</module>
-    <module>manager-api</module>
-    <module>type-api</module>
+    <module>common-api</module>
     <module>privacy-api</module>
     <module>privacy-comp-impl</module>
     <module>privacy-hbm</module>
@@ -45,19 +43,7 @@
       </dependency>
       <dependency>
         <groupId>org.sakaiproject.common</groupId>
-        <artifactId>sakai-common-manager-api</artifactId>
-        <version>${project.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.sakaiproject.common</groupId>
-        <artifactId>sakai-common-type-api</artifactId>
-        <version>${project.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.sakaiproject.common</groupId>
-        <artifactId>sakai-common-edu-person-api</artifactId>
+        <artifactId>sakai-common-api</artifactId>
         <version>${project.version}</version>
         <scope>provided</scope>
       </dependency>

diff --git a/common/type-api/pom.xml b/common/type-api/pom.xml
diff --git a/content-review/impl/compilatio/pom.xml b/content-review/impl/compilatio/pom.xml
@@ -42,11 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-manager-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-type-api</artifactId>
+			<artifactId>sakai-common-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.assignment</groupId>

diff --git a/content-review/impl/turnitin/pom.xml b/content-review/impl/turnitin/pom.xml
@@ -42,15 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-edu-person-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-manager-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-type-api</artifactId>
+			<artifactId>sakai-common-api</artifactId>
 		</dependency>
 		<dependency>
 		  <groupId>org.azeckoski</groupId>

diff --git a/content-review/impl/urkund/pom.xml b/content-review/impl/urkund/pom.xml
@@ -37,15 +37,7 @@
 		<!-- Sakai Person -->
 		<dependency>
 			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-edu-person-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-manager-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-type-api</artifactId>
+			<artifactId>sakai-common-api</artifactId>
 		</dependency>
 
 		<!-- Various Sakai dependencies -->

diff --git a/master/pom.xml b/master/pom.xml
@@ -1329,19 +1329,7 @@
       </dependency>
       <dependency>
         <groupId>org.sakaiproject.common</groupId>
-        <artifactId>sakai-common-edu-person-api</artifactId>
-        <version>${sakai.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.sakaiproject.common</groupId>
-        <artifactId>sakai-common-manager-api</artifactId>
-        <version>${sakai.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.sakaiproject.common</groupId>
-        <artifactId>sakai-common-type-api</artifactId>
+        <artifactId>sakai-common-api</artifactId>
         <version>${sakai.version}</version>
         <scope>provided</scope>
       </dependency>

diff --git a/msgcntr/messageforums-component-impl/pom.xml b/msgcntr/messageforums-component-impl/pom.xml
@@ -73,11 +73,7 @@
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-type-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject.common</groupId>
-      <artifactId>sakai-common-manager-api</artifactId>
+      <artifactId>sakai-common-api</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

diff --git a/profile2/api/pom.xml b/profile2/api/pom.xml
@@ -29,7 +29,7 @@
    		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-edu-person-api</artifactId>
+			<artifactId>sakai-common-api</artifactId>
 			<scope>provided</scope>
     	</dependency>
 	    <dependency>

diff --git a/profile2/impl/pom.xml b/profile2/impl/pom.xml
@@ -73,19 +73,9 @@
   		</dependency>
     	<dependency>
 			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-edu-person-api</artifactId>
+			<artifactId>sakai-common-api</artifactId>
 			<scope>provided</scope>
     	</dependency>
-    	<dependency>
-      		<groupId>org.sakaiproject.common</groupId>
-      		<artifactId>sakai-common-manager-api</artifactId>
-      		<scope>provided</scope>
-    	</dependency>
-	    <dependency>
-	      	<groupId>org.sakaiproject.common</groupId>
-	      	<artifactId>sakai-common-type-api</artifactId>
-	      	<scope>provided</scope>
-	    </dependency>
 	    <dependency>
       		<groupId>org.sakaiproject.entitybroker</groupId>
       		<artifactId>entitybroker-api</artifactId>

diff --git a/profile2/tool/pom.xml b/profile2/tool/pom.xml
@@ -64,13 +64,8 @@
     	</dependency>
     	<dependency>
 			<groupId>org.sakaiproject.common</groupId>
-			<artifactId>sakai-common-edu-person-api</artifactId>
+			<artifactId>sakai-common-api</artifactId>
 			<scope>provided</scope>
-    	</dependency>
-    	<dependency>
-      		<groupId>org.sakaiproject.common</groupId>
-      		<artifactId>sakai-common-manager-api</artifactId>
-      		<scope>provided</scope>
     	</dependency>
 	    <dependency>
       		<groupId>org.sakaiproject.entitybroker</groupId>