From 16e2ffb035a4c41576acc74efb37610c7aec1887 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 16 Apr 2011 16:37:11 +0000 Subject: [PATCH] Move NameVersion Mode DAO interfaces NEW - bug 17: Generalize agent management and registration beyond JMS https://bugzilla.argeo.org/show_bug.cgi?id=17 git-svn-id: https://svn.argeo.org/slc/trunk@4441 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/log4j.properties | 14 +- .../build/VersionedResourceDistribution.java | 2 +- .../build/ModularDistributionDescriptor.java | 2 +- .../web/mvc/controllers/ServerController.java | 4 +- .../AbstractAvailableModules.java | 2 +- .../provisioning/AvailableModulesHtml.java | 2 +- .../AvailableModulesOsgiBoot.java | 2 +- .../provisioning/AvailableModulesPlain.java | 2 +- .../ListModularDistributions.java | 4 +- .../ModularDistributionInterceptor.java | 2 +- .../slc/{build => }/BasicNameVersion.java | 3 +- .../argeo/slc/{build => }/NameVersion.java | 4 +- .../argeo/slc/build/ModularDistribution.java | 2 + .../argeo/slc/dao/SlcAgentDescriptorDao.java | 35 +++ .../org/argeo/slc/dao/SlcExecutionDao.java | 43 ++++ .../java/org/argeo/slc/dao/TestResultDao.java | 45 ++++ .../argeo/slc/dao/TestRunDescriptorDao.java | 27 +++ .../slc/dao/process/SlcExecutionDao.java | 7 +- .../dao/runtime/SlcAgentDescriptorDao.java | 4 + .../org/argeo/slc/dao/test/TestResultDao.java | 4 +- .../slc/dao/test/TestRunDescriptorDao.java | 2 + .../org/argeo/slc/deploy/DynamicRuntime.java | 2 +- .../java/org/argeo/slc/deploy/Module.java | 2 +- .../argeo/slc/deploy/ModuleDescriptor.java | 2 +- .../org/argeo/slc/deploy/ModulesManager.java | 2 +- .../org/argeo/slc/process/RealizedFlow.java | 4 +- .../argeo/slc/process/SlcExecutionStep.java | 4 + .../slc/castor/{build.xml => common.xml} | 2 +- .../resources/org/argeo/slc/castor/msg.xml | 27 +-- .../resources/org/argeo/slc/castor/spring.xml | 52 ++--- .../main/java/org/argeo/slc/jcr/SlcNames.java | 10 + .../main/java/org/argeo/slc/jcr/SlcTypes.java | 4 + .../java/org/argeo/slc/osgi/OsgiBundle.java | 4 +- .../slc/osgi/OsgiExecutionModulesManager.java | 208 +++++------------- .../java/org/argeo/slc/osgi/OsgiRuntime.java | 2 +- .../AbstractOsgiModularDistribution.java | 4 +- .../osgi/build/BundleModularDistribution.java | 4 +- .../build/OsgiRuntimeModularDistribution.java | 2 +- 38 files changed, 299 insertions(+), 248 deletions(-) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{build => }/BasicNameVersion.java (98%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{build => }/NameVersion.java (93%) create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcAgentDescriptorDao.java create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcExecutionDao.java create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestResultDao.java create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestRunDescriptorDao.java rename runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/{build.xml => common.xml} (93%) create mode 100644 runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java diff --git a/demo/log4j.properties b/demo/log4j.properties index 478afe9fc..d56398aad 100644 --- a/demo/log4j.properties +++ b/demo/log4j.properties @@ -1,4 +1,5 @@ -log4j.rootLogger=WARN, console +#log4j.rootLogger=WARN, console +log4j.rootLogger=WARN, development ## Levels log4j.logger.org.argeo=DEBUG @@ -44,8 +45,13 @@ log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR ## Appenders # console is set to be a ConsoleAppender. -log4j.appender.console=org.apache.log4j.ConsoleAppender -# console uses PatternLayout. +# default appender +log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n +log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n + +# development appender (slow!) +log4j.appender.development=org.apache.log4j.ConsoleAppender +log4j.appender.development.layout=org.apache.log4j.PatternLayout +log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss} [%16.16t] %5p %m (%F:%L) %c%n diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/VersionedResourceDistribution.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/VersionedResourceDistribution.java index 2cf454f6b..4f64335fc 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/VersionedResourceDistribution.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/VersionedResourceDistribution.java @@ -16,7 +16,7 @@ package org.argeo.slc.core.build; -import org.argeo.slc.build.NameVersion; +import org.argeo.slc.NameVersion; import org.springframework.core.io.Resource; /** diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/build/ModularDistributionDescriptor.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/build/ModularDistributionDescriptor.java index 6244fa714..8e8510ce5 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/build/ModularDistributionDescriptor.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/build/ModularDistributionDescriptor.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.argeo.slc.build.BasicNameVersion; +import org.argeo.slc.BasicNameVersion; public class ModularDistributionDescriptor extends BasicNameVersion implements Serializable { diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/ServerController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/ServerController.java index daaa4e479..7e6b6c7d4 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/ServerController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/ServerController.java @@ -24,8 +24,8 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; -import org.argeo.slc.build.BasicNameVersion; -import org.argeo.slc.build.NameVersion; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.core.build.ResourceDistribution; import org.argeo.slc.deploy.DynamicRuntime; import org.argeo.slc.deploy.Module; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java index a99b3d7ff..f98399cd5 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AbstractAvailableModules.java @@ -23,8 +23,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.build.NameVersion; import org.springframework.web.HttpRequestHandler; /** List of modules for a distribution. */ diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java index bbee89d33..4b58d3876 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesHtml.java @@ -19,9 +19,9 @@ package org.argeo.slc.web.mvc.provisioning; import java.io.IOException; import java.io.Writer; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.core.build.ResourceDistribution; /** List of modules for a distribution. */ diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesOsgiBoot.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesOsgiBoot.java index 4e57ed7c4..2a6ee3120 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesOsgiBoot.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesOsgiBoot.java @@ -19,8 +19,8 @@ package org.argeo.slc.web.mvc.provisioning; import java.io.IOException; import java.io.Writer; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.build.NameVersion; /** List of modules for a distribution. */ public class AvailableModulesOsgiBoot extends AbstractAvailableModules { diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesPlain.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesPlain.java index a0cfbe8b3..3fdf58de8 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesPlain.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/AvailableModulesPlain.java @@ -19,8 +19,8 @@ package org.argeo.slc.web.mvc.provisioning; import java.io.IOException; import java.io.Writer; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.build.NameVersion; /** List of modules for a distribution. */ public class AvailableModulesPlain extends AbstractAvailableModules { diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ListModularDistributions.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ListModularDistributions.java index 027f24f17..dbf31f7ee 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ListModularDistributions.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ListModularDistributions.java @@ -26,10 +26,10 @@ import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.slc.build.BasicNameVersion; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.BuildConstants; import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.msg.ObjectList; import org.argeo.slc.msg.build.ModularDistributionDescriptor; import org.argeo.slc.web.mvc.AbstractServiceController; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java index 918fb3cd5..dea5cabf5 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java @@ -25,8 +25,8 @@ import java.util.TreeMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.slc.BasicNameVersion; import org.argeo.slc.SlcException; -import org.argeo.slc.build.BasicNameVersion; import org.argeo.slc.build.BuildConstants; import org.argeo.slc.build.ModularDistribution; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/BasicNameVersion.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java similarity index 98% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/BasicNameVersion.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java index c01c5da5e..9cefc9405 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/BasicNameVersion.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/BasicNameVersion.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.argeo.slc.build; +package org.argeo.slc; import java.io.Serializable; + public class BasicNameVersion implements NameVersion, Comparable, Serializable { private static final long serialVersionUID = -5127304279136195127L; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/NameVersion.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/NameVersion.java similarity index 93% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/NameVersion.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/NameVersion.java index 0be583be4..161183a4d 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/NameVersion.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/NameVersion.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.build; +package org.argeo.slc; /** * Abstraction of a name / version pair, typically used as coordinates for a @@ -24,6 +24,6 @@ public interface NameVersion { /** The name of the component. */ public String getName(); - /** The version of teh component. */ + /** The version of the component. */ public String getVersion(); } diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/ModularDistribution.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/ModularDistribution.java index aec0c4e13..448f87a82 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/ModularDistribution.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/ModularDistribution.java @@ -18,6 +18,8 @@ package org.argeo.slc.build; import java.util.Set; +import org.argeo.slc.NameVersion; + public interface ModularDistribution extends Distribution, NameVersion { public Distribution getModuleDistribution(String moduleName, String moduleVersion); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcAgentDescriptorDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcAgentDescriptorDao.java new file mode 100644 index 000000000..0cad857bb --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcAgentDescriptorDao.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.argeo.slc.dao; + +import java.util.List; + +import org.argeo.slc.runtime.SlcAgentDescriptor; + +@SuppressWarnings("deprecation") +public interface SlcAgentDescriptorDao extends + org.argeo.slc.dao.runtime.SlcAgentDescriptorDao { + public void create(SlcAgentDescriptor slcAgentDescriptor); + + public void delete(SlcAgentDescriptor slcAgentDescriptor); + + public void delete(String agentId); + + public List listSlcAgentDescriptors(); + + public SlcAgentDescriptor getAgentDescriptor(String agentId); +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcExecutionDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcExecutionDao.java new file mode 100644 index 000000000..59672eeef --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/SlcExecutionDao.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.argeo.slc.dao; + +import java.util.List; + +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; + +@SuppressWarnings("deprecation") +public interface SlcExecutionDao extends + org.argeo.slc.dao.process.SlcExecutionDao { + public void create(SlcExecution slcExecution); + + public void update(SlcExecution slcExecution); + + public SlcExecution getSlcExecution(String uuid); + + public List listSlcExecutions(); + + public void addSteps(String slcExecutionId, + List additionalSteps); + + public List tailSteps(final String slcExecutionId, + final Integer nbrOfSteps); + + public List tailSteps(final String slcExecutionId, + final String slcExecutionStepId); +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestResultDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestResultDao.java new file mode 100644 index 000000000..dc30b0547 --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestResultDao.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.argeo.slc.dao; + +import java.util.Date; +import java.util.List; + +import org.argeo.slc.test.TestResult; + +/** + * The dao for TestResult. + * + * @see TestResult + */ +@SuppressWarnings("deprecation") +public interface TestResultDao extends + org.argeo.slc.dao.test.TestResultDao { + /** Gets a test result based on its id. */ + public T getTestResult(String uuid); + + /** Persists a new test result. */ + public void create(TestResult testResult); + + /** Updates an already persisted test result. */ + public void update(TestResult testResult); + + /** Lists all test results. */ + public List listTestResults(); + + public void close(String id, Date closeDate); +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestRunDescriptorDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestRunDescriptorDao.java new file mode 100644 index 000000000..003302420 --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/TestRunDescriptorDao.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.argeo.slc.dao; + +import org.argeo.slc.test.TestRunDescriptor; + +@SuppressWarnings("deprecation") +public interface TestRunDescriptorDao extends + org.argeo.slc.dao.test.TestRunDescriptorDao { + public TestRunDescriptor getTestRunDescriptor(String id); + + public void saveOrUpdate(TestRunDescriptor testRunDescriptor); +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java index ea33db7ae..7cea2595a 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java @@ -21,14 +21,15 @@ import java.util.List; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionStep; +/** + * @deprecated will be removed in SLC 2.x, use + * {@link org.argeo.slc.dao.SlcExecutionDao} + */ public interface SlcExecutionDao { public void create(SlcExecution slcExecution); public void update(SlcExecution slcExecution); - @Deprecated - public void merge(SlcExecution slcExecution); - public SlcExecution getSlcExecution(String uuid); public List listSlcExecutions(); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/runtime/SlcAgentDescriptorDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/runtime/SlcAgentDescriptorDao.java index 044517c4e..4a6cd99b7 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/runtime/SlcAgentDescriptorDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/runtime/SlcAgentDescriptorDao.java @@ -20,6 +20,10 @@ import java.util.List; import org.argeo.slc.runtime.SlcAgentDescriptor; +/** + * @deprecated will be removed in SLC 2.0, use + * {@link org.argeo.slc.dao.SlcAgentDescriptorDao} instead. + */ public interface SlcAgentDescriptorDao { public void create(SlcAgentDescriptor slcAgentDescriptor); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java index 3d98e3f8b..ebdb84937 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java @@ -22,7 +22,9 @@ import java.util.List; import org.argeo.slc.test.TestResult; /** - * The dao for TestResult. + * @deprecated will be removed in SLC 2.0, use + * {@link org.argeo.slc.dao.TestResultDao} instead. The dao for + * TestResult. * * @see TestResult */ diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java index d7c37da84..f0760272b 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java @@ -16,8 +16,10 @@ package org.argeo.slc.dao.test; +import org.argeo.slc.dao.TestResultDao; import org.argeo.slc.test.TestRunDescriptor; +/** @deprecated will be removed in SLC 2.0, use {@link TestResultDao} instead. */ public interface TestRunDescriptorDao { public TestRunDescriptor getTestRunDescriptor(String id); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DynamicRuntime.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DynamicRuntime.java index 063af590d..3a74ffebc 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DynamicRuntime.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DynamicRuntime.java @@ -16,8 +16,8 @@ package org.argeo.slc.deploy; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.NameVersion; public interface DynamicRuntime extends ModularDeployedSystem { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Module.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Module.java index 41932160d..4b1d3b125 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Module.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Module.java @@ -16,7 +16,7 @@ package org.argeo.slc.deploy; -import org.argeo.slc.build.NameVersion; +import org.argeo.slc.NameVersion; public interface Module extends DeployedSystem, NameVersion { } diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModuleDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModuleDescriptor.java index 9cfe1f997..84608a15c 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModuleDescriptor.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModuleDescriptor.java @@ -16,7 +16,7 @@ package org.argeo.slc.deploy; -import org.argeo.slc.build.BasicNameVersion; +import org.argeo.slc.BasicNameVersion; public class ModuleDescriptor extends BasicNameVersion { private static final long serialVersionUID = 3703329250058821882L; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModulesManager.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModulesManager.java index fa9ab4173..0910c1734 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModulesManager.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/ModulesManager.java @@ -18,7 +18,7 @@ package org.argeo.slc.deploy; import java.util.List; -import org.argeo.slc.build.NameVersion; +import org.argeo.slc.NameVersion; /** Provides access to modules */ public interface ModulesManager { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java index 2869684f8..e5fdd95cd 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java @@ -18,8 +18,8 @@ package org.argeo.slc.process; import java.io.Serializable; -import org.argeo.slc.build.BasicNameVersion; -import org.argeo.slc.build.NameVersion; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionSpec; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java index ed52f64ee..58f9d01a0 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java @@ -23,6 +23,10 @@ import java.util.List; import java.util.StringTokenizer; import java.util.UUID; +/** + * An atomic step to be notified in during an {@link SlcExecution}. Can be a log + * or the start/end of a phase, etc. + */ public class SlcExecutionStep implements Serializable { private static final long serialVersionUID = -7308643628104726471L; diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/build.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml similarity index 93% rename from runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/build.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml index 13c4894c4..725c3121f 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/build.xml +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml @@ -21,7 +21,7 @@ Build objects XML mapping - + diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml index 8047f30b2..4cb74398a 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml @@ -1,21 +1,12 @@ - + @@ -49,7 +40,7 @@ + extends="org.argeo.slc.BasicNameVersion"> diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml index bba3b4813..9f2b14611 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml @@ -1,16 +1,12 @@ - + - - classpath:org/argeo/slc/castor/msg.xml - - - classpath:org/argeo/slc/castor/process.xml - - - classpath:org/argeo/slc/castor/runtime.xml - - - classpath:org/argeo/slc/castor/structure.xml - - - classpath:org/argeo/slc/castor/test.xml - - - classpath:org/argeo/slc/castor/execution.xml - - - classpath:org/argeo/slc/castor/attachment.xml - - - classpath:org/argeo/slc/castor/build.xml - + classpath:org/argeo/slc/castor/common.xml + classpath:org/argeo/slc/castor/msg.xml + classpath:org/argeo/slc/castor/process.xml + classpath:org/argeo/slc/castor/runtime.xml + classpath:org/argeo/slc/castor/structure.xml + classpath:org/argeo/slc/castor/test.xml + classpath:org/argeo/slc/castor/execution.xml + classpath:org/argeo/slc/castor/attachment.xml diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java new file mode 100644 index 000000000..55387b27d --- /dev/null +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java @@ -0,0 +1,10 @@ +package org.argeo.slc.jcr; + +/** JCR names used by SLC */ +public interface SlcNames { + + public final static String SLC_NAME = "slc:name"; + public final static String SLC_VERSION = "slc:version"; + public final static String SLC_FLOWS = "slc:flows"; + +} diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java index 81517c58f..6f8202052 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java @@ -1,6 +1,10 @@ package org.argeo.slc.jcr; +/** JCR node types used by SLC */ public interface SlcTypes { public final static String SLC_AGENT = "slc:agent"; + public final static String SLC_MODULE = "slc:module"; + public final static String SLC_EXECUTION_FLOW = "slc:executionFlow"; + } diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java index ede0986a2..0be7d02e9 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java @@ -16,9 +16,9 @@ package org.argeo.slc.osgi; -import org.argeo.slc.build.BasicNameVersion; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.core.build.ResourceDistribution; import org.argeo.slc.deploy.DeploymentData; import org.argeo.slc.deploy.Module; diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java index 3c006d2ed..fe311c8dd 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java @@ -26,9 +26,9 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; -import org.argeo.slc.build.BasicNameVersion; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.core.execution.AbstractExecutionModulesManager; import org.argeo.slc.core.execution.DefaultExecutionFlowDescriptorConverter; import org.argeo.slc.deploy.ModuleDescriptor; @@ -41,116 +41,61 @@ import org.argeo.slc.execution.ExecutionModulesListener; import org.argeo.slc.process.RealizedFlow; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; -import org.osgi.util.tracker.ServiceTracker; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; import org.springframework.osgi.service.importer.OsgiServiceLifecycleListener; public class OsgiExecutionModulesManager extends - AbstractExecutionModulesManager implements InitializingBean, - DisposableBean, OsgiServiceLifecycleListener { - -// static { -// // Force usage of vanilla Xalan when in OSGi -// // We would like to do it in a cleaner way -// // but the integration of Xalan and Xerces in the JRE -// // makes it very difficult -// // Suggestions welcome! -// Properties systemProperties = System.getProperties(); -// // if (!systemProperties -// // .containsKey("javax.xml.parsers.DocumentBuilderFactory")) -// // System.setProperty("javax.xml.parsers.DocumentBuilderFactory", -// // "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"); -// // if -// // (!systemProperties.containsKey("javax.xml.parsers.SAXParserFactory")) -// // System.setProperty("javax.xml.parsers.SAXParserFactory", -// // "org.apache.xerces.jaxp.SAXParserFactoryImpl"); -// if (!systemProperties -// .containsKey("javax.xml.transform.TransformerFactory")) -// System.setProperty("javax.xml.transform.TransformerFactory", -// "org.apache.xalan.processor.TransformerFactoryImpl"); -// } - -// private final static String PROPERTY_CACHE_SERVICES = "slc.osgi.execution.cacheServices"; + AbstractExecutionModulesManager implements OsgiServiceLifecycleListener { private final static Log log = LogFactory .getLog(OsgiExecutionModulesManager.class); private BundlesManager bundlesManager; - private ServiceTracker executionContextsTracker; private Map executionContexts = new HashMap(); private Map executionFlowDescriptorConverters = new HashMap(); private Map> executionFlows = new HashMap>(); private ExecutionFlowDescriptorConverter defaultDescriptorConverter = new DefaultExecutionFlowDescriptorConverter(); -// private Boolean useCachedServices = Boolean.parseBoolean(System -// .getProperty(PROPERTY_CACHE_SERVICES, "true")); - public synchronized ExecutionModuleDescriptor getExecutionModuleDescriptor( String moduleName, String version) { ExecutionModuleDescriptor md = new ExecutionModuleDescriptor(); -// if (useCachedServices) { - OsgiBundle osgiBundle = null; - BasicNameVersion nameVersion = new BasicNameVersion(moduleName, - version); - bundles: for (Iterator iterator = executionContexts - .keySet().iterator(); iterator.hasNext();) { - OsgiBundle ob = iterator.next(); - if (ob.equals(nameVersion)) { - osgiBundle = ob; - break bundles; - } + OsgiBundle osgiBundle = null; + BasicNameVersion nameVersion = new BasicNameVersion(moduleName, version); + bundles: for (Iterator iterator = executionContexts + .keySet().iterator(); iterator.hasNext();) { + OsgiBundle ob = iterator.next(); + if (ob.equals(nameVersion)) { + osgiBundle = ob; + break bundles; } - if (osgiBundle == null) - throw new SlcException("No execution module registered for " - + nameVersion); - md.setName(osgiBundle.getName()); - md.setVersion(osgiBundle.getVersion()); - md.setLabel(osgiBundle.getLabel()); - md.setDescription(osgiBundle.getDescription()); -// } else { -// md.setName(moduleName); -// md.setVersion(version); -// setMetadataFromBundle(md, null); -// } + } + if (osgiBundle == null) + throw new SlcException("No execution module registered for " + + nameVersion); + md.setName(osgiBundle.getName()); + md.setVersion(osgiBundle.getVersion()); + md.setLabel(osgiBundle.getLabel()); + md.setDescription(osgiBundle.getDescription()); + ExecutionFlowDescriptorConverter executionFlowDescriptorConverter = getExecutionFlowDescriptorConverter( moduleName, version); if (executionFlowDescriptorConverter == null) throw new SlcException("No flow converter found."); - executionFlowDescriptorConverter.addFlowsToDescriptor(md, listFlows( - moduleName, version)); + executionFlowDescriptorConverter.addFlowsToDescriptor(md, + listFlows(moduleName, version)); return md; } public synchronized List listExecutionModules() { List descriptors = new ArrayList(); -// if (useCachedServices) { - for (Iterator iterator = executionContexts.keySet() - .iterator(); iterator.hasNext();) { - OsgiBundle osgiBundle = iterator.next(); - ExecutionModuleDescriptor md = new ExecutionModuleDescriptor(); - setMetadataFromBundle(md, bundlesManager - .findRelatedBundle(osgiBundle)); - descriptors.add(md); - } -// } else { -// ServiceReference[] arr = executionContextsTracker -// .getServiceReferences(); -// if (arr == null) { -// log.error("Tracker returned null."); -// return descriptors; -// } -// -// List srs = Arrays.asList(arr); -// // ServiceReference[] srs = -// // executionContexts.getServiceReferences(); -// for (ServiceReference sr : srs) { -// ExecutionModuleDescriptor md = new ExecutionModuleDescriptor(); -// setMetadataFromBundle(md, sr.getBundle()); -// descriptors.add(md); -// } -// } + for (Iterator iterator = executionContexts.keySet() + .iterator(); iterator.hasNext();) { + OsgiBundle osgiBundle = iterator.next(); + ExecutionModuleDescriptor md = new ExecutionModuleDescriptor(); + setMetadataFromBundle(md, + bundlesManager.findRelatedBundle(osgiBundle)); + descriptors.add(md); + } return descriptors; } @@ -158,37 +103,12 @@ public class OsgiExecutionModulesManager extends String moduleName, String moduleVersion) { Map flows = new HashMap(); -// if (useCachedServices) { - OsgiBundle key = new OsgiBundle( - moduleName, moduleVersion); - if(!executionFlows.containsKey(key)) - return flows; - Set flowsT = executionFlows.get(key); - for (ExecutionFlow flow : flowsT) - flows.put(flow.getName(), flow); -// } else { -// -// // TODO: use service trackers? -// // String filter = OsgiFilterUtils.unifyFilter(ExecutionFlow.class, -// // null); -// -// String filter = "(Bundle-SymbolicName=" + moduleName + ")"; -// ServiceReference[] sfs; -// try { -// sfs = bundlesManager.getBundleContext().getServiceReferences( -// ExecutionFlow.class.getName(), filter); -// } catch (InvalidSyntaxException e) { -// throw new SlcException( -// "Cannot retrieve service reference for flow " + filter, -// e); -// } -// -// for (ServiceReference sf : sfs) { -// ExecutionFlow flow = (ExecutionFlow) bundlesManager -// .getBundleContext().getService(sf); -// flows.put(flow.getName(), flow); -// } -// } + OsgiBundle key = new OsgiBundle(moduleName, moduleVersion); + if (!executionFlows.containsKey(key)) + return flows; + Set flowsT = executionFlows.get(key); + for (ExecutionFlow flow : flowsT) + flows.put(flow.getName(), flow); return flows; } @@ -221,17 +141,6 @@ public class OsgiExecutionModulesManager extends this.bundlesManager = bundlesManager; } - public void afterPropertiesSet() throws Exception { -// if (!useCachedServices) -// executionContextsTracker = bundlesManager -// .newTracker(ExecutionContext.class); - } - - public void destroy() throws Exception { - if (executionContextsTracker != null) - executionContextsTracker.close(); - } - /** * Builds a minimal realized flow, based on the provided information * (typically from the command line). @@ -268,8 +177,7 @@ public class OsgiExecutionModulesManager extends launch.setFlowDescriptor(descriptor); return launch; } else { - log - .warn("Could not find any execution module matching these requirements."); + log.warn("Could not find any execution module matching these requirements."); return null; } } @@ -281,21 +189,11 @@ public class OsgiExecutionModulesManager extends protected synchronized ExecutionFlowDescriptorConverter getExecutionFlowDescriptorConverter( String moduleName, String moduleVersion) { -// if (useCachedServices) { - OsgiBundle osgiBundle = new OsgiBundle(moduleName, moduleVersion); - if (executionFlowDescriptorConverters.containsKey(osgiBundle)) - return executionFlowDescriptorConverters.get(osgiBundle); - else - return defaultDescriptorConverter; -// } else { -// // Check whether a descriptor converter is published by this module -// ExecutionFlowDescriptorConverter descriptorConverter = findExecutionFlowDescriptorConverter( -// moduleName, moduleVersion); -// if (descriptorConverter == null) -// return defaultDescriptorConverter; -// else -// return descriptorConverter; -// } + OsgiBundle osgiBundle = new OsgiBundle(moduleName, moduleVersion); + if (executionFlowDescriptorConverters.containsKey(osgiBundle)) + return executionFlowDescriptorConverters.get(osgiBundle); + else + return defaultDescriptorConverter; } public ModuleDescriptor getModuleDescriptor(String moduleName, @@ -349,7 +247,7 @@ public class OsgiExecutionModulesManager extends return obj.toString(); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes", "unchecked" }) public synchronized void bind(Object service, Map properties) throws Exception { if (service instanceof ExecutionContext) { @@ -374,9 +272,7 @@ public class OsgiExecutionModulesManager extends } executionFlows.get(osgiBundle).add(executionFlow); if (log.isTraceEnabled()) - log - .debug("Registered " + executionFlow + " from " - + osgiBundle); + log.debug("Registered " + executionFlow + " from " + osgiBundle); for (ExecutionModulesListener listener : getExecutionModulesListeners()) listener.executionFlowAdded(osgiBundle, executionFlow); @@ -386,15 +282,14 @@ public class OsgiExecutionModulesManager extends executionFlowDescriptorConverters.put(osgiBundle, executionFlowDescriptorConverter); if (log.isTraceEnabled()) - log - .debug("Registered execution flow descriptor converter from " - + osgiBundle); + log.debug("Registered execution flow descriptor converter from " + + osgiBundle); } else { // ignore } } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public synchronized void unbind(Object service, Map properties) throws Exception { if (service instanceof ExecutionContext) { @@ -431,16 +326,15 @@ public class OsgiExecutionModulesManager extends if (executionFlowDescriptorConverters.containsKey(osgiBundle)) { executionFlowDescriptorConverters.remove(osgiBundle); if (log.isTraceEnabled()) - log - .debug("Removed execution flow descriptor converter from " - + osgiBundle); + log.debug("Removed execution flow descriptor converter from " + + osgiBundle); } } else { // ignore } } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private OsgiBundle asOsgiBundle(Map properties) { String bundleSymbolicName = checkAndGet(Constants.BUNDLE_SYMBOLICNAME, properties); @@ -448,7 +342,7 @@ public class OsgiExecutionModulesManager extends return new OsgiBundle(bundleSymbolicName, bundleVersion); } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private String checkAndGet(Object key, Map properties) { if (!properties.containsKey(key) || properties.get(key) == null) throw new SlcException(key + " not set in " + properties); diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java index cacdf7aa9..5fe9bd99c 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; +import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.StreamReadable; import org.argeo.slc.UnsupportedException; import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.core.build.VersionedResourceDistribution; import org.argeo.slc.deploy.DeploymentData; import org.argeo.slc.deploy.DynamicRuntime; diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java index 65ad39f25..6f7a67337 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java @@ -25,12 +25,12 @@ import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.UnsupportedException; -import org.argeo.slc.build.BasicNameVersion; import org.argeo.slc.build.Distribution; import org.argeo.slc.build.ModularDistribution; -import org.argeo.slc.build.NameVersion; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.springframework.beans.factory.InitializingBean; diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java index cf9078a73..c7660023a 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java @@ -24,9 +24,9 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; import org.apache.commons.io.IOUtils; -import org.argeo.slc.build.BasicNameVersion; +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.core.build.VersionedResourceDistribution; import org.osgi.framework.Constants; import org.springframework.context.ResourceLoaderAware; diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java index f18b78303..47c131cdc 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java @@ -21,8 +21,8 @@ import java.util.SortedMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.NameVersion; import org.argeo.slc.core.build.VersionedResourceDistribution; import org.argeo.slc.osgi.OsgiBundle; import org.osgi.framework.Bundle; -- 2.39.2