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/jobscheduler/trunk@49712 66ffb92e-73f9-0310-93c1-f5514f145a0a
whwheel · Jul 30, 2008 · b7e2cba · b7e2cba
1 parent 37d8302
commit b7e2cba
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 56 deletions.
diff --git a/jobscheduler/pom.xml b/jobscheduler/pom.xml
@@ -11,15 +11,11 @@
   <groupId>org.sakaiproject</groupId>
   <artifactId>jobscheduler-base</artifactId>
   <packaging>pom</packaging>
-
-
   <scm>
     <connection>scm:svn:https://source.sakaiproject.org/svn/jobscheduler/trunk</connection>
     <developerConnection>scm:svn:https://source.sakaiproject.org/svn/jobscheduler/trunk</developerConnection>
     <url>https://source.sakaiproject.org/svn/jobscheduler/trunk</url>
   </scm>
-
-
   <modules>
     <module>scheduler-api</module>
     <module>scheduler-component</module>

diff --git a/jobscheduler/scheduler-api/pom.xml b/jobscheduler/scheduler-api/pom.xml
@@ -20,16 +20,16 @@
     <deploy.target>shared</deploy.target>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-kernel-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>quartz</groupId>
       <artifactId>quartz</artifactId>
       <version>1.5.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-util-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
+<!--org.sakaiprojectsakai-util-api${sakai.version}-->
   </dependencies>
   <build>
     <resources/>

diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml
@@ -20,6 +20,14 @@
     <deploy.target>shared</deploy.target>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-kernel-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-component-manager</artifactId>
+    </dependency>
     <dependency>
       <groupId>quartz</groupId>
       <artifactId>quartz</artifactId>
@@ -31,26 +39,10 @@
       <artifactId>sakai-scheduler-api</artifactId>
       <version>${sakai.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-component-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-db-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-component</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-util-api</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
+<!--org.sakaiprojectsakai-component-api${sakai.version}-->
+<!--org.sakaiprojectsakai-db-api${sakai.version}-->
+<!--org.sakaiprojectsakai-component${sakai.version}-->
+<!--org.sakaiprojectsakai-util-api${sakai.version}-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>

diff --git a/jobscheduler/scheduler-tool/pom.xml b/jobscheduler/scheduler-tool/pom.xml
@@ -17,6 +17,18 @@
   <inceptionYear>2003</inceptionYear>
   <packaging>war</packaging>
   <dependencies>
+    <dependency>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-kernel-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.sakaiproject.kernel</groupId>
+      <artifactId>sakai-component-manager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.sakaiproject.kernel.util</groupId>
+      <artifactId>sakai-util</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-scheduler-api</artifactId>
@@ -37,20 +49,14 @@
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
     </dependency>
+<!--org.sakaiprojectsakai-component${sakai.version}-->
+<!-- updated so that the jstl library is packed into the tool for now -->
     <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-component</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
-
-   <!-- updated so that the jstl library is packed into the tool for now -->
-    <dependency>
-       <groupId>javax.servlet</groupId>
-       <artifactId>jstl</artifactId>
-       <version>1.1.2</version>
-       <scope>compile</scope>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.1.2</version>
+      <scope>compile</scope>
     </dependency>
-
     <dependency>
       <groupId>jsf</groupId>
       <artifactId>jsf-impl</artifactId>
@@ -81,27 +87,15 @@
       <artifactId>sakai-jsf-app</artifactId>
       <version>${sakai.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.sakaiproject</groupId>
-      <artifactId>sakai-util</artifactId>
-      <version>${sakai.version}</version>
-    </dependency>
+<!--org.sakaiprojectsakai-util${sakai.version}-->
     <dependency>
       <groupId>org.sakaiproject</groupId>
       <artifactId>sakai-depend-jsf-widgets-sun</artifactId>
       <version>${sakai.version}</version>
       <type>pom</type>
     </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>
-    </dependency>
+<!--org.sakaiprojectsakai-tool-api${sakai.version}-->
+<!--org.sakaiprojectsakai-util-api${sakai.version}-->
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>