K1 Integration Commit. Integrated Kernel 1 into Core and replaces cor…

…e source tree with maven repo downloads git-svn-id: https://source.sakaiproject.org/svn/postem/trunk@49725 66ffb92e-73f9-0310-93c1-f5514f145a0a
jayrp11 · Jul 30, 2008 · 33708ec · 33708ec
1 parent 8c4dfac
commit 33708ec
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 54 deletions.
diff --git a/postem/components/pom.xml b/postem/components/pom.xml
@@ -25,10 +25,10 @@
       <artifactId>sakai-postem-impl</artifactId>
       <version>${sakai.version}</version>
       <exclusions>
-      	<exclusion>
-      		<groupId>org.sakaiproject</groupId>
-      		<artifactId>sakai-postem-hbm</artifactId>
-      	</exclusion>
+        <exclusion>
+          <groupId>org.sakaiproject</groupId>
+          <artifactId>sakai-postem-hbm</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

diff --git a/postem/pom.xml b/postem/pom.xml
@@ -11,14 +11,11 @@
   <groupId>org.sakaiproject</groupId>
   <artifactId>postem-base</artifactId>
   <packaging>pom</packaging>
-
   <scm>
     <connection>scm:svn:https://source.sakaiproject.org/svn/postem/trunk</connection>
     <developerConnection>scm:svn:https://source.sakaiproject.org/svn/postem/trunk</developerConnection>
     <url>https://source.sakaiproject.org/svn/postem/trunk</url>
   </scm>
-
-
   <modules>
     <module>components</module>
     <module>postem-api</module>

diff --git a/postem/postem-app/pom.xml b/postem/postem-app/pom.xml
@@ -18,45 +18,25 @@
   <packaging>war</packaging>
   <dependencies>
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-postem-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-site-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-tool-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-util-api</artifactId>
-      <version>${sakai.version}</version>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-kernel-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-entity-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
+      <groupId>org.sakaiproject.kernel.util</groupId>
       <artifactId>sakai-util</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-authz-api</artifactId>
-      <version>${sakai.version}</version>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-user-api</artifactId>
+      <artifactId>sakai-postem-api</artifactId>
       <version>${sakai.version}</version>
     </dependency>
+<!--org.sakaiprojectsakai-site-api${sakai.version}-->
+<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
+<!--org.sakaiprojectsakai-util-api${sakai.version}-->
+<!--org.sakaiprojectsakai-entity-api${sakai.version}-->
+<!--org.sakaiprojectsakai-util${sakai.version}-->
+<!--org.sakaiprojectsakai-authz-api${sakai.version}-->
+<!--org.sakaiprojectsakai-user-api${sakai.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -72,7 +52,6 @@
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>
     </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -83,15 +62,15 @@
       <artifactId>sakai-jsf-myfaces-tool</artifactId>
       <version>${sakai.version}</version>
       <exclusions>
-        <!-- since postem doesnt work with th latest myfaces we have to replace the library -->
-      	<exclusion>
-      		<groupId>org.apache.myfaces.core</groupId>
-      		<artifactId>myfaces-api</artifactId>
-      	</exclusion>
-      	<exclusion>
-      		<groupId>org.apache.myfaces.core</groupId>
-      		<artifactId>myfaces-impl</artifactId>
-      	</exclusion>
+<!-- since postem doesnt work with th latest myfaces we have to replace the library -->
+        <exclusion>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+        </exclusion>
       </exclusions>
       <type>pom</type>
     </dependency>
@@ -102,8 +81,6 @@
       <version>1.0.9</version>
       <scope>compile</scope>
     </dependency>
-
-
   </dependencies>
   <build>
     <resources>

diff --git a/postem/postem-hbm/pom.xml b/postem/postem-hbm/pom.xml
@@ -21,15 +21,15 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-postem-api</artifactId>
-      <version>${sakai.version}</version>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-kernel-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-user-api</artifactId>
+      <artifactId>sakai-postem-api</artifactId>
       <version>${sakai.version}</version>
     </dependency>
+<!--org.sakaiprojectsakai-user-api${sakai.version}-->
     <dependency>
       <groupId>commons-math</groupId>
       <artifactId>commons-math</artifactId>