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/05/09 07:38:07 UTC
cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl BlockURLConnection.java DefaultApplianceRepository.java
mcconnell 2003/05/08 22:38:07
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
BlockURLConnection.java
DefaultApplianceRepository.java
Log:
Updated url resolution to only return a proxy to the underlying container.
Revision Changes Path
1.3 +1 -10 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/BlockURLConnection.java
Index: BlockURLConnection.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/BlockURLConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockURLConnection.java 27 Apr 2003 09:28:48 -0000 1.2
+++ BlockURLConnection.java 9 May 2003 05:38:07 -0000 1.3
@@ -142,17 +142,8 @@
*/
public Object getContent( Class[] classes ) throws IOException
{
- Appliance appliance = m_repository.resolve( m_url.getPath() );
+ Appliance appliance = m_repository.resolveAppliance( m_url.getPath() );
final String ref = m_url.getRef();
- if( ref == null )
- {
- return appliance;
- }
-
- //
- // otherwise resolve the service relative to the #ref
- //
-
try
{
return appliance.resolve( m_url, ref );
1.2 +3 -3 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceRepository.java
Index: DefaultApplianceRepository.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultApplianceRepository.java 26 Apr 2003 12:37:43 -0000 1.1
+++ DefaultApplianceRepository.java 9 May 2003 05:38:07 -0000 1.2
@@ -407,7 +407,7 @@
* Return an appliance relative to the supplied path.
* @param uri the appliance path
*/
- public Appliance resolve( String uri )
+ public Appliance resolveAppliance( String uri )
{
if( !uri.startsWith( m_url.getPath() ) )
{
@@ -430,7 +430,7 @@
{
if( appliance instanceof ApplianceResolver )
{
- return ((ApplianceResolver)appliance).resolve( uri );
+ return ((ApplianceResolver)appliance).resolveAppliance( uri );
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org