mcconnell 2004/03/17 07:40:51
Modified:
cornerstone/sockets/impl/src/java/org/apache/avalon/cornerstone/blocks/sockets
SSLFactoryBuilder.java
cornerstone/store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore
AbstractFileRepository.java RepositoryManager.java
. maven.xml
Log:
Add missing context entry dependency declarations.
Revision Changes Path
1.2 +9 -1
avalon-components/cornerstone/sockets/impl/src/java/org/apache/avalon/cornerstone/blocks/sockets/SSLFactoryBuilder.java
Index: SSLFactoryBuilder.java
===================================================================
RCS file:
/home/cvs/avalon-components/cornerstone/sockets/impl/src/java/org/apache/avalon/cornerstone/blocks/sockets/SSLFactoryBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSLFactoryBuilder.java 15 Mar 2004 17:16:03 -0000 1.1
+++ SSLFactoryBuilder.java 17 Mar 2004 15:40:51 -0000 1.2
@@ -92,10 +92,18 @@
/**
* Requires a BlockContext. We'll see how we end up expressing
* these dependencies.
+ * @avalon.entry key="urn:avalon:home"
*/
public void contextualize( final Context context ) throws ContextException
{
- m_baseDirectory = (File)context.get( "app.home" );
+ try
+ {
+ m_baseDirectory = (File) context.get( "urn:avalon:home" );
+ }
+ catch( ContextException ce )
+ {
+ m_baseDirectory = (File)context.get( "app.home" );
+ }
}
public void configure( final Configuration configuration )
1.2 +1 -1
avalon-components/cornerstone/store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java
Index: AbstractFileRepository.java
===================================================================
RCS file:
/home/cvs/avalon-components/cornerstone/store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractFileRepository.java 15 Mar 2004 15:42:05 -0000 1.1
+++ AbstractFileRepository.java 17 Mar 2004 15:40:51 -0000 1.2
@@ -73,7 +73,7 @@
* which the working home directory will be provided.
*
* @param context the supplied context object
- * @avalon.context key="urn:avalon:home" type="java.io.File"
+ * @avalon.entry key="urn:avalon:home" type="java.io.File"
*/
public void contextualize( final Context context ) throws ContextException
{
1.3 +3 -0
avalon-components/cornerstone/store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file:
/home/cvs/avalon-components/cornerstone/store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore/RepositoryManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryManager.java 15 Mar 2004 16:38:55 -0000 1.2
+++ RepositoryManager.java 17 Mar 2004 15:40:51 -0000 1.3
@@ -53,6 +53,9 @@
protected ServiceManager m_serviceManager;
protected Context m_context;
+ /**
+ * @avalon.entry key="urn:avalon:home" type="java.io.File"
+ */
public void contextualize( final Context context )
{
m_context = context;
1.6 +1 -1 avalon-components/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 24 Aug 2003 12:54:51 -0000 1.5
+++ maven.xml 17 Mar 2004 15:40:51 -0000 1.6
@@ -12,7 +12,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="site/*"
+ excludes="project.xml,site/*"
goals="jar:install-snapshot"
banner="Installing:"
ignoreFailures="false" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
