[exo-jcr-commits] exo-jcr SVN: r4934 - in kernel/trunk: exo.kernel.component.common and 2 other directories.

Author: nfilotto Date: 2011-09-21 10:53:08 -0400 (Wed, 21 Sep 2011) New Revision: 4934 Modified: kernel/trunk/exo.kernel.component.common/pom.xml kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js kernel/trunk/pom.xml Log: EXOJCR-1546: Downgrade Quartz to prevent incompatibility issues with EAP Modified: kernel/trunk/exo.kernel.component.common/pom.xml =================================================================== --- kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-21 12:53:33 UTC (rev 4933) +++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-21 14:53:08 UTC (rev 4934) @@ -82,7 +82,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.quartz-scheduler</groupId> + <groupId>quartz</groupId> <artifactId>quartz</artifactId> </dependency> <dependency> Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java =================================================================== --- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2011-09-21 12:53:33 UTC (rev 4933) +++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2011-09-21 14:53:08 UTC (rev 4934) @@ -264,7 +264,8 @@ public boolean removeGlobalJobListener(String name) throws Exception { - return scheduler_.removeGlobalJobListener(name); + JobListener jlistener = getGlobalJobListener(name); + return scheduler_.removeGlobalJobListener(jlistener); } public void addJobListener(ComponentPlugin plugin) throws Exception @@ -323,7 +324,8 @@ public boolean removeGlobaTriggerListener(String name) throws Exception { - return scheduler_.removeGlobalTriggerListener(name); + TriggerListener tlistener = getGlobalTriggerListener(name); + return scheduler_.removeGlobalTriggerListener(tlistener); } public void addTriggerListener(ComponentPlugin plugin) throws Exception Modified: kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js =================================================================== --- kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-09-21 12:53:33 UTC (rev 4933) +++ kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-09-21 14:53:08 UTC (rev 4934) @@ -38,7 +38,7 @@ module.component.common = new Project("org.exoplatform.kernel", "exo.kernel.component.common", "jar", module.version). addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")). - addDependency(new Project("org.quartz-scheduler", "quartz", "jar", "1.8.4")). + addDependency(new Project("quartz", "quartz", "jar", "1.5.2")). addDependency(new Project("javax.activation", "activation", "jar", "1.1")). addDependency(new Project("javax.mail", "mail", "jar", "1.4.4")); Modified: kernel/trunk/pom.xml =================================================================== --- kernel/trunk/pom.xml 2011-09-21 12:53:33 UTC (rev 4933) +++ kernel/trunk/pom.xml 2011-09-21 14:53:08 UTC (rev 4934) @@ -158,9 +158,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.quartz-scheduler</groupId> + <groupId>quartz</groupId> <artifactId>quartz</artifactId> - <version>1.8.4</version> + <version>1.5.2</version> </dependency> <dependency> <groupId>javax.mail</groupId>