You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/16 20:40:37 UTC
svn commit: r668258 - in /geronimo/server/trunk/framework:
configs/jsr88-deploymentfactory/ configs/online-deployer/
configs/online-deployer/src/main/plan/
modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/
Author: gawor
Date: Mon Jun 16 11:40:37 2008
New Revision: 668258
URL: http://svn.apache.org/viewvc?rev=668258&view=rev
Log:
fixes for offline deployment (GERONIMO-4072)
Modified:
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=668258&r1=668257&r2=668258&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Mon Jun 16 11:40:37 2008
@@ -184,7 +184,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content server="jsr88"/>
+ <config-xml-content server="jsr88" load="false"/>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=668258&r1=668257&r2=668258&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Mon Jun 16 11:40:37 2008
@@ -62,29 +62,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml?rev=668258&r1=668257&r2=668258&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml Mon Jun 16 11:40:37 2008
@@ -48,11 +48,24 @@
</reference>
<reference name="Repositories"></reference>
<attribute name="versionMapLocation">var/config/artifact_aliases.properties</attribute>
+ <attribute name="additionalAliases">
+ org.apache.geronimo.framework/j2ee-system//car=org.apache.geronimo.framework/online-deployer/${version}/car
+ org.apache.geronimo.framework/j2ee-system/${version}/car=org.apache.geronimo.framework/online-deployer/${version}/car
+ </attribute>
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
</gbean>
+ <!--User-editable attribute service-->
+ <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <attribute name="readOnly">true</attribute>
+ <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
+ </gbean>
+
<!--Server attribute service-->
<gbean name="ServerAttributeManager" class="org.apache.geronimo.system.configuration.SwitchableLocalAttributeManager">
<reference name="ServerInfo">
@@ -99,29 +112,4 @@
</reference>
</gbean>
- <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" >
- <reference name="DeploymentFactory">
- <name>DeploymentFactory</name>
- </reference>
- </gbean>
-
- <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
-
- <gbean name="ModuleConfigurerRegistry" class="org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager">
- <references name="ModuleConfigurers">
- <pattern>
- <name>ClientConfigurer</name>
- </pattern>
- <pattern>
- <name>EARConfigurer</name>
- </pattern>
- <pattern>
- <name>RARConfigurer</name>
- </pattern>
- <pattern>
- <name>WARConfigurer</name>
- </pattern>
- </references>
- </gbean>
-
</module>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=668258&r1=668257&r2=668258&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Mon Jun 16 11:40:37 2008
@@ -49,10 +49,18 @@
private final ServerInfo serverInfo;
public ExplicitDefaultArtifactResolver(String versionMapLocation,
+ ArtifactManager artifactManager,
+ Collection<? extends ListableRepository> repositories,
+ ServerInfo serverInfo ) throws IOException {
+ this(versionMapLocation, artifactManager, repositories, null, serverInfo);
+ }
+
+ public ExplicitDefaultArtifactResolver(String versionMapLocation,
ArtifactManager artifactManager,
Collection<? extends ListableRepository> repositories,
+ Map<String, String> additionalAliases,
ServerInfo serverInfo ) throws IOException {
- super(artifactManager, repositories, buildExplicitResolution(versionMapLocation, serverInfo));
+ super(artifactManager, repositories, buildExplicitResolution(versionMapLocation, additionalAliases, serverInfo));
this.artifactAliasesFile = versionMapLocation;
this.serverInfo = serverInfo;
}
@@ -62,7 +70,7 @@
return artifactAliasesFile;
}
- private static Map<Artifact, Artifact> buildExplicitResolution(String versionMapLocation, ServerInfo serverInfo) throws IOException {
+ private static Map<Artifact, Artifact> buildExplicitResolution(String versionMapLocation, Map<String, String> additionalAliases, ServerInfo serverInfo) throws IOException {
if (versionMapLocation == null) {
return null;
}
@@ -76,6 +84,9 @@
in.close();
}
}
+ if (additionalAliases != null) {
+ properties.putAll(additionalAliases);
+ }
return propertiesToArtifactMap(properties);
}
@@ -136,6 +147,7 @@
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ExplicitDefaultArtifactResolver.class, "ArtifactResolver");
infoFactory.addAttribute("versionMapLocation", String.class, true, true);
+ infoFactory.addAttribute("additionalAliases", Map.class, true, true);
infoFactory.addReference("ArtifactManager", ArtifactManager.class, "ArtifactManager");
infoFactory.addReference("Repositories", ListableRepository.class, "Repository");
infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
@@ -145,6 +157,7 @@
"versionMapLocation",
"ArtifactManager",
"Repositories",
+ "additionalAliases",
"ServerInfo"
});