Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7828E2A2F for ; Sat, 7 May 2011 20:51:16 +0000 (UTC) Received: (qmail 26244 invoked by uid 500); 7 May 2011 20:51:16 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 26183 invoked by uid 500); 7 May 2011 20:51:16 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 26176 invoked by uid 99); 7 May 2011 20:51:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 20:51:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 May 2011 20:51:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84CF02388A29; Sat, 7 May 2011 20:50:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100624 [1/3] - in /geronimo/server/branches/3.0-osgi: framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/... Date: Sat, 07 May 2011 20:50:42 -0000 To: scm@geronimo.apache.org From: kevan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110507205043.84CF02388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kevan Date: Sat May 7 20:50:39 2011 New Revision: 1100624 URL: http://svn.apache.org/viewvc?rev=1100624&view=rev Log: Delete ConfigurationManager and DependencyManager. Initial cleanup of resulting breakage. More could be deleted, but will do that over time. Removed: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/DependencyManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicDependencyManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DependencyNodeUtil.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/EditableConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/EditableKernelConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/ConfigurationManagerTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/config/EditableKernelConfigurationManagerTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/mock/MockConfigurationManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/DependencyManager.java Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java geronimo/server/branches/3.0-osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java geronimo/server/branches/3.0-osgi/framework/configs/plugin/src/main/plan/plan.xml geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/HighVersionFirstExportPackagesSelector.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiBuildContext.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiMetaDataBuilder.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/SingleFileHotDeployerTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/Kernel.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/KernelGBean.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainBootstrapper.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/ConfigTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/J2EEServer.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/AbstractEntryFactory.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/ConfigurationAwareReference.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstanceGBean.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyFileTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/PluginInstallerTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/KernelDelegate.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/MainBridge.java geronimo/server/branches/3.0-osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/BundleDeploymentContext.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/WebFragmentTest.java geronimo/server/branches/3.0-osgi/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/config/resource/osgi/ConfigRegistryImpl.java Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java (original) +++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/CreatePluginListMojo.java Sat May 7 20:50:39 2011 @@ -38,7 +38,7 @@ import org.apache.geronimo.kernel.config import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.kernel.repository.ListableRepository; import org.apache.geronimo.kernel.repository.Maven2Repository; -import org.apache.geronimo.system.plugin.PluginInstallerGBean; +// import org.apache.geronimo.system.plugin.PluginInstallerGBean; import org.apache.geronimo.system.plugin.model.PluginListType; import org.apache.geronimo.system.plugin.model.PluginType; import org.apache.geronimo.system.plugin.model.PluginXmlUtil; @@ -77,25 +77,26 @@ public class CreatePluginListMojo extend } public PluginListType createPluginListForRepositories(ListableRepository repository, String repoName) throws NoSuchStoreException { - Map pluginMap = new HashMap(); - SortedSet configs = repository.list(); - for (Artifact configId : configs) { - PluginType data = getPluginMetadata(repository, configId); - - if (data != null) { - PluginType key = PluginInstallerGBean.toKey(data); - PluginType existing = pluginMap.get(key); - if (existing == null) { - pluginMap.put(key, data); - } else { - existing.getPluginArtifact().addAll(data.getPluginArtifact()); - } - } - } - PluginListType pluginList = new PluginListType(); - pluginList.getPlugin().addAll(pluginMap.values()); - pluginList.getDefaultRepository().add(repoName); - return pluginList; +// Map pluginMap = new HashMap(); +// SortedSet configs = repository.list(); +// for (Artifact configId : configs) { +// PluginType data = getPluginMetadata(repository, configId); + +// if (data != null) { +// PluginType key = PluginInstallerGBean.toKey(data); +// PluginType existing = pluginMap.get(key); +// if (existing == null) { +// pluginMap.put(key, data); +// } else { +// existing.getPluginArtifact().addAll(data.getPluginArtifact()); +// } +// } +// } +// PluginListType pluginList = new PluginListType(); +// pluginList.getPlugin().addAll(pluginMap.values()); +// pluginList.getDefaultRepository().add(repoName); +// return pluginList; + return null; } private PluginType getPluginMetadata(ListableRepository repository, Artifact configId) { Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original) +++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Sat May 7 20:50:39 2011 @@ -30,7 +30,7 @@ import org.apache.geronimo.kernel.basic. import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.system.configuration.RepositoryConfigurationStore; import org.apache.geronimo.system.plugin.DownloadResults; -import org.apache.geronimo.system.plugin.PluginInstallerGBean; +// import org.apache.geronimo.system.plugin.PluginInstallerGBean; import org.apache.geronimo.system.plugin.SourceRepository; import org.apache.geronimo.system.plugin.PluginRepositoryList; import org.apache.geronimo.system.plugin.PluginRepositoryDownloader; @@ -181,14 +181,14 @@ public class InstallModulesMojo extends PluginRepositoryList pluginRepoList = new PluginRepositoryDownloader(Collections.singletonMap(localRepo, (String[]) null), true); try { kernel.boot(bundleContext); - PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, installedPluginsList, servers, pluginRepoList, kernel, bundleContext); - installer.install(pluginList, sourceRepo, true, null, null, downloadPoller); - if (overrides != null) { - for (Override override: this.overrides) { - AttributesType attributes = override.getOverrides(overridesDir); - installer.mergeOverrides(override.getServer(), attributes); - } - } +// PluginInstallerGBean installer = new PluginInstallerGBean(targetRepositoryPath, targetServerPath, installedPluginsList, servers, pluginRepoList, kernel, bundleContext); +// installer.install(pluginList, sourceRepo, true, null, null, downloadPoller); +// if (overrides != null) { +// for (Override override: this.overrides) { +// AttributesType attributes = override.getOverrides(overridesDir); +// installer.mergeOverrides(override.getServer(), attributes); +// } +// } } catch (Exception e) { throw new MojoExecutionException("Could not use plugin installer bean", e); } finally { @@ -215,12 +215,13 @@ public class InstallModulesMojo extends private PluginType toPluginType(Artifact artifact) { - PluginType plugin = new PluginType(); - PluginArtifactType instance = new PluginArtifactType(); - ArtifactType artifactType = PluginInstallerGBean.toArtifactType(artifact); - instance.setModuleId(artifactType); - plugin.getPluginArtifact().add(instance); - return plugin; + return null; +// PluginType plugin = new PluginType(); +// PluginArtifactType instance = new PluginArtifactType(); +// ArtifactType artifactType = PluginInstallerGBean.toArtifactType(artifact); +// instance.setModuleId(artifactType); +// plugin.getPluginArtifact().add(instance); +// return plugin; } /** Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java (original) +++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/UpdatePluginListMojo.java Sat May 7 20:50:39 2011 @@ -29,7 +29,7 @@ import java.util.Iterator; import org.apache.geronimo.kernel.config.NoSuchStoreException; import org.apache.geronimo.kernel.repository.Artifact; -import org.apache.geronimo.system.plugin.PluginInstallerGBean; +// import org.apache.geronimo.system.plugin.PluginInstallerGBean; import org.apache.geronimo.system.plugin.model.PluginXmlUtil; import org.apache.geronimo.system.plugin.model.PluginArtifactType; import org.apache.geronimo.system.plugin.model.PluginListType; @@ -93,41 +93,42 @@ public class UpdatePluginListMojo extend } public void updatePluginList(PluginType plugin, PluginListType pluginList) throws NoSuchStoreException { - PluginType key = PluginInstallerGBean.toKey(plugin); - PluginArtifactType instance = plugin.getPluginArtifact().get(0); - Artifact id = PluginInstallerGBean.toArtifact(instance.getModuleId()); - boolean foundKey = false; - boolean foundModule = false; - for (Iterator pit = pluginList.getPlugin().iterator(); pit.hasNext();) { - PluginType test = pit.next(); - for (Iterator it = test.getPluginArtifact().iterator(); it.hasNext();) { - PluginArtifactType testInstance = it.next(); - Artifact testId = PluginInstallerGBean.toArtifact(testInstance.getModuleId()); - if (id.equals(testId)) { - //if the module id appears anywhere, remove that instance - //however, this would cause plugin without plugin artifact - it.remove(); - foundModule = true; - } - } - PluginType testKey = PluginInstallerGBean.toKey(test); - if (key.equals(testKey)) { - foundKey = true; - //if the name, category, author, description, pluginGroup, licence, url match, then add this instance to current pluginType - test.getPluginArtifact().add(instance); - } - if(!foundKey && foundModule) { - //remove the old plugin off pluginList if it exists as we 'll add a new one - //otherwise we'll leave plugin without plugin artifact on the plugin catalog. - if (test.getPluginArtifact().size() == 0) { - pit.remove(); - } - } - } - if (!foundKey) { - //did not find a matching key - pluginList.getPlugin().add(plugin); - } + ((Object)null).toString(); +// PluginType key = PluginInstallerGBean.toKey(plugin); +// PluginArtifactType instance = plugin.getPluginArtifact().get(0); +// Artifact id = PluginInstallerGBean.toArtifact(instance.getModuleId()); +// boolean foundKey = false; +// boolean foundModule = false; +// for (Iterator pit = pluginList.getPlugin().iterator(); pit.hasNext();) { +// PluginType test = pit.next(); +// for (Iterator it = test.getPluginArtifact().iterator(); it.hasNext();) { +// PluginArtifactType testInstance = it.next(); +// Artifact testId = PluginInstallerGBean.toArtifact(testInstance.getModuleId()); +// if (id.equals(testId)) { +// //if the module id appears anywhere, remove that instance +// //however, this would cause plugin without plugin artifact +// it.remove(); +// foundModule = true; +// } +// } +// PluginType testKey = PluginInstallerGBean.toKey(test); +// if (key.equals(testKey)) { +// foundKey = true; +// //if the name, category, author, description, pluginGroup, licence, url match, then add this instance to current pluginType +// test.getPluginArtifact().add(instance); +// } +// if(!foundKey && foundModule) { +// //remove the old plugin off pluginList if it exists as we 'll add a new one +// //otherwise we'll leave plugin without plugin artifact on the plugin catalog. +// if (test.getPluginArtifact().size() == 0) { +// pit.remove(); +// } +// } +// } +// if (!foundKey) { +// //did not find a matching key +// pluginList.getPlugin().add(plugin); +// } } } Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java (original) +++ geronimo/server/branches/3.0-osgi/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/InstallPluginMojo.java Sat May 7 20:50:39 2011 @@ -31,7 +31,7 @@ import javax.enterprise.deploy.spi.statu import org.apache.geronimo.deployment.plugin.GeronimoDeploymentManager; import org.apache.geronimo.system.plugin.DownloadResults; -import org.apache.geronimo.system.plugin.PluginInstallerGBean; +// import org.apache.geronimo.system.plugin.PluginInstallerGBean; import org.apache.geronimo.system.plugin.model.ArtifactType; import org.apache.geronimo.system.plugin.model.PluginArtifactType; import org.apache.geronimo.system.plugin.model.PluginListType; @@ -110,7 +110,8 @@ public class InstallPluginMojo pluginListType.getPlugin().add(pluginType); PluginArtifactType instance = new PluginArtifactType(); pluginType.getPluginArtifact().add(instance); - ArtifactType artifactType = PluginInstallerGBean.toArtifactType(geronimoArtifact); +// ArtifactType artifactType = PluginInstallerGBean.toArtifactType(geronimoArtifact); + ArtifactType artifactType = null; instance.setModuleId(artifactType); GeronimoDeploymentManager mgr = getDeploymentManager2(); Modified: geronimo/server/branches/3.0-osgi/framework/configs/plugin/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/configs/plugin/src/main/plan/plan.xml?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/configs/plugin/src/main/plan/plan.xml (original) +++ geronimo/server/branches/3.0-osgi/framework/configs/plugin/src/main/plan/plan.xml Sat May 7 20:50:39 2011 @@ -21,47 +21,47 @@ - + - var/config/installed-plugins.properties - - Repository - - - Local - + + + + + + + - - ServerInfo - - - DefaultThreadPool - - - DownloadedPluginRepos - - - - DefaultServer - - - Offline - - - Client - - - Jsr88 - - - - - AttributeManager - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default @@ -112,9 +112,9 @@ org.apache.geronimo.framework.plugingroups/framework/${version}/car - - PluginInstaller - + + + Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java Sat May 7 20:50:39 2011 @@ -260,16 +260,17 @@ public abstract class ExtendedDeployment } public Artifact[] getEBAConfigurationIds(){ - List stores = configurationManager.listStores(); +// List stores = configurationManager.listStores(); + List stores = null; if (stores.isEmpty()) { return null; } ArrayList result = new ArrayList(); for (AbstractName store : stores) { - List infos; - try { - infos = configurationManager.listConfigurations(store); + List infos = null; +// try { +// infos = configurationManager.listConfigurations(store); for (Object info : infos) { ConfigurationInfo configInfo = (ConfigurationInfo) info; @@ -277,9 +278,9 @@ public abstract class ExtendedDeployment result.add(configInfo.getConfigID()); } } - } catch (NoSuchStoreException e) { - e.printStackTrace(); - } +// } catch (NoSuchStoreException e) { +// e.printStackTrace(); +// } } return result.size() == 0 ? null : result.toArray(new Artifact[result.size()]); Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Sat May 7 20:50:39 2011 @@ -49,7 +49,6 @@ import org.apache.geronimo.gbean.Abstrac import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.GBeanNotFoundException; import org.apache.geronimo.kernel.config.ConfigurationInfo; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationModuleType; import org.apache.geronimo.kernel.config.ConfigurationUtil; import org.apache.geronimo.kernel.management.State; @@ -61,7 +60,6 @@ import org.apache.geronimo.kernel.manage public abstract class JMXDeploymentManager implements DeploymentManager { protected Kernel kernel; - protected ConfigurationManager configurationManager; protected CommandContext commandContext; private final Collection moduleConfigurers; @@ -74,12 +72,12 @@ public abstract class JMXDeploymentManag protected void initialize(Kernel kernel) throws IOException { this.kernel = kernel; - try { - configurationManager = ConfigurationUtil.getConfigurationManager(kernel); - } catch (GBeanNotFoundException e) { - //TODO consider wrapping exception - throw new IOException(e.getMessage()); - } +// try { +// configurationManager = ConfigurationUtil.getConfigurationManager(kernel); +// } catch (GBeanNotFoundException e) { +// //TODO consider wrapping exception +// throw new IOException(e.getMessage()); +// } commandContext = new CommandContext(true, true, null, null, false); } @@ -89,21 +87,22 @@ public abstract class JMXDeploymentManag } public void release() { - if(kernel != null && configurationManager != null) { - try { - ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); - } finally { - configurationManager = null; - kernel = null; - } - } +// if(kernel != null && configurationManager != null) { +// try { +// ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); +// } finally { +// configurationManager = null; +// kernel = null; +// } +// } } public Target[] getTargets() { if (kernel == null) { throw new IllegalStateException("Disconnected"); } - List stores = configurationManager.listStores(); + List stores = null; +// List stores = configurationManager.listStores(); if (stores.isEmpty()) { return null; } @@ -161,7 +160,8 @@ public abstract class JMXDeploymentManag for (Target aTargetList : targetList) { TargetImpl target = (TargetImpl) aTargetList; AbstractName storeName = target.getAbstractName(); - List infos = configurationManager.listConfigurations(storeName); +// List infos = configurationManager.listConfigurations(storeName); + List infos = null; for (Object info1 : infos) { ConfigurationInfo info = (ConfigurationInfo) info1; if (filter.accept(info)) { Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java Sat May 7 20:50:39 2011 @@ -31,7 +31,6 @@ import org.apache.geronimo.deployment.pl import org.apache.geronimo.gbean.AbstractName; import org.apache.geronimo.kernel.InternalKernelException; import org.apache.geronimo.kernel.Kernel; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationUtil; import org.apache.geronimo.kernel.config.LifecycleResults; import org.apache.geronimo.kernel.config.NoSuchConfigException; @@ -89,8 +88,8 @@ public class RedeployCommand extends Abs configID.getVersion(), configID.getType()); } - ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); - try { +// ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); +// try { for (int i = 0; i < modules.length; i++) { TargetModuleIDImpl module = (TargetModuleIDImpl) modules[i]; Artifact artifact = Artifact.create(module.getModuleID()); @@ -98,17 +97,18 @@ public class RedeployCommand extends Abs if(configID.getGroupId().equals(artifact.getGroupId()) && configID.getArtifactId().equals(artifact.getArtifactId()) && configID.getVersion().equals(artifact.getVersion())) { - redeploySameConfiguration(configurationManager, artifact, module.getTarget()); + redeploySameConfiguration(artifact, module.getTarget()); } else { - redeployUpdatedConfiguration(configurationManager, artifact, module.getTarget()); + redeployUpdatedConfiguration(artifact, module.getTarget()); } } else { - redeployUpdatedConfiguration(configurationManager, artifact, module.getTarget()); + redeployUpdatedConfiguration(artifact, module.getTarget()); } } - } finally { - ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); - } +// } +// finally { +// ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); +// } addWebURLs(kernel); complete("Completed"); } catch (Throwable e) { @@ -125,7 +125,7 @@ public class RedeployCommand extends Abs } } - private void redeployUpdatedConfiguration(ConfigurationManager manager, Artifact previous, Target target) throws Exception, NoSuchConfigException { + private void redeployUpdatedConfiguration(Artifact previous, Target target) throws Exception, NoSuchConfigException { // Send the new configuration to the server // if the configuration is an in-place one, then redeploys @@ -136,7 +136,8 @@ public class RedeployCommand extends Abs commandContext.setInPlace(inPlaceConfiguration.booleanValue()); doDeploy(target, false); Artifact configID = Artifact.create(getResultTargetModuleIDs()[0].getModuleID()); - LifecycleResults results = manager.reloadConfiguration(previous, configID.getVersion()); +// LifecycleResults results = manager.reloadConfiguration(previous, configID.getVersion()); + LifecycleResults results = null; // Activate it //todo: make this asynchronous @@ -170,12 +171,12 @@ public class RedeployCommand extends Abs } } - private void redeploySameConfiguration(ConfigurationManager configurationManager, Artifact configID, Target target) throws Exception { + private void redeploySameConfiguration(Artifact configID, Target target) throws Exception { if(!configID.isResolved()) { throw new IllegalStateException("Cannot redeploy same module when module ID is not fully resolved ("+configID+")"); } try { - configurationManager.stopConfiguration(configID); +// configurationManager.stopConfiguration(configID); updateStatus("Stopped "+configID); } catch (InternalKernelException e) { Exception cause = (Exception)e.getCause(); @@ -184,11 +185,11 @@ public class RedeployCommand extends Abs } else { throw cause; } - } catch(NoSuchConfigException e) { - // The module isn't loaded -- that's OK - } + } // catch(NoSuchConfigException e) { +// // The module isn't loaded -- that's OK +// } try { - configurationManager.unloadConfiguration(configID); +// configurationManager.unloadConfiguration(configID); updateStatus("Unloaded "+configID); } catch(InternalKernelException e) { Exception cause = (Exception)e.getCause(); @@ -197,9 +198,9 @@ public class RedeployCommand extends Abs } else { throw cause; } - } catch (NoSuchConfigException e) { - // The modules isn't loaded -- that's OK - } + } // catch (NoSuchConfigException e) { +// // The modules isn't loaded -- that's OK +// } // if the configuration is an in-place one, then redeploys // in in-place mode. @@ -209,7 +210,8 @@ public class RedeployCommand extends Abs commandContext.setInPlace(inPlaceConfiguration.booleanValue()); try { - configurationManager.uninstallConfiguration(configID); + ((Object)null).toString(); // to do... +// configurationManager.uninstallConfiguration(configID); updateStatus("Uninstalled "+configID); } catch(InternalKernelException e) { Exception cause = (Exception)e.getCause(); @@ -218,15 +220,15 @@ public class RedeployCommand extends Abs } else { throw cause; } - } catch (NoSuchConfigException e) { - throw new IllegalStateException("Module "+configID+" is not installed!", e); - } + }// catch (NoSuchConfigException e) { +// throw new IllegalStateException("Module "+configID+" is not installed!", e); +// } doDeploy(target, false); updateStatus("Deployed "+configID); - configurationManager.loadConfiguration(configID); - configurationManager.startConfiguration(configID); +// configurationManager.loadConfiguration(configID); +// configurationManager.startConfiguration(configID); updateStatus("Started " + configID); } } Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java Sat May 7 20:50:39 2011 @@ -25,7 +25,6 @@ import javax.enterprise.deploy.spi.Targe import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.config.Configuration; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationUtil; import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.gbean.AbstractName; @@ -45,26 +44,27 @@ public class StartCommand extends Comman public void run() { try { - ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); +// ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); try { for (int i = 0; i < modules.length; i++) { TargetModuleID module = modules[i]; // Check to see whether the module is already started Artifact moduleID = Artifact.create(module.getModuleID()); - if (configurationManager.isRunning(moduleID)) { - updateStatus("Module " + moduleID + " is already running"); - Thread.sleep(100); - continue; - } - - // Load - if(!configurationManager.isLoaded(moduleID)) { - configurationManager.loadConfiguration(moduleID); - } +// if (configurationManager.isRunning(moduleID)) { +// updateStatus("Module " + moduleID + " is already running"); +// Thread.sleep(100); +// continue; +// } + +// // Load +// if(!configurationManager.isLoaded(moduleID)) { +// configurationManager.loadConfiguration(moduleID); +// } // Start - org.apache.geronimo.kernel.config.LifecycleResults lcresult = configurationManager.startConfiguration(moduleID); +// org.apache.geronimo.kernel.config.LifecycleResults lcresult = configurationManager.startConfiguration(moduleID); + org.apache.geronimo.kernel.config.LifecycleResults lcresult = null; // Determine the child modules of the configuration //TODO might be a hack @@ -111,7 +111,7 @@ public class StartCommand extends Comman } } } finally { - ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); +// ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); } addWebURLs(kernel); complete("Completed"); Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java Sat May 7 20:50:39 2011 @@ -19,7 +19,6 @@ package org.apache.geronimo.deployment.p import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl; import org.apache.geronimo.kernel.Kernel; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationUtil; import org.apache.geronimo.kernel.repository.Artifact; @@ -43,7 +42,7 @@ public class StopCommand extends Command public void run() { try { - ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); +// ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); int alreadyStopped = 0; try { @@ -52,17 +51,18 @@ public class StopCommand extends Command Artifact moduleID = Artifact.create(module.getModuleID()); org.apache.geronimo.kernel.config.LifecycleResults lcresult = null; - if (configurationManager.isRunning(moduleID)) { - lcresult = configurationManager.stopConfiguration(moduleID); - addModule(module); - } else { - updateStatus("Module " + moduleID + " is already stopped"); - alreadyStopped++; - } - - if (configurationManager.isLoaded(moduleID)) { - configurationManager.unloadConfiguration(moduleID); - } + ((Object)null).toString(); +// if (configurationManager.isRunning(moduleID)) { +// lcresult = configurationManager.stopConfiguration(moduleID); +// addModule(module); +// } else { +// updateStatus("Module " + moduleID + " is already stopped"); +// alreadyStopped++; +// } + +// if (configurationManager.isLoaded(moduleID)) { +// configurationManager.unloadConfiguration(moduleID); +// } if (lcresult != null) { java.util.Iterator iterator = lcresult.getStopped().iterator(); @@ -93,7 +93,7 @@ public class StopCommand extends Command } } } finally { - ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); +// ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); } if ((getModuleCount() + alreadyStopped) < modules.length) { fail("Some modules could not be stopped"); Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java Sat May 7 20:50:39 2011 @@ -23,7 +23,6 @@ import javax.enterprise.deploy.spi.Targe import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl; import org.apache.geronimo.kernel.InternalKernelException; import org.apache.geronimo.kernel.Kernel; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationUtil; import org.apache.geronimo.kernel.config.NoSuchConfigException; import org.apache.geronimo.kernel.repository.Artifact; @@ -44,42 +43,42 @@ public class UndeployCommand extends Com public void run() { try { - ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); - try { +// ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel); +// try { for (int i = 0; i < modules.length; i++) { TargetModuleIDImpl module = (TargetModuleIDImpl) modules[i]; Artifact moduleID = Artifact.create(module.getModuleID()); try { - if(!configurationManager.isOnline()) { - //If an offline undeploy, need to load the configuration first, so that stopConfiguration() - //can resolve the configuration and successfully set load=false in attribute manager, otherwise - //starting the server will fail attempting to start an config that does not exist. - configurationManager.loadConfiguration(moduleID); - } +// if(!configurationManager.isOnline()) { +// //If an offline undeploy, need to load the configuration first, so that stopConfiguration() +// //can resolve the configuration and successfully set load=false in attribute manager, otherwise +// //starting the server will fail attempting to start an config that does not exist. +// configurationManager.loadConfiguration(moduleID); +// } - configurationManager.stopConfiguration(moduleID); +// configurationManager.stopConfiguration(moduleID); - configurationManager.unloadConfiguration(moduleID); +// configurationManager.unloadConfiguration(moduleID); updateStatus("Module " + moduleID + " unloaded."); } catch (InternalKernelException e) { // this is cause by the kernel being already shutdown - } catch (NoSuchConfigException e) { - // module was already unloaded - just continue - } + } // catch (NoSuchConfigException e) { +// // module was already unloaded - just continue +// } - try { - configurationManager.uninstallConfiguration(moduleID); +// try { +// configurationManager.uninstallConfiguration(moduleID); updateStatus("Module " + moduleID + " uninstalled."); addModule(module); - } catch (NoSuchConfigException e) { - // module was already undeployed - just continue - } +// } catch (NoSuchConfigException e) { +// // module was already undeployed - just continue +// } } - } finally { - ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); - } +// } finally { +// ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager); +// } //todo: this will probably never happen because the command line args are compared to actual modules if (getModuleCount() < modules.length) { Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java Sat May 7 20:50:39 2011 @@ -38,7 +38,7 @@ import org.apache.geronimo.deployment.pl import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl; import org.apache.geronimo.kernel.config.NoSuchStoreException; import org.apache.geronimo.system.plugin.DownloadResults; -import org.apache.geronimo.system.plugin.PluginInstallerGBean; +// import org.apache.geronimo.system.plugin.PluginInstallerGBean; import org.apache.geronimo.system.plugin.model.PluginArtifactType; import org.apache.geronimo.system.plugin.model.PluginListType; import org.apache.geronimo.system.plugin.model.PluginType; @@ -163,11 +163,12 @@ public class CommandListConfigurations e // let's add framework plugin group manually so that users can choose it for (PluginType metadata : data.getPlugin()) { for (PluginArtifactType testInstance : metadata.getPluginArtifact()) { - if (PluginInstallerGBean.toArtifact(testInstance.getModuleId()).toString().indexOf("plugingroups/framework") > 0) { - PluginType plugin = PluginInstallerGBean.copy(metadata, testInstance); - appPlugin.getPlugin().add(plugin); - break; - } + ((Object)null).toString(); +// if (PluginInstallerGBean.toArtifact(testInstance.getModuleId()).toString().indexOf("plugingroups/framework") > 0) { +// PluginType plugin = PluginInstallerGBean.copy(metadata, testInstance); +// appPlugin.getPlugin().add(plugin); +// break; +// } } } @@ -257,10 +258,11 @@ public class CommandListConfigurations e consoleReader.printNewline(); for (PluginType metadata : items) { for (PluginArtifactType instance : metadata.getPluginArtifact()) { - PluginType copy = PluginInstallerGBean.copy(metadata, instance); - available.add(copy); - DeployUtils.printTo(" " + available.size() + ": ", 10, consoleReader); - DeployUtils.println(metadata.getName() + " (" + instance.getModuleId().getVersion() + ")", 0, consoleReader); + ((Object)null).toString(); +// PluginType copy = PluginInstallerGBean.copy(metadata, instance); +// available.add(copy); +// DeployUtils.printTo(" " + available.size() + ": ", 10, consoleReader); +// DeployUtils.println(metadata.getName() + " (" + instance.getModuleId().getVersion() + ")", 0, consoleReader); } } } @@ -313,11 +315,11 @@ public class CommandListConfigurations e PluginType plugin = null; for (PluginType metadata : list.getPlugin()) { for (PluginArtifactType testInstance : metadata.getPluginArtifact()) { - if (PluginInstallerGBean.toArtifact(testInstance.getModuleId()).toString().equals(configId)) { - plugin = PluginInstallerGBean.copy(metadata, testInstance); - installList.getPlugin().add(plugin); - break; - } +// if (PluginInstallerGBean.toArtifact(testInstance.getModuleId()).toString().equals(configId)) { +// plugin = PluginInstallerGBean.copy(metadata, testInstance); +// installList.getPlugin().add(plugin); +// break; +// } } } // if plugin value is null here, means the configId is not a geronimo plugin - ignore Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java Sat May 7 20:50:39 2011 @@ -28,7 +28,6 @@ import org.apache.geronimo.gbean.Abstrac import org.apache.geronimo.gbean.AbstractNameQuery; import org.apache.geronimo.kernel.GBeanNotFoundException; import org.apache.geronimo.kernel.Kernel; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationStore; import org.apache.geronimo.kernel.config.ConfigurationUtil; import org.apache.geronimo.kernel.config.LifecycleException; @@ -50,7 +49,6 @@ public class OfflineDeployerStarter { private final Kernel kernel; private AbstractName onlineDeployerConfigurationManagerName; - private ConfigurationManager onlineDeployerConfigurationManager; private final Set onlineDeployerConfigStores; public OfflineDeployerStarter(Kernel kernel) throws GBeanNotFoundException { @@ -75,12 +73,14 @@ public class OfflineDeployerStarter { } catch (Exception e) { throw new DeploymentException("Unexpected error. Cannot start offline-deployer", e); } - onlineDeployerConfigurationManager.setOnline(false); +// onlineDeployerConfigurationManager.setOnline(false); } protected Artifact resolveOfflineDeployer() throws MissingDependencyException { - ArtifactResolver artifactResolver = onlineDeployerConfigurationManager.getArtifactResolver(); - return artifactResolver.resolveInClassLoader(OFFLINE_DEPLOYER_ARTIFACT); + ((Object)null).toString(); +// ArtifactResolver artifactResolver = onlineDeployerConfigurationManager.getArtifactResolver(); +// return artifactResolver.resolveInClassLoader(OFFLINE_DEPLOYER_ARTIFACT); + return null; } protected void enablePersistentConfigurationTracking() throws GBeanNotFoundException { @@ -95,7 +95,8 @@ public class OfflineDeployerStarter { } protected void stopOfflineConfigurationManager() throws GBeanNotFoundException { - Set names = kernel.listGBeans(new AbstractNameQuery(ConfigurationManager.class.getName())); +// Set names = kernel.listGBeans(new AbstractNameQuery(ConfigurationManager.class.getName())); + Set names = null; for (Iterator iterator = names.iterator(); iterator.hasNext();) { AbstractName abstractName = (AbstractName) iterator.next(); if (!onlineDeployerConfigurationManagerName.equals(abstractName)) { @@ -116,15 +117,15 @@ public class OfflineDeployerStarter { configs.addAll((List) kernel.invoke(configListName, "restore")); } - for (Artifact config : configs) { - onlineDeployerConfigurationManager.loadConfiguration(config); - onlineDeployerConfigurationManager.startConfiguration(config); - } +// for (Artifact config : configs) { +// onlineDeployerConfigurationManager.loadConfiguration(config); +// onlineDeployerConfigurationManager.startConfiguration(config); +// } } protected void startOfflineConfiguration(Artifact offlineDeployerArtifact) throws NoSuchConfigException, LifecycleException { - onlineDeployerConfigurationManager.loadConfiguration(offlineDeployerArtifact); - onlineDeployerConfigurationManager.startConfiguration(offlineDeployerArtifact); +// onlineDeployerConfigurationManager.loadConfiguration(offlineDeployerArtifact); +// onlineDeployerConfigurationManager.startConfiguration(offlineDeployerArtifact); } } Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Sat May 7 20:50:39 2011 @@ -85,7 +85,6 @@ public class DeploymentContext { protected final File inPlaceConfigurationDir; protected final ResourceContext resourceContext; protected final Map childConfigurationDatas = new LinkedHashMap(); -// protected final ConfigurationManager configurationManager; protected final Naming naming; protected final List additionalDeployment = new ArrayList(); protected final AbstractName moduleName; @@ -121,7 +120,6 @@ public class DeploymentContext { BundleContext bundleContext) throws DeploymentException { if (environment == null) throw new NullPointerException("environment is null"); if (moduleType == null) throw new NullPointerException("type is null"); -// if (configurationManager == null) throw new NullPointerException("configurationManager is null"); if (baseDir == null) throw new NullPointerException("baseDir is null"); if (!baseDir.exists() && !baseDir.mkdirs()) { throw new DeploymentException("Could not create directory for deployment context assembly: " + baseDir); @@ -136,7 +134,6 @@ public class DeploymentContext { this.naming = naming; this.moduleType = moduleType; this.environment = environment; -// this.configurationManager = createConfigurationManager(configurationManager, Collections. emptyList(), bundleContext); this.bundleContext = bundleContext; if (null == inPlaceConfigurationDir) { @@ -164,7 +161,6 @@ public class DeploymentContext { this.naming = naming; this.moduleType = moduleType; this.environment = environment; -// this.configurationManager = createConfigurationManager(configurationManager, Collections. emptyList(), bundleContext); this.resourceContext = resourceContext; this.bundleContext = bundleContext; } @@ -266,10 +262,6 @@ public class DeploymentContext { return (inPlaceConfigurationDir == null) ? baseDir : inPlaceConfigurationDir; } -// public ConfigurationManager getConfigurationManager() { -// return configurationManager; -// } - public Artifact getConfigID() { return environment.getConfigId(); } Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java Sat May 7 20:50:39 2011 @@ -31,7 +31,6 @@ import org.apache.geronimo.gbean.GBeanIn import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.kernel.config.ConfigurationData; import org.apache.geronimo.kernel.config.ConfigurationInfo; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.config.ConfigurationStore; import org.apache.geronimo.kernel.config.InvalidConfigException; import org.apache.geronimo.kernel.config.LifecycleException; @@ -55,21 +54,19 @@ public class SingleFileHotDeployer { private final String[] watchPaths; private final Collection builders; private final ConfigurationStore store; - private final ConfigurationManager configurationManager; private final boolean forceDeploy; private final Artifact configurationId; private boolean wasDeployed; - public SingleFileHotDeployer(String path, ServerInfo serverInfo, String[] watchPaths, Collection builders, ConfigurationStore store, ConfigurationManager configurationManager, boolean forceDeploy) throws DeploymentException { - this(serverInfo.resolve(path), watchPaths, builders, store, configurationManager, forceDeploy); + public SingleFileHotDeployer(String path, ServerInfo serverInfo, String[] watchPaths, Collection builders, ConfigurationStore store, boolean forceDeploy) throws DeploymentException { + this(serverInfo.resolve(path), watchPaths, builders, store, forceDeploy); } - public SingleFileHotDeployer(File dir, String[] watchPaths, Collection builders, ConfigurationStore store, ConfigurationManager configurationManager, boolean forceDeploy) throws DeploymentException { + public SingleFileHotDeployer(File dir, String[] watchPaths, Collection builders, ConfigurationStore store, boolean forceDeploy) throws DeploymentException { this.dir = dir; this.watchPaths = watchPaths; this.builders = builders; this.store = store; - this.configurationManager = configurationManager; this.forceDeploy = forceDeploy; configurationId = start(dir); @@ -93,7 +90,8 @@ public class SingleFileHotDeployer { // get the existing inplace configuration if there is one ConfigurationInfo existingConfiguration = null; - List list = configurationManager.listConfigurations(); +// List list = configurationManager.listConfigurations(); + List list = null; for (Iterator iterator = list.iterator(); iterator.hasNext();) { ConfigurationInfo configurationInfo = iterator.next(); if (dir.equals(configurationInfo.getInPlaceLocation())) { @@ -103,25 +101,25 @@ public class SingleFileHotDeployer { Artifact existingConfigurationId = (existingConfiguration == null) ? null : existingConfiguration.getConfigID(); if (!forceDeploy && existingConfiguration != null && !isModifiedSince(existingConfiguration.getCreated())) { - try { - configurationManager.loadConfiguration(existingConfigurationId); - configurationManager.startConfiguration(existingConfigurationId); - } catch (Exception e) { - throw new DeploymentException("Unable to load and start " + dir, e); - } +// try { +// configurationManager.loadConfiguration(existingConfigurationId); +// configurationManager.startConfiguration(existingConfigurationId); +// } catch (Exception e) { +// throw new DeploymentException("Unable to load and start " + dir, e); +// } return existingConfigurationId; } // if the current id and the new id only differ by version, we can reload, otherwise we need to load and start - if (existingConfigurationId != null && configurationManager.isLoaded(existingConfigurationId)) { - try { - configurationManager.unloadConfiguration(existingConfigurationId); - } catch (NoSuchConfigException e) { - throw new DeploymentException("Unable to unload existing configuration " + existingConfigurationId); - } catch (LifecycleException e) { - throw new DeploymentException("Unable to unload existing configuration " + existingConfigurationId); - } - } +// if (existingConfigurationId != null && configurationManager.isLoaded(existingConfigurationId)) { +// try { +// configurationManager.unloadConfiguration(existingConfigurationId); +// } catch (NoSuchConfigException e) { +// throw new DeploymentException("Unable to unload existing configuration " + existingConfigurationId); +// } catch (LifecycleException e) { +// throw new DeploymentException("Unable to unload existing configuration " + existingConfigurationId); +// } +// } ModuleIDBuilder idBuilder = new ModuleIDBuilder(); @@ -160,23 +158,23 @@ public class SingleFileHotDeployer { // see if one exists by the same configurationID. This will catch situations where the target // path was renamed or moved such that the path associated with the previous configuration no longer // matches the patch associated with the new configuration. - if ((existingConfigurationId == null) && configurationManager.isInstalled(configurationId)) { - log.info("Existing Module found by moduleId"); - existingConfigurationId = configurationId; - } +// if ((existingConfigurationId == null) && configurationManager.isInstalled(configurationId)) { +// log.info("Existing Module found by moduleId"); +// existingConfigurationId = configurationId; +// } // if we are deploying over the exisitng version we need to uninstall first - if(configurationId.equals(existingConfigurationId)) { - log.info("Undeploying " + existingConfigurationId); - configurationManager.uninstallConfiguration(existingConfigurationId); - } +// if(configurationId.equals(existingConfigurationId)) { +// log.info("Undeploying " + existingConfigurationId); +// configurationManager.uninstallConfiguration(existingConfigurationId); +// } // deploy it - deployConfiguration(builder, store, configurationId, plan, module, Arrays.asList(configurationManager.getStores()), configurationManager.getArtifactResolver()); +// deployConfiguration(builder, store, configurationId, plan, module, Arrays.asList(configurationManager.getStores()), configurationManager.getArtifactResolver()); wasDeployed = true; - configurationManager.loadConfiguration(configurationId); - configurationManager.startConfiguration(configurationId); +// configurationManager.loadConfiguration(configurationId); +// configurationManager.startConfiguration(configurationId); log.info("Successfully deployed and started " + configurationId + " in location " + dir); @@ -316,7 +314,6 @@ public class SingleFileHotDeployer { infoFactory.addAttribute("watchPaths", String[].class, true); infoFactory.addReference("Builders", ConfigurationBuilder.class); infoFactory.addReference("Store", ConfigurationStore.class); - infoFactory.addReference("ConfigurationManager", ConfigurationManager.class); infoFactory.addAttribute("forceDeploy", boolean.class, true); infoFactory.setConstructor(new String[]{"path", "ServerInfo", "watchPaths", "Builders", "Store", "ConfigurationManager", "forceDeploy"}); Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/HighVersionFirstExportPackagesSelector.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/HighVersionFirstExportPackagesSelector.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/HighVersionFirstExportPackagesSelector.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/HighVersionFirstExportPackagesSelector.java Sat May 7 20:50:39 2011 @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.kernel.repository.Dependency; -import org.apache.geronimo.system.configuration.DependencyManager; +// import org.apache.geronimo.system.configuration.DependencyManager; import org.apache.xbean.osgi.bundle.util.BundleDescription.ExportPackage; import org.osgi.framework.Bundle; import org.osgi.framework.Version; @@ -43,7 +43,7 @@ public class HighVersionFirstExportPacka public Map> select(OSGiBuildContext context) { Map> bundleIdExportPackages = new HashMap>(); Map packageNameVersionMap = new HashMap(); - DependencyManager dependencyManager = context.getDependencyManager(); +// DependencyManager dependencyManager = context.getDependencyManager(); // for (Dependency dependency : context.getEnvironment().getDependencies()) { // Artifact resolvedArtifact = context.resolveArtifact(dependency.getArtifact()); // if(resolvedArtifact == null) { Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiBuildContext.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiBuildContext.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiBuildContext.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiBuildContext.java Sat May 7 20:50:39 2011 @@ -29,7 +29,7 @@ import org.apache.geronimo.kernel.reposi import org.apache.geronimo.kernel.repository.ArtifactResolver; import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.kernel.repository.MissingDependencyException; -import org.apache.geronimo.system.configuration.DependencyManager; +// import org.apache.geronimo.system.configuration.DependencyManager; import org.apache.geronimo.system.plugin.model.DependencyType; import org.apache.geronimo.system.plugin.model.PluginArtifactType; import org.apache.xbean.osgi.bundle.util.BundleDescription.ExportPackage; @@ -48,7 +48,7 @@ public class OSGiBuildContext { private Set hiddenImportPackageNames; - private DependencyManager dependencyManager; +// private DependencyManager dependencyManager; private Environment environment; @@ -58,11 +58,13 @@ public class OSGiBuildContext { private ArtifactResolver clientArtifactResolver; - public OSGiBuildContext(Environment environment, List hiddenImportPackageNamePrefixes, Set hiddenImportPackageNames, DependencyManager dependencyManager, +// public OSGiBuildContext(Environment environment, List hiddenImportPackageNamePrefixes, Set hiddenImportPackageNames, DependencyManager dependencyManager, +// boolean inverseClassLoading) { + public OSGiBuildContext(Environment environment, List hiddenImportPackageNamePrefixes, Set hiddenImportPackageNames, boolean inverseClassLoading) { this.hiddenImportPackageNamePrefixes = hiddenImportPackageNamePrefixes; this.hiddenImportPackageNames = hiddenImportPackageNames; - this.dependencyManager = dependencyManager; +// this.dependencyManager = dependencyManager; this.environment = environment; this.inverseClassLoading = inverseClassLoading; } @@ -94,16 +96,17 @@ public class OSGiBuildContext { return false; } - public DependencyManager getDependencyManager() { - return dependencyManager; - } +// public DependencyManager getDependencyManager() { +// return dependencyManager; +// } public Environment getEnvironment() { return environment; } public Set getEffectExportPackages(Long bundleId) { - Set exportPackages = new HashSet(dependencyManager.getExportedPackages(bundleId)); +// Set exportPackages = new HashSet(dependencyManager.getExportedPackages(bundleId)); + Set exportPackages = null; for (Iterator it = exportPackages.iterator(); it.hasNext();) { ExportPackage exportPackage = it.next(); if (isHiddenExportPackage(exportPackage)) { @@ -125,18 +128,19 @@ public class OSGiBuildContext { return artifact; } - public Set getFullDependentBundleIds(Bundle bundle) { - if (clientModule) { - return getFullClientDependentBundleIds(bundle.getBundleId()); - } - return dependencyManager.getFullDependentBundleIds(bundle); - } +// public Set getFullDependentBundleIds(Bundle bundle) { +// if (clientModule) { +// return getFullClientDependentBundleIds(bundle.getBundleId()); +// } +// return dependencyManager.getFullDependentBundleIds(bundle); +// } private Set getFullClientDependentBundleIds(long bundleId) { - Artifact artifact = dependencyManager.getArtifact(bundleId); - if (artifact == null) { - return Collections.emptySet(); - } + Artifact artifact = null; +// Artifact artifact = dependencyManager.getArtifact(bundleId); +// if (artifact == null) { +// return Collections.emptySet(); +// } Artifact resolvedDependentArtifact = resolveArtifact(artifact); if (resolvedDependentArtifact == null) { return Collections.emptySet(); @@ -151,11 +155,13 @@ public class OSGiBuildContext { if (resolvedClientArtifact == null) { return; } - Bundle resolvedBundle = dependencyManager.getBundle(resolvedClientArtifact); - if (resolvedBundle == null || dependentBundleIds.contains(resolvedBundle.getBundleId())) { - return; - } - PluginArtifactType pluginArtifact = dependencyManager.getCachedPluginMetadata(resolvedBundle); + Bundle resolvedBundle = null; +// Bundle resolvedBundle = dependencyManager.getBundle(resolvedClientArtifact); +// if (resolvedBundle == null || dependentBundleIds.contains(resolvedBundle.getBundleId())) { +// return; +// } + PluginArtifactType pluginArtifact = null; +// PluginArtifactType pluginArtifact = dependencyManager.getCachedPluginMetadata(resolvedBundle); if (pluginArtifact != null) { for (DependencyType dependency : pluginArtifact.getDependency()) { Artifact resolvedDependentArtifact = resolveArtifact(dependency.toArtifact()); Modified: geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiMetaDataBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiMetaDataBuilder.java?rev=1100624&r1=1100623&r2=1100624&view=diff ============================================================================== --- geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiMetaDataBuilder.java (original) +++ geronimo/server/branches/3.0-osgi/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/util/osgi/OSGiMetaDataBuilder.java Sat May 7 20:50:39 2011 @@ -29,7 +29,7 @@ import org.apache.geronimo.kernel.Intern import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.repository.ArtifactResolver; import org.apache.geronimo.kernel.repository.Environment; -import org.apache.geronimo.system.configuration.DependencyManager; +// import org.apache.geronimo.system.configuration.DependencyManager; import org.apache.xbean.osgi.bundle.util.BundleDescription.ExportPackage; import org.apache.xbean.osgi.bundle.util.HeaderParser; import org.apache.xbean.osgi.bundle.util.HeaderParser.HeaderElement; @@ -70,12 +70,12 @@ public class OSGiMetaDataBuilder { processClassloadingRules(environment); ServiceReference serviceReference = null; try { - serviceReference = bundleContext.getServiceReference(DependencyManager.class.getName()); - DependencyManager dependencyManager = null; - if (serviceReference != null) { - dependencyManager = (DependencyManager) bundleContext.getService(serviceReference); - } - OSGiBuildContext context = createOSGiBuildContext(environment, dependencyManager, clientModule); +// serviceReference = bundleContext.getServiceReference(DependencyManager.class.getName()); +// DependencyManager dependencyManager = null; +// if (serviceReference != null) { +// dependencyManager = (DependencyManager) bundleContext.getService(serviceReference); +// } + OSGiBuildContext context = createOSGiBuildContext(environment, clientModule); processImportPackages(context); } finally { if (serviceReference != null) { @@ -95,7 +95,7 @@ public class OSGiMetaDataBuilder { }*/ } - protected OSGiBuildContext createOSGiBuildContext(Environment environment, DependencyManager dependencyManager, boolean clientModule) throws IllegalConfigurationException { + protected OSGiBuildContext createOSGiBuildContext(Environment environment, boolean clientModule) throws IllegalConfigurationException { List hiddenImportPackageNamePrefixes = new ArrayList(); Set hiddenImportPackageNames = new HashSet(); @@ -166,7 +166,7 @@ public class OSGiMetaDataBuilder { } environment.removeDynamicImportPackages(removedDynamicImportPackages); - OSGiBuildContext osgiBuildContext = new OSGiBuildContext(environment, hiddenImportPackageNamePrefixes, hiddenImportPackageNames, dependencyManager, false); + OSGiBuildContext osgiBuildContext = new OSGiBuildContext(environment, hiddenImportPackageNamePrefixes, hiddenImportPackageNames, false); osgiBuildContext.setClientModule(clientModule); if (clientModule) { osgiBuildContext.setClientArtifactResolver(getClientArtifactResolver());