You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/04 00:14:07 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello navigation.xml
mcconnell 2003/04/03 14:14:07
Modified: merlin project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/appliance
ContextBuilder.java DefaultAppliance.java
merlin/merlin-core/src/test/org/apache/avalon/playground
StandardContext.java StandardContext.xservice
merlin/merlin-smp project.xml
merlin/merlin-smp/xdocs/starting/hello navigation.xml
Log:
Documentation updates and code updates to bring partition context key into line with other keys.
Revision Changes Path
1.6 +1 -1 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 2 Apr 2003 21:57:58 -0000 1.5
+++ project.xml 3 Apr 2003 22:14:06 -0000 1.6
@@ -11,7 +11,7 @@
<organization>
<name>Apache Software Foundation</name>
<url>http://avalon.apache.org/</url>
- <logo>/images/apache-avalon-logo.png</logo>
+ <logo>http://avalon.apache.org/images/apache-avalon-logo.png</logo>
</organization>
<inceptionYear>1997</inceptionYear>
1.3 +20 -5 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ContextBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextBuilder.java 17 Mar 2003 02:47:53 -0000 1.2
+++ ContextBuilder.java 3 Apr 2003 22:14:06 -0000 1.3
@@ -115,10 +115,22 @@
//
Map map = new HashMap();
+
+ //
+ // Phoenix legacy support
+ //
+
map.put( "app.name", context.get( "urn:avalon:name" ) );
map.put( "app.home", context.get( "urn:avalon:home" ) );
+
+ //
+ // Merlin standard entries
+ //
+
map.put( "urn:avalon:name", context.get( "urn:avalon:name" ) );
map.put( "urn:avalon:home", context.get( "urn:avalon:home" ) );
+ map.put( "urn:avalon:work", context.get( "urn:avalon:work" ) );
+ map.put( "urn:avalon:partition", context.get( "urn:avalon:partition" ) );
//
// get the entries declared by the context descriptor plus and
@@ -167,7 +179,8 @@
if( entry.isRequired() )
{
final String error =
- "Import directive for key: " + key + " via name: " + name
+ "Import directive for key: "
+ + key + " via name: " + name
+ " cannot be resolved.";
throw new ContextException( error );
}
@@ -235,9 +248,11 @@
else
{
final String error =
- "Object resolved for the key '" + key + "' of class '"
- + object.getClass().getName() + "' does not implement the type '"
- + entry.getType();
+ "Object resolved for the key '"
+ + key + "' of class '"
+ + object.getClass().getName()
+ + "' does not implement the type '"
+ + entry.getType();
throw new ContextException( error );
}
}
1.5 +2 -2 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAppliance.java 31 Mar 2003 18:52:22 -0000 1.4
+++ DefaultAppliance.java 3 Apr 2003 22:14:06 -0000 1.5
@@ -668,7 +668,7 @@
//
map.put( "urn:avalon:name", m_name );
- map.put( "urn:avalon:partition.name", getURL().getPath() );
+ map.put( "urn:avalon:partition", getURL().getPath() );
//
// setup the home and working directory for the components but don't
1.2 +1 -1 avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardContext.java 13 Mar 2003 01:05:21 -0000 1.1
+++ StandardContext.java 3 Apr 2003 22:14:06 -0000 1.2
@@ -67,7 +67,7 @@
public interface StandardContext extends Context
{
public static final String NAME_KEY = "urn:avalon:name";
- public static final String PARTITION_KEY = "urn:avalon:partition.name";
+ public static final String PARTITION_KEY = "urn:avalon:partition";
public static final String WORKING_KEY = "urn:avalon:work";
public static final String HOME_KEY = "urn:avalon:home";
1.2 +1 -1 avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContext.xservice
Index: StandardContext.xservice
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContext.xservice,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardContext.xservice 13 Mar 2003 01:05:21 -0000 1.1
+++ StandardContext.xservice 3 Apr 2003 22:14:06 -0000 1.2
@@ -17,7 +17,7 @@
<version>1.0</version>
<entries>
<entry key="urn:avalon:name"/>
- <entry key="urn:avalon:partition.name"/>
+ <entry key="urn:avalon:partition"/>
<entry key="urn:avalon:home" type="java.io.File"/>
<entry key="urn:avalon:work" type="java.io.File"/>
</entries>
1.4 +0 -1 avalon-sandbox/merlin/merlin-smp/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 2 Apr 2003 15:54:13 -0000 1.3
+++ project.xml 3 Apr 2003 22:14:07 -0000 1.4
@@ -109,7 +109,6 @@
<report>maven-changelog-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-developer-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
</reports>
</project>
1.3 +3 -3 avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 2 Apr 2003 21:58:00 -0000 1.2
+++ navigation.xml 3 Apr 2003 22:14:07 -0000 1.3
@@ -17,9 +17,9 @@
<item name="Hello Block" href="/starting/hello/creation.html"/>
<item name="Running Hello" href="/starting/hello/execution.html"/>
<item name="Behind the Scenes" href="/starting/hello/internal.html"/>
- <item name="Managing Configurations" href="/starting/hello/config.html"/>
- <item name="Managing Contextualization" href="/starting/hello/context.html"/>
- <item name="Managing Dependencies" href="/starting/hello/dependencies.html"/>
+ <item name="Configurations" href="/starting/hello/config.html"/>
+ <item name="Contextualization" href="/starting/hello/context/index.html"/>
+ <item name="Dependencies" href="/starting/hello/dependencies.html"/>
<item name="Publishing Services" href="/starting/hello/services.html"/>
</item>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org