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 2006/11/07 20:23:31 UTC
svn commit: r472213 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/
configs/client-system/src/plan/
Author: djencks
Date: Tue Nov 7 11:23:30 2006
New Revision: 472213
URL: http://svn.apache.org/viewvc?view=rev&rev=472213
Log:
GERONIMO-2409 add a client_artifact_aliases file so the client can swap versions too
Added:
geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/
geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/config/client_artifact_aliases.properties
- copied unchanged from r472181, geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties
Modified:
geronimo/server/trunk/configs/client-system/src/plan/plan.xml
Modified: geronimo/server/trunk/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/src/plan/plan.xml?view=diff&rev=472213&r1=472212&r2=472213
==============================================================================
--- geronimo/server/trunk/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-system/src/plan/plan.xml Tue Nov 7 11:23:30 2006
@@ -23,59 +23,61 @@
<!--Repository-->
<gbean name="Repository" class="org.apache.geronimo.system.repository.Maven2Repository">
- <attribute name="root">repository/</attribute>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
+ <attribute name="root">repository/</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
</gbean>
<!--Configuration Store service-->
<gbean name="Local" class="org.apache.geronimo.system.configuration.RepositoryConfigurationStore">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
+ <reference name="Repository">
+ <name>Repository</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="configFile">var/config/config.xml</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ <attribute name="configFile">var/config/config.xml</attribute>
</gbean>
<!-- ArtifactManager -->
<gbean name="ArtifactManager" class="org.apache.geronimo.kernel.repository.DefaultArtifactManager"/>
<!-- ArtifactResolver -->
- <gbean name="ArtifactResolver" class="org.apache.geronimo.kernel.repository.DefaultArtifactResolver">
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="Repositories">
- <!--<gbean-name>*:name=Repository,*</gbean-name>-->
- </reference>
+ <gbean name="ArtifactResolver" class="org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver">
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="Repositories"></reference>
+ <attribute name="versionMapLocation">var/config/client_artifact_aliases.properties</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
</gbean>
<!--Configuration Manager service-->
<gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
- <reference name="Repositories">
- </reference>
- <reference name="Stores">
- </reference>
- <reference name="AttributeStore">
- <name>AttributeManager</name>
- </reference>
- <reference name="PersistentConfigurationList">
- <type>AttributeStore</type>
- <name>AttributeManager</name>
- </reference>
- <reference name="ArtifactManager">
- <name>ArtifactManager</name>
- </reference>
- <reference name="ArtifactResolver">
- <name>ArtifactResolver</name>
- </reference>
+ <reference name="Repositories">
+ </reference>
+ <reference name="Stores">
+ </reference>
+ <reference name="AttributeStore">
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="PersistentConfigurationList">
+ <type>AttributeStore</type>
+ <name>AttributeManager</name>
+ </reference>
+ <reference name="ArtifactManager">
+ <name>ArtifactManager</name>
+ </reference>
+ <reference name="ArtifactResolver">
+ <name>ArtifactResolver</name>
+ </reference>
</gbean>
<!-- Logging service -->