You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/01/31 18:12:39 UTC
svn commit: r617161 - in /geronimo/server/trunk/framework:
configs/plugin/src/main/plan/
modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/
Author: djencks
Date: Thu Jan 31 09:12:26 2008
New Revision: 617161
URL: http://svn.apache.org/viewvc?rev=617161&view=rev
Log:
GERONIMO-3786 patch from YunFeng Ma fixing wrong attribute names in ServerInstanceData and cleaning up a previous server before starting export
Modified:
geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java
Modified: geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml?rev=617161&r1=617160&r2=617161&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/plan/plan.xml Thu Jan 31 09:12:26 2008
@@ -71,24 +71,24 @@
<gbean name="Offline" class="org.apache.geronimo.system.plugin.ServerInstanceData">
<attribute name="name">offline</attribute>
<attribute name="configFile">var/config/offline-deployer-config.xml</attribute>
- <attribute name="configSubstitutionsFileName">var/config/config-substitutions.properties</attribute>
+ <attribute name="configSubstitutionsFile">var/config/config-substitutions.properties</attribute>
<attribute name="configSubstitutionsPrefix">org.apache.geronimo.config.substitution.</attribute>
- <attribute name="artifactAliasesFileName">var/config/artifact_aliases.properties</attribute>
+ <attribute name="artifactAliasesFile">var/config/artifact_aliases.properties</attribute>
</gbean>
<gbean name="Client" class="org.apache.geronimo.system.plugin.ServerInstanceData">
<attribute name="name">client</attribute>
<attribute name="attributeManagerFrom">default</attribute>
- <attribute name="artifactAliasesFileName">var/config/client_artifact_aliases.properties</attribute>
+ <attribute name="artifactAliasesFile">var/config/client_artifact_aliases.properties</attribute>
<dependency><name>DefaultServer</name></dependency>
</gbean>
<gbean name="Jsr88" class="org.apache.geronimo.system.plugin.ServerInstanceData">
<attribute name="name">jsr88</attribute>
<attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
- <attribute name="configSubstitutionsFileName">var/config/config-substitutions.properties</attribute>
+ <attribute name="configSubstitutionsFile">var/config/config-substitutions.properties</attribute>
<attribute name="configSubstitutionsPrefix">org.apache.geronimo.config.substitution.</attribute>
- <attribute name="artifactAliasesFileName">var/config/artifact_aliases.properties</attribute>
+ <attribute name="artifactAliasesFile">var/config/artifact_aliases.properties</attribute>
</gbean>
<gbean name="DownloadedPluginRepos" class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=617161&r1=617160&r2=617161&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Thu Jan 31 09:12:26 2008
@@ -318,14 +318,18 @@
*/
public DownloadResults installPluginList(String targetRepositoryPath, String relativeTargetServerPath, PluginListType pluginList) throws Exception {
DownloadResults downloadPoller = new DownloadResults();
- String targetServerPath = serverInfo.resolveServer(relativeTargetServerPath).getAbsolutePath();
+ File targetServerPath = serverInfo.resolveServer(relativeTargetServerPath);
+ if (targetServerPath.exists()) {
+ FileUtils.forceDelete(targetServerPath);
+ }
+ String targetServerPathName = targetServerPath.getAbsolutePath();
Kernel kernel = new BasicKernel("assembly");
try {
// kernel.boot();
PluginInstallerGBean installer = new PluginInstallerGBean(
targetRepositoryPath,
- targetServerPath,
+ targetServerPathName,
serverInstanceDatas,
kernel,
classLoader);
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java?rev=617161&r1=617160&r2=617161&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/ServerInstanceData.java Thu Jan 31 09:12:26 2008
@@ -41,9 +41,9 @@
private String name;
private String attributeManagerFrom;
private String configFile = "var/config/config.xml";
- private String configSubstitutionsFileName = "var/config/config-substitutions.properties";
+ private String configSubstitutionsFile = "var/config/config-substitutions.properties";
private String configSubstitutionsPrefix = "org.apache.geronimo.config.substitution.";
- private String artifactAliasesFileName = "var/config/artifact_aliases.properties";
+ private String artifactAliasesFile = "var/config/artifact_aliases.properties";
public String getName() {
@@ -72,11 +72,11 @@
}
public String getConfigSubstitutionsFile() {
- return configSubstitutionsFileName;
+ return configSubstitutionsFile;
}
- public void setConfigSubstitutionsFile(String configSubstitutionsFileName) {
- this.configSubstitutionsFileName = configSubstitutionsFileName;
+ public void setConfigSubstitutionsFile(String configSubstitutionsFile) {
+ this.configSubstitutionsFile = configSubstitutionsFile;
}
public String getConfigSubstitutionsPrefix() {
@@ -88,11 +88,11 @@
}
public String getArtifactAliasesFile() {
- return artifactAliasesFileName;
+ return artifactAliasesFile;
}
- public void setArtifactAliasesFile(String artifactAliasesFileName) {
- this.artifactAliasesFileName = artifactAliasesFileName;
+ public void setArtifactAliasesFile(String artifactAliasesFile) {
+ this.artifactAliasesFile = artifactAliasesFile;
}
public ServerInstance getServerInstance(ArtifactManager artifactManager, ListableRepository targetRepo, ServerInfo serverInfo, Map<String, org.apache.geronimo.system.plugin.ServerInstance> serverInstances, boolean live) throws IOException {
@@ -139,9 +139,9 @@
infoFactory.addAttribute("name", String.class, true, true);
infoFactory.addAttribute("attributeManagerFrom", String.class, true, true);
infoFactory.addAttribute("configFile", String.class, true, true);
- infoFactory.addAttribute("configSubstitutionsFileName", String.class, true, true);
+ infoFactory.addAttribute("configSubstitutionsFile", String.class, true, true);
infoFactory.addAttribute("configSubstitutionsPrefix", String.class, true, true);
- infoFactory.addAttribute("artifactAliasesFileName", String.class, true, true);
+ infoFactory.addAttribute("artifactAliasesFile", String.class, true, true);
GBEAN_INFO = infoFactory.getBeanInfo();
}