cvs@avalon.apache.org Archives

=?iso-8859-1?q?=5BApache_Avalon_Wiki=5D_Updated=3A__FrontPage?=

2004-12-07T15:19:45Z

   Date: 2004-12-07T07:19:45
   Editor: AaronFarr 
   Wiki: Apache Avalon Wiki
   Page: FrontPage
   URL: http://wiki.apache.org/avalon/FrontPage

   adding Avalon Closed notice -farra

Change Log:

------------------------------------------------------------------------------
@@ -1,6 +1,14 @@
 ##language:en
 #pragma section-numbers off
 
+== Apache Avalon has closed ==
+
+Apache Avalon has closed.  Please see http://avalon.apache.org/closed.html for more information.
+
+This wiki contains historical data but is no longer editable.
+
+----
+
 || http://avalon.apache.org/images/avalon-platform.png || ''This is the wiki for the [http://www.apache.org/
Apache] [http://avalon.apache.org/ Avalon] project. This wiki is a community wiki and the
entire Avalon community is invited to help maintain it. Feel free to change any part of this
wiki if you think it improves things. In particular, we'd very much appreciate it if you help
document the answers to questions asked on the mailing list on the FrequentlyAskedQuestions
page. Notifications of all changes you make will be sent to the avalon site-cvs mailing list,
so we'll be aware of your changes and we'll happily correct any small mistakes you may make!''
||
 
   * [wiki:FrequentlyAskedQuestions Avalon FAQ] 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: r104063 - in avalon/trunk/central/site/src/xdocs/central/laboratory/castle: dynamicproxy managedextensions microkernel

2004-11-19T04:51:46Z

Author: hammett
Date: Thu Nov 18 20:51:44 2004
New Revision: 104063

Modified:
   avalon/trunk/central/site/src/xdocs/central/laboratory/castle/dynamicproxy/index.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/castle/managedextensions/index.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/castle/microkernel/index.xml
Log:


Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/castle/dynamicproxy/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/castle/dynamicproxy/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/castle/dynamicproxy/index.xml	Thu
Nov 18 20:51:44 2004
@@ -32,114 +32,8 @@
     intrusive as it forces one to extend MarshalByRefObject or ContextBoundObject. 
     
     
-    You can use DynamicProxy to generate proxies on the fly for one or more interfaces
-    (supporting concrete classes is on the plans as well)
+    The DynamicProxy has moved to http://www.castleproject.org
     
-  
-
-  
-    
-    The lastest version of source can be obtained from 
-    Avalon
Subversion repository.
-    
-  
-
-  
-    
-    The DynamicProxy relies on Reflection.Emit to generate new classes that implements
-    the specified interfaces and delegates to your implementation of IInvocationHandler.
-    The usage is very simple. You only need to invoke ProxyGenerator.CreateProxy
-    specifying the interfaces that will be behind the proxy and your implementation of 
-    IInvocationHandler:
-    
-
-using Apache.Avalon.DynamicProxy;
-
-public interface IMyInterface
-{
-	String Name
-	{
-		get;
-		set;
-	}
-
-	void DoSomething(int x, int y);
-}
-
-public class YourProxyInvocationHandler : IInvocationHandler
-{
-	public object Invoke(object proxy, MethodInfo method, params object[] arguments)
-	{
-		// do something before
-
- 		object returnVal = method.Invoke( realInstance, arguments );
-
-		// do something after...
-
-		return returnVal;
-	}
-}
-
-object proxy = ProxyGenerator.CreateProxy( 
-	typeof(IMyInterface), 
-	new YourProxyInvocationHandler( new MyInterfaceImpl() ) );
-
-// proxy can be safely casted to IMyInterface
-
-IMyInterface inter = proxy as IMyInterface;
-
-
-    
-    You can also overrides the implementation of StandardInvocationHandler.
-    
-
-public class YourProxyInvocationHandler : StandardInvocationHandler
-{
-	protected override void PreInvoke(object proxy, 
-		MethodInfo method, params object[] arguments)
-	{
-	}
-
-	protected override void PostInvoke(object proxy, 
-		MethodInfo method, ref object returnValue, params object[] arguments)
-	{
-	}
-}
-
-
-     
-      
-      If you'd like to learn more about proxies in .Net and other similar solutions
-      to generate proxies on the fly, please follow these links:
-      
-      
-        
-         Dynamic
Proxies in .NET:
-         Discussions and explanation about the possibilities of proxies.
-        
-        
-        Java
like proxies in .Net:
-         Explanation of the problems which leaded to development of Avalon DynamicProxy.
-        
-      
-     
-
-     
-       
-         
-           Stefan Zobel - for his suggestion of using ldtoken
-         
-         
-           SpringFramework.Net
-           guys - for their interest and willingness to help
-         
-         
-           AspectSharp project
-           - for sticking with it
-         
-       
-     
-
   
 
   

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/castle/managedextensions/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/castle/managedextensions/index.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/castle/managedextensions/index.xml
Thu Nov 18 20:51:44 2004
@@ -27,125 +27,12 @@
 
   
     
-    ManagedExtensions is an attempt to give management capabilities to applications. 
+    Management Extensions is an attempt to give management capabilities to applications.

     Its relation to Castle Container is yet to be developed.
     
     
-    Basically you have to approaches to choose: the server approach and the passive 
-    approach.
+    The Management Extensions has moved to http://www.castleproject.org
     
-  
-
-  
-    
-    If your application will be used to host others components, then you 
-    may build it as a server application. Just create a MServer concrete instance
-    and register your managed components on it (or use it to create your components 
-    instances)
-    
-
-using Apache.Avalon.Castle.ManagementExtensions;
-
-
-bool createNewAppDomain = false;
-MServer server = MServerFactory.CreateServer("logicaldomainname", createNewAppDomain);
-
-
-
-  
-  After setting up a MServer instance you can use it to register component instances, 
-  or create instances from it:
-  
-
-/// 
-/// Registers the specified managed object instance.
-/// 
-/// If domain name is not found.
-ManagedInstance RegisterManagedObject(Object instance, ManagedObjectName name);
-
-/// 
-/// Instantiates the specified type using the server domain.
-/// 
-Object Instantiate(String assemblyName, String typeName);
-
-  
-
-  
-  
-  To expose your components as managed components you have two choices:
-  

-    
-    Use the ManagedComponent attribute
-    
-    
-    Implement the MDynamicSupport interface
-    
-  
-  
-
-using Apache.Avalon.Castle.ManagementExtensions;
-
-[ManagedComponent]
-public class DummyHttpServer
-{
-	protected bool started = false;
-
-	public DummyHttpServer()
-	{
-	}
-
-	[ManagedAttribute]
-	public bool Started
-	{
-		get
-		{
-			return started;
-		}
-		set
-		{
-			started = value;
-		}
-	}
-
-	[ManagedOperation]
-	public void Start()
-	{
-		Started = true;
-	}
-
-	[ManagedOperation]
-	public void StartAt(int time)
-	{
-	}
-
-	[ManagedOperation]
-	public void Stop()
-	{
-		Started = false;
-	}
-}
-
-  
-
-  
-    
-    The lastest version of source can be obtained from 
-    Avalon
Subversion repository 
-    (Test cases can be found here).
-    
-  
-
-  
-    
-    If you'd like to learn more about Managed Extensions, please refer to:
-    
-    
-      
-      
-        Management Extensions for .Net:
-        Full explanation of what driven the development of Castle Managed Extensions.
-      
-    
   
 
   

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/castle/microkernel/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/castle/microkernel/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/castle/microkernel/index.xml	Thu
Nov 18 20:51:44 2004
@@ -31,31 +31,9 @@
     a port of Avalon, it benefits from several features offered by the
     CLR.
 
-    Other important difference of Castle container is its simplicity.
-    Based on Microkernel pattern, the user can easily modify, extend or
-    adapt it to match his requirements. No hard contracts, no obligations.
-    Just good and old Inversion of Control and stills Avalon.
-  
-
-  
     
-    There are plenty of documents, articles and blog entries about .Net and proxies, 
-    its benefits, its cons and its differences when compared to java implementation.
+    Castle has moved to http://www.castleproject.org
     
-     
-      
-        
-         Developing With Avalon:
-         An excellent white paper on the Avalon framework.
-         Recommended reading!
-        
-        
-        An Introduction to COP:
-         An introduction to Component Oriented Programming and the
-         core Avalon Framework.
-        
-      
-     
   
 
   

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: r104062 - in avalon/site/central/laboratory/castle: . dynamicproxy managedextensions microkernel

2004-11-19T04:46:18Z

Author: hammett
Date: Thu Nov 18 20:46:16 2004
New Revision: 104062

Modified:
   avalon/site/central/laboratory/castle/dynamicproxy/index.html
   avalon/site/central/laboratory/castle/index.html
   avalon/site/central/laboratory/castle/managedextensions/index.html
   avalon/site/central/laboratory/castle/microkernel/index.html
Log:


Modified: avalon/site/central/laboratory/castle/dynamicproxy/index.html
==============================================================================
--- avalon/site/central/laboratory/castle/dynamicproxy/index.html	(original)
+++ avalon/site/central/laboratory/castle/dynamicproxy/index.html	Thu Nov 18 20:46:16 2004
@@ -1,124 +1,16 @@
-
-
-Avalon Castle -
DynamicProxy Avalon
Avalon Castle - DynamicProxy 

-        Home
-      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy

-
-  The project
-    
-    The DynamicProxy project was created to overcome the CLR's proxy (in)capabilities. 
-    There are proxies in the CLR world, but they can be considered a bit
-    intrusive as it forces one to extend MarshalByRefObject or ContextBoundObject. 
-    
-    
-    You can use DynamicProxy to generate proxies on the fly for one or more interfaces
-    (supporting concrete classes is on the plans as well)
-    
-  
-
-  Source code
-    
-    The lastest version of source can be obtained from 
-    Avalon
Subversion repository.
-    
-  
-
-  Usage
-    
-    The DynamicProxy relies on Reflection.Emit to generate new classes that implements
-    the specified interfaces and delegates to your implementation of IInvocationHandler.
-    The usage is very simple. You only need to invoke ProxyGenerator.CreateProxy
-    specifying the interfaces that will be behind the proxy and your implementation of 
-    IInvocationHandler:
-    
--using Apache.Avalon.DynamicProxy;
-
-public interface IMyInterface
-{
-	String Name
-	{
-		get;
-		set;
-	}
-
-	void DoSomething(int x, int y);
-}
-
-public class YourProxyInvocationHandler : IInvocationHandler
-{
-	public object Invoke(object proxy, MethodInfo method, params object[] arguments)
-	{
-		// do something before
-
- 		object returnVal = method.Invoke( realInstance, arguments );
-
-		// do something after...
-
-		return returnVal;
-	}
-}
-
-object proxy = ProxyGenerator.CreateProxy( 
-	typeof(IMyInterface), 
-	new YourProxyInvocationHandler( new MyInterfaceImpl() ) );
-
-// proxy can be safely casted to IMyInterface
-
-IMyInterface inter = proxy as IMyInterface;
-
-

-    
-    You can also overrides the implementation of StandardInvocationHandler.
-    
--public class YourProxyInvocationHandler : StandardInvocationHandler
-{
-	protected override void PreInvoke(object proxy, 
-		MethodInfo method, params object[] arguments)
-	{
-	}
-
-	protected override void PostInvoke(object proxy, 
-		MethodInfo method, ref object returnValue, params object[] arguments)
-	{
-	}
-}
-

-
-     Useful links
-      
-      If you'd like to learn more about proxies in .Net and other similar solutions
-      to generate proxies on the fly, please follow these links:
-      
-      
-        
-         Dynamic
Proxies in .NET:
-         Discussions and explanation about the possibilities of proxies.
-        
-        
-        Java
like proxies in .Net:
-         Explanation of the problems which leaded to development of Avalon DynamicProxy.
-        
-      
-     
-
-     Thanks to
-       
-         
-           Stefan Zobel - for his suggestion of using ldtoken
-         
-         
-           SpringFramework.Net
-           guys - for their interest and willingness to help
-         
-         
-           AspectSharp
project
-           - for sticking with it
-         
-       
-     
-
-  
-
+
+
+Avalon Castle -
DynamicProxy Avalon
Avalon Castle - DynamicProxy 

+        Home
+      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy

+
+  The project
+    
+    The DynamicProxy project was created to overcome the CLR's proxy (in)capabilities. 
+    There are proxies in the CLR world, but they can be considered a bit
+    intrusive as it forces one to extend MarshalByRefObject or ContextBoundObject. 
+    
+    DynamicProxy has moved to http://www.castleproject.org
+  
+
   
Copyright 2004, The
Apache Software Foundation All rights reserved.

Modified: avalon/site/central/laboratory/castle/index.html
==============================================================================
--- avalon/site/central/laboratory/castle/index.html	(original)
+++ avalon/site/central/laboratory/castle/index.html	Thu Nov 18 20:46:16 2004
@@ -1,42 +1,15 @@
-
-
-Avalon Castle Container Avalon
Avalon
Castle Container 

-        Home
-      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy
ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy

-
-  A container for CLI
-    Avalon Castle is a lightweight
-    container for the CLI (.Net and Mono) world. Although it can be viewed as
-    a port of Avalon, it benefits from several features offered by the
-    CLR.
-
-    Other important difference of Castle container is its simplicity.
-    Based on Microkernel pattern, the user can easily modify, extend or
-    adapt it to match his requirements. No hard contracts, no obligations.
-    Just good and old Inversion of Control and stills Avalon.
-  
-
-  Microkernel
-    
-    The Microkernel pattern allowed us to focus on a simple set of classes
-    which constitutes the environment for managed components.
-    
-  
-
-  DynamicProxy
-    
-    To overcome some limitations of CLR we had to develop common tools used 
-    by Avalon Castle. DynamicProxy is a simple implementation that act as the 
-    Java proxies - through Invocation handlers.
-    
-  
-
-  ManagedExtensions
-    
-    If one needs a more powerfull container, allowing him to managed his components 
-    through some remote interface, he can use the managed extensions. 
-    In fact the ManagedExtensions can be viewed as a port of JMX for CLI.
-    
-  
-
+
+
+Avalon Castle Container Avalon
Avalon
Castle Container 

+        Home
+      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy
ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy

+
+  A container for CLI
+    Avalon Castle is a lightweight
+    container for the CLI (.Net and Mono) world. Although it can be viewed as
+    a port of Avalon, it benefits from several features offered by the
+    CLR.
+
+    Castle has moved to http://www.castleproject.org
+
   
Copyright 2004, The
Apache Software Foundation All rights reserved.

Modified: avalon/site/central/laboratory/castle/managedextensions/index.html
==============================================================================
--- avalon/site/central/laboratory/castle/managedextensions/index.html	(original)
+++ avalon/site/central/laboratory/castle/managedextensions/index.html	Thu Nov 18 20:46:16
2004
@@ -1,130 +1,16 @@
-
-
-Avalon Castle -
Managed Extensions Avalon
Avalon Castle - Managed Extensions 

-        Home
-      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy
LifecycleRemotingInvokers

-
-  The project
-    
-    ManagedExtensions is an attempt to give management capabilities to applications. 
-    Its relation to Castle Container is yet to be developed.
-    
-    
-    Basically you have to approaches to choose: the server approach and the passive 
-    approach.
-    
-  
-
-  Building a server
-    
-    If your application will be used to host others components, then you 
-    may build it as a server application. Just create a MServer concrete instance
-    and register your managed components on it (or use it to create your components 
-    instances)
-    
--using Apache.Avalon.Castle.ManagementExtensions;
-
-
-bool createNewAppDomain = false;
-MServer server = MServerFactory.CreateServer("logicaldomainname", createNewAppDomain);
-
-

-
-  
-  After setting up a MServer instance you can use it to register component instances, 
-  or create instances from it:
-  
--/// 
-/// Registers the specified managed object instance.
-/// 
-/// If domain name is not found.
-ManagedInstance RegisterManagedObject(Object instance, ManagedObjectName name);
-
-/// 
-/// Instantiates the specified type using the server domain.
-/// 
-Object Instantiate(String assemblyName, String typeName);
-

-  
-
-  Managed Components
-  
-  To expose your components as managed components you have two choices:
-  

-    
-    Use the ManagedComponent attribute
-    
-    
-    Implement the MDynamicSupport interface
-    
-  
-  
--using Apache.Avalon.Castle.ManagementExtensions;
-
-[ManagedComponent]
-public class DummyHttpServer
-{
-	protected bool started = false;
-
-	public DummyHttpServer()
-	{
-	}
-
-	[ManagedAttribute]
-	public bool Started
-	{
-		get
-		{
-			return started;
-		}
-		set
-		{
-			started = value;
-		}
-	}
-
-	[ManagedOperation]
-	public void Start()
-	{
-		Started = true;
-	}
-
-	[ManagedOperation]
-	public void StartAt(int time)
-	{
-	}
-
-	[ManagedOperation]
-	public void Stop()
-	{
-		Started = false;
-	}
-}
-

-  
-
-  Source code
-    
-    The lastest version of source can be obtained from 
-    Avalon
Subversion repository 
-    (Test cases can be found here).
-    
-  
-
-  Useful links
-    
-    If you'd like to learn more about Managed Extensions, please refer to:
-    
-    
-      
-      
-        Management Extensions for .Net:
-        Full explanation of what driven the development of Castle Managed Extensions.
-      
-    
-  
-
+
+
+Avalon Castle -
Managed Extensions Avalon
Avalon Castle - Managed Extensions 

+        Home
+      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy
LifecycleRemotingInvokers

+
+  The project
+    
+    Management Extensions is an attempt to give management capabilities to applications.

+    
+    Management Extensions has moved to http://www.castleproject.org
+  
+
+  
+
   
Copyright 2004, The
Apache Software Foundation All rights reserved.

Modified: avalon/site/central/laboratory/castle/microkernel/index.html
==============================================================================
--- avalon/site/central/laboratory/castle/microkernel/index.html	(original)
+++ avalon/site/central/laboratory/castle/microkernel/index.html	Thu Nov 18 20:46:16 2004
@@ -1,40 +1,17 @@
-
-
-Avalon Castle -
DynamicProxy Avalon
Avalon Castle - DynamicProxy 

-        Home
-      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy

-
-  A container for CLI
-    Avalon Castle is a lightweight
-    container for the CLI (.Net and Mono) world. Although it can be viewed as
-    a port of Avalon, it benefits from several features offered by the
-    CLR.
-
-    Other important difference of Castle container is its simplicity.
-    Based on Microkernel pattern, the user can easily modify, extend or
-    adapt it to match his requirements. No hard contracts, no obligations.
-    Just good and old Inversion of Control and stills Avalon.
-  
-
-  More references
-    
-    There are plenty of documents, articles and blog entries about .Net and proxies, 
-    its benefits, its cons and its differences when compared to java implementation.
-    
-     Useful links
-      
-        
-         Developing With Avalon:
-         An excellent white paper on the Avalon framework.
-         Recommended reading!
-        
-        
-        An Introduction to COP:
-         An introduction to Component Oriented Programming and the
-         core Avalon Framework.
-        
-      
-     
-  
-
+
+
+Avalon Castle -
DynamicProxy Avalon
Avalon Castle - DynamicProxy 

+        Home
+      PlanetProductsCentral
WelcomeCommunityConceptsResourcesDeveloper ToolsAvalon LaboratoryLegacy ContentDPML
StudioDiscoveryCastle
MicrokernelManaged ExtensionsDynamicProxy

+
+  A container for CLI
+    Avalon Castle is a lightweight
+    container for the CLI (.Net and Mono) world. Although it can be viewed as
+    a port of Avalon, it benefits from several features offered by the
+    CLR.
+
+    Castle has moved to http://www.castleproject.org
+
+  
+
   
Copyright 2004, The
Apache Software Foundation All rights reserved.

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 57568 - avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl

2004-11-13T09:30:55Z

Author: niclas
Date: Sat Nov 13 01:30:53 2004
New Revision: 57568

Modified:
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java
Log:
Resourcebase fix.

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HttpContextImpl.java
Sat Nov 13 01:30:53 2004
@@ -164,10 +164,9 @@
         
         Configuration welcomeFiles = conf.getChild( "welcome-files" );
         configureWelcomeFiles( welcomeFiles );
-        
+
         String resourceBase = conf.getChild( "resource-base").getValue( "." );
-        File rsrc = new File( resourceBase );
-        setResourceBase( rsrc.getAbsolutePath() );
+        setResourceBase( resourceBase );
         
         int maxCachedFilesize = conf.getChild( "max-cached-filesize" ).getValueAsInteger(
-1 );
         if( maxCachedFilesize > 0 )

Modified: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java
(original)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/WebApplicationContext.java
Sat Nov 13 01:30:53 2004
@@ -191,8 +191,7 @@
         configureWelcomeFiles( welcomeFiles );
         
         String resourceBase = conf.getChild( "resource-base").getValue( "." );
-        File rsrc = new File( resourceBase );
-        setResourceBase( rsrc.getAbsolutePath() );
+        setResourceBase( resourceBase );
         
         int maxCachedFilesize = conf.getChild( "max-cached-filesize" ).getValueAsInteger(
-1 );
         if( maxCachedFilesize > 0 )

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 56345 - in avalon/trunk: central/system/gump planet/cornerstone planet/facilities tools

2004-11-02T04:34:48Z

Author: niclas
Date: Mon Nov  1 20:34:48 2004
New Revision: 56345

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/planet/cornerstone/index.xml
   avalon/trunk/planet/facilities/index.xml
   avalon/trunk/tools/index.xml
Log:
Changes in Gump...

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Mon Nov  1 20:34:48 2004
@@ -1134,7 +1134,7 @@
       
         
       
-      
+      
         
       
       
@@ -1996,7 +1996,7 @@
       
         
       
-      
+      
         
       
       
@@ -2249,7 +2249,7 @@
       
         
       
-      
+      
         
       
       
@@ -3189,7 +3189,7 @@
       
         
       
-      
+      
         
       
       

Modified: avalon/trunk/planet/cornerstone/index.xml
==============================================================================
--- avalon/trunk/planet/cornerstone/index.xml	(original)
+++ avalon/trunk/planet/cornerstone/index.xml	Mon Nov  1 20:34:48 2004
@@ -21,6 +21,7 @@
     
     
       commons-logging-api
+      commons-logging
     
   
 

Modified: avalon/trunk/planet/facilities/index.xml
==============================================================================
--- avalon/trunk/planet/facilities/index.xml	(original)
+++ avalon/trunk/planet/facilities/index.xml	Mon Nov  1 20:34:48 2004
@@ -248,12 +248,9 @@
     
       commons-beanutils
       commons-beanutils
-      1.6.1
+      1.7.0
       jar
     
-    
-      commons-beanutils-core
-    
   
 
   

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Mon Nov  1 20:34:48 2004
@@ -56,7 +56,7 @@
     
       
       
-      
+      
       
       
       
@@ -84,7 +84,7 @@
   
     
       commons-beanutils
-      commons-beanutils-core
+      commons-beanutils
       1.7.0
       jar
     

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 56269 - avalon/site

2004-11-01T18:52:00Z

Author: farra
Date: Mon Nov  1 10:52:00 2004
New Revision: 56269

Modified:
   avalon/site/closed.html
Log:
added castle to the list

Modified: avalon/site/closed.html
==============================================================================
--- avalon/site/closed.html	(original)
+++ avalon/site/closed.html	Mon Nov  1 10:52:00 2004
@@ -40,9 +40,14 @@
    continues development of a micro-kernel container after the design
    of Avalon Phoenix.
 
-   Metro:DPML's Metro project
+   
Metro: DPML's Metro project
    develops the next generation of the Merlin Service Platform using
    the Open Participation Software model.
+
+   Castle: an IoC Framework
+    and Container for C# and the .NET platform.  Based on the C# Avalon
+    implementation.
+   
 
   
   

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 56255 - avalon/site

2004-11-01T17:21:28Z

Author: farra
Date: Mon Nov  1 09:21:25 2004
New Revision: 56255

Added:
   avalon/site/closed.html
Log:
sample Avalon closed message

Added: avalon/site/closed.html
==============================================================================
--- (empty file)
+++ avalon/site/closed.html	Mon Nov  1 09:21:25 2004
@@ -0,0 +1,76 @@
+
+
+ 
+  
+  Apache Avalon has closed
+  
+ 
+ 
+  
+  
+  Apache Avalon has closed.
+  
+ Apache Avalon began in 1999 as the Java Apache Server Framework and
+ in late 2002 separated from the Apache Jakarta Project to become its
+ own ASF top level project. Apache Avalon provided Java software for
+ component and container programming and pioneered the use of design
+ patterns such as Inversion of Control (IoC) and Separation of
+ Concerns (SoC).
+  
+  
+By 2004 Avalon had grown into several subprojects which have since
+separated into the following:
+  
+  
+
+   Excalibur: Apache
+    Excalibur houses the Avalon 4.x framework, the Fortress IoC
+    container, and several Avalon related components and utilities
+    such as LogKit and the Cornerstone Component Collection.
+ 
+   Loom: Codehaus Loom
+   continues development of a micro-kernel container after the design
+   of Avalon Phoenix.
+
+   Metro:DPML's Metro project
+   develops the next generation of the Merlin Service Platform using
+   the Open Participation Software model.
+
+  
+  
+While the following archived resources are still available, users and
+developers looking for Avalon software support should contact one of
+the above projects.
+  
+  
+    Downloads
+    Subversion
Repository
+    Mailing Lists
+  
+  
+  We thank all those who contributed to the Avalon project over the years.
+  
+  
+Sincerely,
+  
+  
+The Avalon Project Management Committee, 2004 
+  
+  

+  
+  
+   
+    Copyright 2004 Apache Software Foundation.
+   
+  
+ 
+
+
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 55699 - avalon/trunk/central

2004-10-27T14:34:24Z

Author: leosimons
Date: Wed Oct 27 07:34:23 2004
New Revision: 55699

Modified:
   avalon/trunk/central/KEYS
Log:
Add the new key I used to sign a few phoenix distributions that weren't properly signed

Modified: avalon/trunk/central/KEYS
==============================================================================
--- avalon/trunk/central/KEYS	(original)
+++ avalon/trunk/central/KEYS	Wed Oct 27 07:34:23 2004
@@ -183,3 +183,27 @@
 mdQ=
 =W1dp
 -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+mQGiBEF07hoRBACAgNAcJi2H1+Pzm4jMHbGCAd7q/srWHos68qNx828WmW5f3k/U
+xZEy9tStM8ZTQrsXT1UAUORdBOqlaz/H8wHGso6s15Oq9Od3yFxbqK+iGKpM4eV1
+hlbdbSrEi2d97xriztTAOKONVOpjRyPcE6+SAtUph0Ob/hsLM1JqlLx5bwCgu40L
+34q0rTtdQkwvDCSABge7oHUD/A9NM2KNLlXT4EeTDzI0BqAJ/duoiLFrZpHOT/Ij
+FR20dH6Pg9wI5o65Fs4Ppw2KWWNXDMdL67SijwH/gCevVKFg15rq/pz70VeHq4cR
+z1XqAw3YqLFDftUpEoHDLtn0QD5KZI5YBR4syoUWsRN0uRavV9ur6jlGRWBU4xma
+2JPjA/9UCQ5F556z7C7H/sH5oZD5c1puHxSz4btnj6uHZmjZdeUgJTWHTbGDiwxI
+dxLlIz9cb3g0FtkR/90PbYOPu6RywbOdCT0jpBbZm6e7ZOGXscWdl6QHPu5HtN04
+beFPahuSOaSrpzHk/oB0GaGYjmPJfjAx1j8bUytCt3VSOFzyXbYAAAAhTGVvIFNp
+bW9ucyA8bGVvc2ltb25zQGFwYWNoZS5vcmc+iFsEExECABsFAkF07hoGCwkIBwMC
+AxUCAwMWAgECHgECF4AACgkQ7dDvmoBXyye1hwCeOqeOzBEGlaOnzLZofTmXbgyC
+uuwAn0NimuvJVAgmarq1o/4teaSIcwCXuQENBEF07h0QBAD0VsgNEerQj89h5Jvf
+R/ms1oPnX0jzYn+rwuidJuKHAMGBnkFukJs0sIF5F8SjS9mB8GclYLqpOgvKMMEQ
+ybJ2l3X6BOh8C9UPaFCm2SU6m5giCr/iRTZYHWm0ob62Xzamx87ji00J6j5xNmA7
+/K3pWWWRpkHafyN1bTX8Y9T8TwAFHwQAubTgE6hSFTZIyyciBa5JUX7Na1y4X2vU
+4pM/1VZ/KHM5lrplU0k/U2aa3X8RGLOjW9MO1qTOHbHX8SeRe/q7jz4nJe6OBAg6
+T6wT+Fljd21jsDdQergPjLiftGTW1Z9XuUFv2fE7gU1r6mQhfZehb/iJkvUKgmF8
+v14pB5rwpmiIRgQYEQIABgUCQXTuHQAKCRDt0O+agFfLJ0s/AKCUvkaFQFYP58Ae
+1t2fGdFGeqvMvgCdHkOvPX3PsYizrBlpkZcsTxdCZUU=
+=kfU8
+-----END PGP PUBLIC KEY BLOCK-----

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 55458 - in avalon/trunk: central/system/gump tools

2004-10-24T19:21:51Z

Author: niclas
Date: Sun Oct 24 12:21:50 2004
New Revision: 55458

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/tools/index.xml
Log:
CHanges needed for the javamail changes.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Sun Oct 24 12:21:50 2004
@@ -37,7 +37,7 @@
       
       
       
-      
+      
         
       
       
@@ -84,7 +84,7 @@
       
       
       
-      
+      
         
       
       
@@ -118,7 +118,7 @@
       
       
       
-      
+      
         
       
       
@@ -196,7 +196,7 @@
       
       
       
-      
+      
         
       
       
@@ -241,7 +241,7 @@
       
         
       
-      
+      
         
       
       
@@ -298,7 +298,7 @@
       
       
       
-      
+      
         
       
       
@@ -335,7 +335,7 @@
       
       
       
-      
+      
         
       
       
@@ -376,7 +376,7 @@
       
       
       
-      
+      
         
       
       
@@ -412,7 +412,7 @@
       
         
       
-      
+      
         
       
       
@@ -471,7 +471,7 @@
       
       
       
-      
+      
         
       
       
@@ -559,7 +559,7 @@
       
       
       
-      
+      
         
       
       
@@ -620,7 +620,7 @@
       
       
       
-      
+      
         
       
       
@@ -693,7 +693,7 @@
       
       
       
-      
+      
         
       
       
@@ -728,7 +728,7 @@
       
       
       
-      
+      
         
       
       
@@ -794,7 +794,7 @@
       
       
       
-      
+      
         
       
       
@@ -830,7 +830,7 @@
       
       
       
-      
+      
         
       
       
@@ -868,7 +868,7 @@
       
         
       
-      
+      
         
       
       
@@ -903,7 +903,7 @@
       
       
       
-      
+      
         
       
       
@@ -951,7 +951,7 @@
       
       
       
-      
+      
         
       
       
@@ -988,7 +988,7 @@
       
         
       
-      
+      
         
       
       
@@ -1078,7 +1078,7 @@
       
       
       
-      
+      
         
       
       
@@ -1119,7 +1119,7 @@
       
         
       
-      
+      
         
       
       
@@ -1166,7 +1166,7 @@
       
       
       
-      
+      
         
       
       
@@ -1208,7 +1208,7 @@
       
       
       
-      
+      
         
       
       
@@ -1247,7 +1247,7 @@
       
       
       
-      
+      
         
       
       
@@ -1283,7 +1283,7 @@
       
       
       
-      
+      
         
       
       
@@ -1368,7 +1368,7 @@
       
       
       
-      
+      
         
       
       
@@ -1406,7 +1406,7 @@
       
         
       
-      
+      
         
       
       
@@ -1487,7 +1487,7 @@
       
       
       
-      
+      
         
       
       
@@ -1539,7 +1539,7 @@
       
       
       
-      
+      
         
       
       
@@ -1604,7 +1604,7 @@
       
       
       
-      
+      
         
       
       
@@ -1642,7 +1642,7 @@
       
       
       
-      
+      
         
       
       
@@ -1678,7 +1678,7 @@
       
       
       
-      
+      
         
       
       
@@ -1721,7 +1721,7 @@
       
         
       
-      
+      
         
       
       
@@ -1797,7 +1797,7 @@
       
       
       
-      
+      
         
       
       
@@ -1842,7 +1842,7 @@
       
       
       
-      
+      
         
       
       
@@ -1874,7 +1874,7 @@
       
       
       
-      
+      
         
       
       
@@ -1909,7 +1909,7 @@
       
       
       
-      
+      
         
       
       
@@ -1945,7 +1945,7 @@
       
         
       
-      
+      
         
       
       
@@ -2057,7 +2057,7 @@
       
       
       
-      
+      
         
       
       
@@ -2102,7 +2102,7 @@
       
       
       
-      
+      
         
       
       
@@ -2146,7 +2146,7 @@
       
       
       
-      
+      
         
       
       
@@ -2180,7 +2180,7 @@
       
       
       
-      
+      
         
       
       
@@ -2234,7 +2234,7 @@
       
         
       
-      
+      
         
       
       
@@ -2301,7 +2301,7 @@
       
         
       
-      
+      
         
       
       
@@ -2359,7 +2359,7 @@
       
       
       
-      
+      
         
       
       
@@ -2442,7 +2442,7 @@
       
       
       
-      
+      
         
       
       
@@ -2484,7 +2484,7 @@
       
       
       
-      
+      
         
       
       
@@ -2527,7 +2527,7 @@
       
       
       
-      
+      
         
       
       
@@ -2608,7 +2608,7 @@
       
       
       
-      
+      
         
       
       
@@ -2646,7 +2646,7 @@
       
         
       
-      
+      
         
       
       
@@ -2740,7 +2740,7 @@
       
       
       
-      
+      
         
       
       
@@ -2781,7 +2781,7 @@
       
       
       
-      
+      
         
       
       
@@ -2836,7 +2836,7 @@
       
       
       
-      
+      
         
       
       
@@ -2876,7 +2876,7 @@
       
       
       
-      
+      
         
       
       
@@ -2917,7 +2917,7 @@
       
       
       
-      
+      
         
       
       
@@ -3000,7 +3000,7 @@
       
       
       
-      
+      
         
       
       
@@ -3053,7 +3053,7 @@
       
       
       
-      
+      
         
       
       
@@ -3105,7 +3105,7 @@
       
       
       
-      
+      
         
       
       
@@ -3218,7 +3218,7 @@
       
       
       
-      
+      
         
       
       
@@ -3251,7 +3251,7 @@
       
       
       
-      
+      
         
       
       
@@ -3308,7 +3308,7 @@
       
       
       
-      
+      
         
       
       
@@ -3340,7 +3340,7 @@
       
       
       
-      
+      
         
       
       
@@ -3385,7 +3385,7 @@
       
       
       
-      
+      
         
       
       
@@ -3419,7 +3419,7 @@
       
       
       
-      
+      
         
       
       
@@ -3451,7 +3451,7 @@
       
       
       
-      
+      
         
       
       
@@ -3510,7 +3510,7 @@
       
       
       
-      
+      
         
       
       
@@ -3543,7 +3543,7 @@
       
       
       
-      
+      
         
       
       
@@ -3584,7 +3584,7 @@
       
         
       
-      
+      
         
       
       
@@ -3642,7 +3642,7 @@
       
       
       
-      
+      
         
       
       
@@ -3678,7 +3678,7 @@
       
       
       
-      
+      
         
       
       
@@ -3734,7 +3734,7 @@
       
       
       
-      
+      
         
       
       
@@ -3768,7 +3768,7 @@
       
       
       
-      
+      
         
       
       
@@ -3802,7 +3802,7 @@
       
       
       
-      
+      
         
       
       
@@ -3844,7 +3844,7 @@
       
       
       
-      
+      
         
       
       
@@ -3905,7 +3905,7 @@
       
       
       
-      
+      
         
       
       
@@ -3947,7 +3947,7 @@
       
       
       
-      
+      
         
       
       
@@ -3987,7 +3987,7 @@
       
       
       
-      
+      
         
       
       
@@ -4028,7 +4028,7 @@
       
       
       
-      
+      
         
       
       
@@ -4128,7 +4128,7 @@
       
       
       
-      
+      
         
       
       
@@ -4167,7 +4167,7 @@
       
       
       
-      
+      
         
       
       
@@ -4201,7 +4201,7 @@
       
       
       
-      
+      
         
       
       
@@ -4248,7 +4248,7 @@
       
       
       
-      
+      
         
       
       
@@ -4348,7 +4348,7 @@
       
         
       
-      
+      
         
       
       
@@ -4389,7 +4389,7 @@
       
       
       
-      
+      
         
       
       
@@ -4424,7 +4424,7 @@
       
       
       
-      
+      
         
       
       
@@ -4507,7 +4507,7 @@
       
         
       
-      
+      
         
       
       
@@ -4568,7 +4568,7 @@
       
       
       
-      
+      
         
       
       
@@ -4602,7 +4602,7 @@
       
       
       
-      
+      
         
       
       
@@ -4637,7 +4637,7 @@
       
       
       
-      
+      
         
       
       
@@ -4698,7 +4698,7 @@
       
       
       
-      
+      
         
       
       
@@ -4754,7 +4754,7 @@
       
       
       
-      
+      
         
       
       
@@ -4793,7 +4793,7 @@
       
       
       
-      
+      
         
       
       
@@ -4828,7 +4828,7 @@
       
       
       
-      
+      
         
       
       
@@ -4866,7 +4866,7 @@
       
         
       
-      
+      
         
       
       
@@ -4899,7 +4899,7 @@
       
       
       
-      
+      
         
       
       
@@ -4936,7 +4936,7 @@
       
       
       
-      
+      
         
       
       
@@ -4973,7 +4973,7 @@
       
       
       
-      
+      
         
       
       
@@ -5011,7 +5011,7 @@
       
       
       
-      
+      
         
       
       
@@ -5045,7 +5045,7 @@
       
       
       
-      
+      
         
       
       
@@ -5078,7 +5078,7 @@
       
       
       
-      
+      
         
       
       
@@ -5114,7 +5114,7 @@
       
       
       
-      
+      
         
       
       
@@ -5196,7 +5196,7 @@
       
       
       
-      
+      
         
       
       
@@ -5230,7 +5230,7 @@
       
       
       
-      
+      
         
       
       
@@ -5266,7 +5266,7 @@
       
       
       
-      
+      
         
       
       
@@ -5365,7 +5365,7 @@
       
       
       
-      
+      
         
       
       
@@ -5439,7 +5439,7 @@
       
       
       
-      
+      
         
       
       
@@ -5492,7 +5492,7 @@
       
       
       
-      
+      
         
       
       
@@ -5527,7 +5527,7 @@
       
       
       
-      
+      
         
       
       
@@ -5560,7 +5560,7 @@
       
       
       
-      
+      
         
       
       
@@ -5601,7 +5601,7 @@
       
       
       
-      
+      
         
       
       
@@ -5652,7 +5652,7 @@
       
       
       
-      
+      
         
       
       
@@ -5714,7 +5714,7 @@
       
       
       
-      
+      
         
       
       
@@ -5750,7 +5750,7 @@
       
       
       
-      
+      
         
       
       
@@ -5800,7 +5800,7 @@
       
       
       
-      
+      
         
       
       
@@ -5882,7 +5882,7 @@
       
       
       
-      
+      
         
       
       
@@ -5916,7 +5916,7 @@
       
       
       
-      
+      
         
       
       

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Sun Oct 24 12:21:50 2004
@@ -226,6 +226,7 @@
     
     
       javamail
+      javamail
     
   
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54971 - avalon/trunk/planet/cornerstone

2004-10-17T19:07:35Z

Author: niclas
Date: Sun Oct 17 12:07:34 2004
New Revision: 54971

Modified:
   avalon/trunk/planet/cornerstone/index.xml
Log:
Wrong commons-logging id.

Modified: avalon/trunk/planet/cornerstone/index.xml
==============================================================================
--- avalon/trunk/planet/cornerstone/index.xml	(original)
+++ avalon/trunk/planet/cornerstone/index.xml	Sun Oct 17 12:07:34 2004
@@ -19,6 +19,9 @@
       commons-logging
       1.0.4
     
+    
+      commons-logging-api
+    
   
 
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54935 - avalon/trunk/runtime/meta/plugin/src/main

2004-10-16T17:14:40Z

Author: niclas
Date: Sat Oct 16 10:14:40 2004
New Revision: 54935

Modified:
   avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
Log:
Oops, not for framework.

Modified: avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
==============================================================================
--- avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	(original)
+++ avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	Sat Oct 16 10:14:40 2004
@@ -12,8 +12,8 @@
   
     
       
-      
-      
+      
+      
       
       
       

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54930 - avalon/trunk/runtime/meta/plugin/src/main

2004-10-16T16:41:28Z

Author: niclas
Date: Sat Oct 16 09:41:28 2004
New Revision: 54930

Modified:
   avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
Log:
Wrong group being used.

Modified: avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
==============================================================================
--- avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	(original)
+++ avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	Sat Oct 16 09:41:28 2004
@@ -12,12 +12,12 @@
   
     
       
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
     
   
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54922 - in avalon/trunk/runtime/meta/plugin: . src/java

2004-10-16T13:41:08Z

Author: niclas
Date: Sat Oct 16 06:41:07 2004
New Revision: 54922

Removed:
   avalon/trunk/runtime/meta/plugin/copy-all.xsl
   avalon/trunk/runtime/meta/plugin/gump-build.xml
   avalon/trunk/runtime/meta/plugin/index.ent
   avalon/trunk/runtime/meta/plugin/maven.xml
   avalon/trunk/runtime/meta/plugin/plugin.jelly
   avalon/trunk/runtime/meta/plugin/plugin.properties
   avalon/trunk/runtime/meta/plugin/project.properties
   avalon/trunk/runtime/meta/plugin/project.xml
   avalon/trunk/runtime/meta/plugin/src/java/just-for-gump.txt
Log:
Miscommunication of what to put back in.

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54911 - in avalon/trunk: central/system/gump tools

2004-10-16T08:20:06Z

Author: niclas
Date: Sat Oct 16 01:20:05 2004
New Revision: 54911

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/tools/index.xml
Log:
CHanging the BCEL ID in Gump.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Sat Oct 16 01:20:05 2004
@@ -3186,7 +3186,7 @@
       
         
       
-      
+      
         
       
       

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Sat Oct 16 01:20:05 2004
@@ -79,9 +79,6 @@
       5.1
       jar
     
-    
-      jakarta-bcel
-    
   
   
   

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54864 - in avalon/trunk: central/system/gump runtime runtime/merlin/legacy

2004-10-15T19:34:56Z

Author: niclas
Date: Fri Oct 15 12:34:56 2004
New Revision: 54864

Added:
   avalon/trunk/runtime/merlin/legacy/
   avalon/trunk/runtime/merlin/legacy/build.xml   (contents, props changed)
Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/runtime/index.xml
Log:
More work to get Fulcrum build by Gump.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Fri Oct 15 12:34:56 2004
@@ -5106,6 +5106,88 @@
        from="Magic Integration <dev@avalon.apache.org>"/>
   
 
+  
+    
+    
+      
+       
+      
+      
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+    
+     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
   
     
     

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Fri Oct 15 12:34:56 2004
@@ -822,6 +822,18 @@
     
   
 
+  
+    
+      merlin
+      merlin-unit
+      3.3.1
+      SNAPSHOT
+    
+    
+      
+    
+  
+  
   
     
       avalon

Added: avalon/trunk/runtime/merlin/legacy/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/legacy/build.xml	Fri Oct 15 12:34:56 2004
@@ -0,0 +1,19 @@
+
+
+
+
+  
+  
+
+  
+    
+    ${magic.cache}
+    ${widget}
+    ${project.filename}
+    
+    
+  
+
+
+

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54742 - in avalon/trunk: central/system/gump tools

2004-10-13T15:15:15Z

Author: niclas
Date: Wed Oct 13 08:15:13 2004
New Revision: 54742

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/tools/index.xml
Log:
Gump is changing the Saxon name.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Wed Oct 13 08:15:13 2004
@@ -2960,9 +2960,7 @@
       
       
       
-      
-        
-      
+      
       
     
      

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Wed Oct 13 08:15:13 2004
@@ -141,6 +141,10 @@
       saxon
       6.5.3
       jar
+      
+        
+        saxon6
+      
     
   
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54732 - avalon/trunk/central/system/gump

2004-10-13T05:43:31Z

Author: niclas
Date: Tue Oct 12 22:43:28 2004
New Revision: 54732

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
Log:
New project for the Maven MetaPlugin.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Tue Oct 12 22:43:28 2004
@@ -2476,6 +2476,49 @@
        from="Magic Integration <dev@avalon.apache.org>"/>
   
 
+  
+    
+    
+      
+       
+      
+      
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+    
+     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
   
     
     

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54664 - in avalon/trunk/runtime: . meta/plugin meta/plugin/etc meta/plugin/etc/main meta/plugin/src/main

2004-10-12T10:28:32Z

Author: niclas
Date: Tue Oct 12 03:28:30 2004
New Revision: 54664

Added:
   avalon/trunk/runtime/meta/plugin/build.xml   (contents, props changed)
   avalon/trunk/runtime/meta/plugin/etc/
   avalon/trunk/runtime/meta/plugin/etc/main/
   avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties   (contents, props changed)
   avalon/trunk/runtime/meta/plugin/etc/main/project.xml   (contents, props changed)
   avalon/trunk/runtime/meta/plugin/src/main/
   avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
Modified:
   avalon/trunk/runtime/index.xml
Log:
Added the Meta plugin back for use with Maven.

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Tue Oct 12 03:28:30 2004
@@ -855,4 +855,16 @@
     
   
 
+  
+    
+      avalon/meta
+      avalon-meta-plugin
+      1.5.0
+      SNAPSHOT
+    
+    
+      
+    
+  
+  
 

Added: avalon/trunk/runtime/meta/plugin/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/build.xml	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,9 @@
+
+
+
+
+  
+  
+
+

Added: avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,32 @@
+# ------------------------------------------------------------------
+# P L U G I N  P R O P E R T I E S
+# -------------------------------------------------------------------
+# Avalon plugin.
+# -------------------------------------------------------------------
+
+#
+# Policy controlling the regeneration of meta descriptors independently
+# of the descriptor data.  This value defaults to false.  
+#
+avalon.meta.force=false
+
+#
+# Output format specification.  Valid values include 'xml' or 'serial'.
+# The xml value instructs the meta generator to create meta descriptions
+# in an XML format whereas the 'serial' value generates a serialized 
+# description of the descriptor.  Serial format is more efficient.  The 
+# default XML format is more portable.
+#
+avalon.meta.format=xml
+
+#
+# When generating type descriptors, Merlin recognizes both .xinfo
+# and .xtype. The .xtype postfix is used in situations where 
+# developers want to generate both Merlin and Phoenix descriptors. The 
+# value default to xinfo.
+#
+avalon.meta.type.postfix=xinfo
+
+
+
+

Added: avalon/trunk/runtime/meta/plugin/etc/main/project.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/etc/main/project.xml	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,74 @@
+
+
+
+
+  avalon/meta
+  avalon-meta-plugin
+  1.5
+
+  Avalon Meta Model Plugin
+  Avalon Plugin for Maven
+  Avalon Plugin for Maven
+  org.apache.avalon
+
+  
+
+    
+      avalon-framework
+      avalon-framework-api
+      4.2.0
+    
+    
+      avalon-framework
+      avalon-framework-impl
+      4.2.0
+    
+
+    
+      avalon/meta
+      avalon-meta-api
+      SNAPSHOT
+    
+    
+      avalon/meta
+      avalon-meta-spi
+      1.4.0
+    
+    
+      avalon/meta
+      avalon-meta-impl
+      SNAPSHOT
+    
+    
+      avalon/meta
+      avalon-meta-tools
+      SNAPSHOT
+    
+
+    
+      avalon/util
+      avalon-util-i18n
+      1.0.0
+    
+
+    
+      avalon/util
+      avalon-util-configuration
+      1.0.0
+    
+
+    
+      ant
+      ant
+      1.6.2
+    
+
+    
+      qdox
+      qdox
+      1.4
+    
+
+  
+  
+

Added: avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,76 @@
+
+
+
+
+  
+
+  
+    
+      
+      
+      
+      
+      
+      
+      
+    
+  
+
+  
+
+    
+      
+
+        
+
+        
+
+        
+
+        
+        
+
+          
+            
+              
+            
+          
+          
+            
+              
+            
+          
+
+        
+
+        
+          
+          
+            
+              
+            
+          
+        
+      
+      
+        No Avalon Meta java source files to compile.
+            
+    
+  
+
+

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54547 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks

2004-10-11T10:26:16Z

Author: niclas
Date: Mon Oct 11 03:26:15 2004
New Revision: 54547

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
Opposite check for mode bug. Fixed.

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	Mon
Oct 11 03:26:15 2004
@@ -290,12 +290,12 @@
         junit.setErrorProperty( ERROR_KEY );
         junit.setFailureProperty( FAILURE_KEY );
         junit.setTaskName( getTaskName() );
-	  if( getForkProperty() )
+        if( getForkProperty() )
         {
             junit.setFork( true );
             junit.setDir( project.getBaseDir() );
             JUnitTask.ForkMode mode = getForkMode();
-            if( null != mode )
+            if( null == mode )
             {
                 log( "Executing forked test." );
             }

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54517 - in avalon/trunk: central/system/gump tools

2004-10-11T08:38:19Z

Author: niclas
Date: Mon Oct 11 01:38:17 2004
New Revision: 54517

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
   avalon/trunk/tools/index.xml
Log:
Ant has changed its IDs for the plugins, to be able to support Maven builds in Gump.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Mon Oct 11 01:38:17 2004
@@ -488,8 +488,8 @@
       
       
       
-      
-      
+      
+      
       
     
      
@@ -1468,8 +1468,8 @@
       
       
       
-      
-      
+      
+      
       
     
      
@@ -2915,8 +2915,8 @@
       
       
       
-      
-      
+      
+      
       
         
       
@@ -4065,8 +4065,8 @@
       
       
       
-      
-      
+      
+      
       
     
      

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Mon Oct 11 01:38:17 2004
@@ -27,7 +27,7 @@
       
       
       ant
-      nodeps
+      ant-nodeps
     
   
 
@@ -42,7 +42,7 @@
       
       
       ant
-      junit
+      ant-junit
     
   
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54507 - avalon/trunk/central/system/gump

2004-10-11T04:02:05Z

Author: niclas
Date: Sun Oct 10 21:02:03 2004
New Revision: 54507

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
Log:
New build model generated.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Sun Oct 10 21:02:03 2004
@@ -57,6 +57,7 @@
      
     
     
+    
     
     
     
@@ -65,8 +66,6 @@
     
     
     
-    
-    
     
     
     
@@ -102,9 +101,8 @@
      
     
     
-    
-    
     
+    
     
     
     
@@ -141,6 +139,7 @@
     
     
     
+    
     
     
     
@@ -152,8 +151,6 @@
     
     
     
-    
-    
     
     
     
@@ -222,9 +219,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -245,25 +241,25 @@
       
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
       
@@ -283,10 +279,9 @@
     
     
     
+    
     
     
-    
-    
     
     
     
@@ -321,7 +316,6 @@
     
     
     
-    
     
     
     
@@ -359,14 +353,13 @@
     
     
     
+    
     
     
     
     
     
     
-    
-    
     
     
     
@@ -382,11 +375,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -444,9 +451,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -490,6 +496,7 @@
     
     
     
+    
     
     
     
@@ -498,8 +505,6 @@
     
     
     
-    
-    
     
     
     
@@ -554,9 +559,6 @@
       
       
       
-      
-        
-      
       
         
       
@@ -569,6 +571,9 @@
       
         
       
+      
+        
+      
       
         
       
@@ -589,6 +594,7 @@
      
     
     
+    
     
     
     
@@ -598,8 +604,6 @@
     
     
     
-    
-    
     
     
     
@@ -637,7 +641,6 @@
     
     
     
-    
     
     
     
@@ -708,7 +711,6 @@
     
     
     
-    
     
     
     
@@ -757,7 +759,6 @@
     
     
     
-    
     
     
     
@@ -811,7 +812,6 @@
     
     
     
-    
     
     
     
@@ -848,7 +848,6 @@
     
     
     
-    
     
     
     
@@ -869,6 +868,18 @@
       
         
       
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
@@ -876,6 +887,7 @@
     
     
     
+    
     
     
     
@@ -924,7 +936,6 @@
     
     
     
-    
     
     
     
@@ -939,11 +950,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -963,25 +988,25 @@
       
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
       
@@ -996,9 +1021,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -1053,11 +1077,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
     
     
-    
-    
     
+    
     
     
     
@@ -1148,7 +1185,6 @@
     
     
     
-    
     
     
     
@@ -1191,7 +1227,6 @@
     
     
     
-    
     
     
     
@@ -1211,6 +1246,19 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
@@ -1219,6 +1267,7 @@
     
     
     
+    
     
     
     
@@ -1256,14 +1305,13 @@
     
     
     
+    
     
     
     
     
     
     
-    
-    
     
     
     
@@ -1338,7 +1386,6 @@
     
     
     
-    
     
     
     
@@ -1399,9 +1446,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -1458,7 +1504,6 @@
      
     
     
-    
     
     
     
@@ -1529,6 +1574,7 @@
      
     
     
+    
     
     
     
@@ -1538,8 +1584,6 @@
     
     
     
-    
-    
     
     
     
@@ -1579,9 +1623,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -1617,7 +1660,6 @@
     
     
     
-    
     
     
     
@@ -1654,7 +1696,6 @@
     
     
     
-    
     
     
     
@@ -1720,9 +1761,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -1801,11 +1841,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
     
     
-    
     
     
     
@@ -1855,11 +1908,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -1878,19 +1945,19 @@
       
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
       
@@ -1953,6 +2020,7 @@
     
     
     
+    
     
     
     
@@ -1961,8 +2029,6 @@
     
     
     
-    
-    
     
     
     
@@ -2035,6 +2101,19 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
@@ -2044,6 +2123,7 @@
     
     
     
+    
     
     
     
@@ -2065,11 +2145,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -2170,9 +2264,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -2248,9 +2341,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -2299,6 +2391,7 @@
     
     
     
+    
     
     
     
@@ -2306,8 +2399,6 @@
     
     
     
-    
-    
     
     
     
@@ -2368,6 +2459,7 @@
      
     
     
+    
     
     
     
@@ -2376,8 +2468,6 @@
     
     
     
-    
-    
     
     
     
@@ -2424,6 +2514,7 @@
     
     
     
+    
     
     
     
@@ -2431,8 +2522,6 @@
     
     
     
-    
-    
     
     
     
@@ -2494,7 +2583,6 @@
     
     
     
-    
     
     
     
@@ -2515,25 +2603,25 @@
       
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
       
@@ -2548,10 +2636,9 @@
     
     
     
+    
     
     
-    
-    
     
     
     
@@ -2632,9 +2719,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -2674,9 +2760,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -2726,7 +2811,6 @@
     
     
     
-    
     
     
     
@@ -2766,6 +2850,7 @@
      
     
     
+    
     
     
     
@@ -2773,8 +2858,6 @@
     
     
     
-    
-    
     
     
     
@@ -2808,14 +2891,13 @@
      
     
     
+    
     
     
     
     
     
     
-    
-    
     
     
     
@@ -3008,9 +3090,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -3095,11 +3176,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -3152,7 +3247,6 @@
     
     
     
-    
     
     
     
@@ -3172,9 +3266,25 @@
        
       
       
-      
-    
-     
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+    
+     
+    
+    
+    
     
     
     
     
     
-    
-    
     
+    
     
     
     
@@ -3234,11 +3343,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -3254,11 +3377,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
     
     
-    
-    
     
+    
     
     
     
@@ -3332,11 +3468,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -3373,9 +3523,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -3434,9 +3583,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -3472,7 +3620,6 @@
     
     
     
-    
     
     
     
@@ -3489,11 +3636,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
      
     
     
-    
-    
     
+    
     
     
     
@@ -3566,11 +3726,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -3610,9 +3784,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -3662,6 +3835,7 @@
      
     
     
+    
     
     
     
@@ -3671,8 +3845,6 @@
     
     
     
-    
-    
     
     
     
@@ -3717,7 +3889,6 @@
     
     
     
-    
     
     
     
@@ -3757,9 +3928,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -3793,6 +3963,7 @@
      
     
     
+    
     
     
     
@@ -3800,8 +3971,6 @@
     
     
     
-    
-    
     
     
     
@@ -3940,9 +4109,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -3957,11 +4125,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -4007,9 +4189,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -4064,7 +4245,6 @@
     
     
     
-    
     
     
     
@@ -4150,9 +4330,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -4187,7 +4366,6 @@
     
     
     
-    
     
     
     
@@ -4225,6 +4403,7 @@
      
     
     
+    
     
     
     
@@ -4233,8 +4412,6 @@
     
     
     
-    
-    
     
     
     
@@ -4289,9 +4466,6 @@
       
         
       
-      
-        
-      
       
         
       
@@ -4301,6 +4475,9 @@
       
         
       
+      
+        
+      
       
         
       
@@ -4322,6 +4499,7 @@
     
     
     
+    
     
     
     
@@ -4331,8 +4509,6 @@
     
     
     
-    
-    
     
     
     
@@ -4350,11 +4526,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -4389,7 +4579,6 @@
     
     
     
-    
     
     
     
@@ -4407,9 +4596,6 @@
       
       
       
-      
-        
-      
       
         
       
@@ -4422,6 +4608,9 @@
       
         
       
+      
+        
+      
       
         
       
@@ -4442,6 +4631,7 @@
      
     
     
+    
     
     
     
@@ -4451,8 +4641,6 @@
     
     
     
-    
-    
     
     
     
@@ -4469,28 +4657,28 @@
       
       
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
-      
+      
         
       
       
@@ -4505,11 +4693,10 @@
     
     
     
+    
     
     
     
-    
-    
     
     
     
@@ -4548,9 +4735,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -4584,9 +4770,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -4620,7 +4805,6 @@
     
     
     
-    
     
     
     
@@ -4641,11 +4825,24 @@
       
         
       
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -4679,10 +4876,9 @@
     
     
     
+    
     
     
-    
-    
     
     
     
@@ -4717,10 +4913,9 @@
     
     
     
+    
     
     
-    
-    
     
     
     
@@ -4755,10 +4950,9 @@
     
     
     
+    
     
     
-    
-    
     
     
     
@@ -4775,11 +4969,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -4795,11 +5003,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -4832,10 +5054,9 @@
      
     
     
+    
     
     
-    
-    
     
     
     
@@ -4871,7 +5092,6 @@
     
     
     
-    
     
     
     
@@ -4905,7 +5125,6 @@
     
     
     
-    
     
     
     
@@ -4955,6 +5174,7 @@
     
     
     
+    
     
     
     
@@ -4962,8 +5182,6 @@
     
     
     
-    
-    
     
     
     
@@ -5044,6 +5262,7 @@
      
     
     
+    
     
     
     
@@ -5053,8 +5272,6 @@
     
     
     
-    
-    
     
     
     
@@ -5098,11 +5315,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -5156,7 +5387,6 @@
     
     
     
-    
     
     
     
@@ -5173,11 +5403,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -5210,6 +5454,7 @@
      
     
     
+    
     
     
     
@@ -5217,8 +5462,6 @@
     
     
     
-    
-    
     
     
     
@@ -5235,12 +5478,6 @@
       
       
       
-      
-        
-      
-      
-        
-      
       
         
       
@@ -5253,6 +5490,12 @@
       
         
       
+      
+        
+      
+      
+        
+      
       
         
       
@@ -5268,9 +5511,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -5328,7 +5570,6 @@
     
     
     
-    
     
     
     
@@ -5368,9 +5609,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -5386,11 +5626,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -5443,6 +5697,7 @@
      
     
     
+    
     
     
     
@@ -5451,8 +5706,6 @@
     
     
     
-    
-    
     
     
     
@@ -5505,11 +5758,25 @@
        
       
       
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
       
     
      
     
     
+    
     
     
     
@@ -5526,9 +5793,18 @@
       
       
       
+      
+        
+      
       
         
       
+      
+        
+      
+      
+        
+      
       
     
      
@@ -5539,6 +5815,7 @@
     
     
     
+    
     
     
     

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54234 - in avalon/trunk/tools/magic: . src/main/org/apache/avalon/tools/tasks

2004-10-10T09:16:20Z

Author: niclas
Date: Sun Oct 10 02:16:19 2004
New Revision: 54234

Modified:
   avalon/trunk/tools/magic/build.xml
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
Reverting the Fork policy change.

Modified: avalon/trunk/tools/magic/build.xml
==============================================================================
--- avalon/trunk/tools/magic/build.xml	(original)
+++ avalon/trunk/tools/magic/build.xml	Sun Oct 10 02:16:19 2004
@@ -21,12 +21,6 @@
   
   -->
 
-  
-
   
     
   

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	Sun
Oct 10 02:16:19 2004
@@ -292,11 +292,18 @@
         junit.setTaskName( getTaskName() );
 	  if( getForkProperty() )
         {
-            JUnitTask.ForkMode mode = getForkMode();
-            log( "Executing forked test with mode: '" + mode + "'." );
             junit.setFork( true );
             junit.setDir( project.getBaseDir() );
-            junit.setForkMode( mode );
+            JUnitTask.ForkMode mode = getForkMode();
+            if( null != mode )
+            {
+                log( "Executing forked test." );
+            }
+            else
+            {
+                log( "Executing forked test with mode: '" + mode + "'." );
+                junit.setForkMode( mode );
+            }
         }
         else
         {
@@ -365,7 +372,7 @@
         final String value = getProject().getProperty( TEST_FORK_MODE_KEY );
         if( null == value )
         {
-            return new JUnitTask.ForkMode( JUnitTask.ForkMode.ONCE );
+            return null;
         }
         else 
         {

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54233 - avalon/trunk/runtime

2004-10-10T08:56:58Z

Author: niclas
Date: Sun Oct 10 01:56:58 2004
New Revision: 54233

Modified:
   avalon/trunk/runtime/index.xml
Log:
Can remove the impl reference to legacy.

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Sun Oct 10 01:56:58 2004
@@ -135,7 +135,6 @@
     
     
       
-      
     
   
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 54232 - in avalon/trunk/runtime: . framework/api/src/java/org/apache/avalon/framework/component framework/api/src/java/org/apache/avalon/framework/logger framework/legacy/src/main/org/apache/avalon/framework/component framework/legacy/src/main/org/apache/avalon/framework/logger

2004-10-10T08:47:08Z

Author: niclas
Date: Sun Oct 10 01:47:08 2004
New Revision: 54232

Added:
   avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/component/
      - copied from rev 47115, avalon/trunk/runtime/framework/legacy/src/main/org/apache/avalon/framework/component/
   avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/logger/Loggable.java
      - copied unchanged from rev 47115, avalon/trunk/runtime/framework/legacy/src/main/org/apache/avalon/framework/logger/Loggable.java
Removed:
   avalon/trunk/runtime/framework/legacy/src/main/org/apache/avalon/framework/component/
   avalon/trunk/runtime/framework/legacy/src/main/org/apache/avalon/framework/logger/Loggable.java
Modified:
   avalon/trunk/runtime/index.xml
Log:
Moved the legacy back to API, to get Gump/Excalibur to work again, without the need to release
4.3

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Sun Oct 10 01:47:08 2004
@@ -109,6 +109,9 @@
       4.3.0
       SNAPSHOT 
     
+    
+      
+    
   
 
   
@@ -120,7 +123,6 @@
     
     
       
-      
     
   
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 53763 - in avalon/trunk/tools/magic: . src/main/org/apache/avalon/tools/tasks

2004-10-04T23:15:13Z

Author: niclas
Date: Mon Oct  4 16:15:12 2004
New Revision: 53763

Modified:
   avalon/trunk/tools/magic/build.xml
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
Patch from Steve to allow better forking control in JUnit task.

Modified: avalon/trunk/tools/magic/build.xml
==============================================================================
--- avalon/trunk/tools/magic/build.xml	(original)
+++ avalon/trunk/tools/magic/build.xml	Mon Oct  4 16:15:12 2004
@@ -21,6 +21,12 @@
   
   -->
 
+  
+
   
     
   

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	Mon
Oct  4 16:15:12 2004
@@ -62,6 +62,8 @@
     public static final String HALT_ON_ERROR_KEY = "project.test.halt-on-error";
     public static final boolean HALT_ON_ERROR_VALUE = false;
 
+    public static final String TEST_FORK_MODE_KEY = "project.test.fork.mode";
+
     public static final String HALT_ON_FAILURE_KEY = "project.test.halt-on-failure";
     public static final boolean HALT_ON_FAILURE_VALUE = true;
 
@@ -214,7 +216,7 @@
     private void test( final File src, final Path classpath, File working )
     {
         final Project project = getProject();
-        project.log( "MAGIC TEST CLASSPATH: " + classpath, Project.MSG_VERBOSE );
+        log( "Test classpath: " + classpath, Project.MSG_VERBOSE );
 
         final FileSet fileset = new FileSet();
         fileset.setDir( src );
@@ -222,7 +224,7 @@
         final String excludes = getContext().getTestExcludes();
         createIncludes(fileset, includes);
         createExcludes(fileset, excludes);
-        project.log( "MAGIC TEST FILTERS: includes=" + includes + ", excludes=" + excludes,
Project.MSG_VERBOSE );
+        log( "Test filters: includes=" + includes + ", excludes=" + excludes, Project.MSG_VERBOSE
);
 
         final JUnitTask junit = (JUnitTask) getProject().createTask( "junit" );
         junit.init();
@@ -288,12 +290,18 @@
         junit.setErrorProperty( ERROR_KEY );
         junit.setFailureProperty( FAILURE_KEY );
         junit.setTaskName( getTaskName() );
-	if( getForkProperty() )
+	  if( getForkProperty() )
         {
+            JUnitTask.ForkMode mode = getForkMode();
+            log( "Executing forked test with mode: '" + mode + "'." );
             junit.setFork( true );
             junit.setDir( project.getBaseDir() );
+            junit.setForkMode( mode );
+        }
+        else
+        {
+            log( "executing in local jvm" );
         }
-        
         junit.execute();
     }
     
@@ -350,6 +358,19 @@
     private boolean getForkProperty()
     {
         return getBooleanProperty( FORK_KEY, FORK_VALUE );
+    }
+
+    private JUnitTask.ForkMode getForkMode()
+    {
+        final String value = getProject().getProperty( TEST_FORK_MODE_KEY );
+        if( null == value )
+        {
+            return new JUnitTask.ForkMode( JUnitTask.ForkMode.ONCE );
+        }
+        else 
+        {
+            return new JUnitTask.ForkMode( value );
+        }
     }
 
     private boolean getBooleanProperty( final String key, final boolean fallback )

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 47649 - in avalon/trunk: planet/tutorials/dependencies/manual runtime/composition/api/src/java/org/apache/avalon/composition/data runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl

2004-10-01T14:53:26Z

Author: niclas
Date: Fri Oct  1 07:53:25 2004
New Revision: 47649

Modified:
   avalon/trunk/planet/tutorials/dependencies/manual/build.xml
   avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
   avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
Log:
Patch for proper Gump build.

Modified: avalon/trunk/planet/tutorials/dependencies/manual/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/dependencies/manual/build.xml	(original)
+++ avalon/trunk/planet/tutorials/dependencies/manual/build.xml	Fri Oct  1 07:53:25 2004
@@ -8,6 +8,8 @@
 
   
     
+      
+      
       
         
           

Modified: avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
==============================================================================
--- avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
(original)
+++ avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
Fri Oct  1 07:53:25 2004
@@ -129,7 +129,7 @@
     /**
      * The configuration for component (if any).
      */
-    private ContextDirective m_context;
+    private ContextDirective m_context = new ContextDirective( new EntryDirective[0] );
 
     /**
      * The dependency directives.

Modified: avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
==============================================================================
--- avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
(original)
+++ avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
Fri Oct  1 07:53:25 2004
@@ -351,8 +351,10 @@
             DeploymentModel model = m_model.getModel( path );
             if( null == model )
             {
-                final String error = "Could not locate a model at the address: ["
-                        + path + "] in " + this + ".";
+                final String error = 
+                  "The supplied dependency path ["
+                  + path 
+                  + "] does not reference a known component.";
                 throw new AssemblyException( error );
             }
             assembleModel( model, subjects );

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 47465 - avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder

2004-09-29T05:47:05Z

Author: hammett
Date: Tue Sep 28 22:47:05 2004
New Revision: 47465

Modified:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs
Log:
Small but important correction.

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs
Tue Sep 28 22:47:05 2004
@@ -29,6 +29,11 @@
 			
 		}
 
+            protected ModuleScope ModuleScope
+            {
+                get { return m_scope; }
+            }
+
 		#region IProxyBuilder Members
 
 		public virtual Type CreateInterfaceProxy(Type[] interfaces)

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 47463 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks

2004-09-29T05:28:19Z

Author: niclas
Date: Tue Sep 28 22:28:18 2004
New Revision: 47463

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
Applying patch provided by Peter Neubauer, to allow forking of tests.

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	Tue
Sep 28 22:28:18 2004
@@ -230,11 +230,6 @@
         final JUnitTask.SummaryAttribute summary = new JUnitTask.SummaryAttribute();
         summary.setValue( "on" );
         junit.setPrintsummary( summary );
-        if( getForkProperty() )
-        {
-            junit.setFork( true );
-            junit.setDir( project.getBaseDir() );
-        }
         junit.setShowOutput( true );
         junit.setTempdir( working );
         junit.setReloading( true );
@@ -293,7 +288,12 @@
         junit.setErrorProperty( ERROR_KEY );
         junit.setFailureProperty( FAILURE_KEY );
         junit.setTaskName( getTaskName() );
-
+	if( getForkProperty() )
+        {
+            junit.setFork( true );
+            junit.setDir( project.getBaseDir() );
+        }
+        
         junit.execute();
     }
     

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 47448 - avalon/trunk/central/laboratory/avalon-net/DynamicProxy

2004-09-29T02:53:53Z

Author: hammett
Date: Tue Sep 28 19:53:53 2004
New Revision: 47448

Modified:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/README.txt
Log:
whoops!

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/README.txt
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/README.txt	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/README.txt	Tue Sep 28 19:53:53
2004
@@ -16,7 +16,7 @@
 To Build DynamicProxy you'll need:
 
 NAnt  -> http://nant.sourceforge.net
-(Tested against version 0.84)
+(Tested against version 0.85)
 
 NUnit is not a requirement as NAnt already includes it. 
 We cannot provide them for you due to licensing issues.
@@ -29,24 +29,8 @@
 
 Once your environment is set up you can type: 
 
-> build.cmd -defaultframework:?????? compile
+> nant
 
-Where ?????? is one of the following:
-
-  mono-1.0 for Mono 1.0
-  net-1.1 for Microsoft .NET Framework 1.1
-  net-1.0 for Microsoft .NET Framework 1.0
-  sscli-1.0 for Shared CLI 1.0
-
-For example:
-
-> build.cmd -defaultframework:net-1.1 compile
-
-You may also type:
-
-> build.cmd
-
-To build everything that is supported by your machine configuration.
 
 
 Enjoy!

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org

svn commit: rev 47447 - in avalon/trunk/central/laboratory/avalon-net/DynamicProxy: . src/DynamicProxy

2004-09-29T02:48:09Z

Author: hammett
Date: Tue Sep 28 19:48:09 2004
New Revision: 47447

Added:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy.build   (contents,
props changed)
Modified:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs
Log:
Completed! Phew!

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy.build
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy.build	Tue Sep 28
19:48:09 2004
@@ -0,0 +1,135 @@
+
+
+
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+	
+	
+	
+
+	
+	
+		
+	
+		
+	
+		
+	
+
+		
+
+	
+		
+	
+
+	
+		
+		
+	
+
+	
+	
+	
+		
+			
+			
+				
+			
+		
+	
+
+	
+		
+			
+			
+				
+			
+
+			
+				
+				
+			
+		
+	
+	
+	
+		
+			
+			
+		
+	
+	
+	
+		
+			
+				
+			
+			
+				
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+					
+				
+			
+		
+	
+	
+
\ No newline at end of file

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs
Tue Sep 28 19:48:09 2004
@@ -30,12 +30,13 @@
 	/// 
 	/// 
 	/// The  should be used to generate a class 
-	/// implementing the specified interfaces. The class implementation will 
-	/// only call the internal  instance.
+	/// implementing the specified interfaces. The dynamic implementation will 
+	/// only calls the internal  instance.
 	/// 
 	/// 
-	/// This proxy implementation currently doesn't not supports ref and out arguments 
+	/// Please note that this proxy implementation currently doesn't not supports ref and out
arguments 
 	/// in methods.
+	/// Also note that only virtual methods can be proxied in a class.
 	/// 
 	/// 
 	/// 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org



svn commit: rev 47446 - in avalon/trunk/central/laboratory/avalon-net/DynamicProxy: . Builder src/DynamicProxy src/DynamicProxyTest
2004-09-29T02:41:10Z

Author: hammett
Date: Tue Sep 28 19:41:10 2004
New Revision: 47446

Removed:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/AssemblyInfo.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy.sln
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/IInvocationHandler.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/ProxyGenerator.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/StandardInvocationHandler.cs
Modified:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/   (props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/   (props
changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
Log:
Reorganization finished. New build system to go.

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
Tue Sep 28 19:41:10 2004
@@ -48,7 +48,7 @@
                     BaseAddress = "285212672"
                     CheckForOverflowUnderflow = "false"
                     ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
+                    DefineConstants = "TRACE STRONG"
                     DocumentationFile = ""
                     DebugSymbols = "false"
                     FileAlignment = "4096"

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
Tue Sep 28 19:41:10 2004
@@ -23,10 +23,10 @@
 [assembly: AssemblyCopyright("Copyright (c) 2004 The Apache Software Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]		
-[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
 
 #if STRONG
 [assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("../../../../ApacheAvalon.snk")]
+[assembly: AssemblyKeyFile("../../../../../ApacheAvalon.snk")]
 [assembly: AssemblyKeyName("")]
 #endif

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
Tue Sep 28 19:41:10 2004
@@ -3,7 +3,7 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Avalon.DynamicProxy.Test", "DynamicProxyTest\Apache.Avalon.DynamicProxy.Test.csproj",
"{EF89321E-FB2A-41B6-85B3-794D50A55CF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Avalon.DynamicProxy.Test", "..\DynamicProxyTest\Apache.Avalon.DynamicProxy.Test.csproj",
"{EF89321E-FB2A-41B6-85B3-794D50A55CF1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
Tue Sep 28 19:41:10 2004
@@ -80,15 +80,15 @@
                     HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                 />
                 
-                
+                
             
         

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
Tue Sep 28 19:41:10 2004
@@ -26,7 +26,7 @@
 	/// Summary description for CustomProxyGeneratorTestCase.
 	/// 
 	[TestFixture]
-	public class CustomProxyGeneratorTestCase : Assertion
+	public class CustomProxyGeneratorTestCase
 	{
 		private ProxyGenerator m_generator;
 		private bool m_enhanceInvoked;
@@ -51,8 +51,8 @@
 				typeof (IMyInterface), 
 				new StandardInvocationHandler(new MyInterfaceImpl()), context);
 
-			Assert( m_enhanceInvoked );
-			Assert( m_screenInvoked );
+			Assert.IsTrue( m_enhanceInvoked );
+			Assert.IsTrue( m_screenInvoked );
 		}
 
 		[Test]
@@ -67,26 +67,26 @@
 				new StandardInvocationHandler(new ServiceClass()),
 				context);
 
-			Assert( m_enhanceInvoked );
-			Assert( m_screenInvoked );
+			Assert.IsTrue( m_enhanceInvoked );
+			Assert.IsTrue( m_screenInvoked );
 		}
 
 		private void EnhanceType(TypeBuilder mainType, FieldBuilder handlerFieldBuilder, ConstructorBuilder
constructorBuilder)
 		{
-			Assert( !m_enhanceInvoked );
+			Assert.IsTrue( !m_enhanceInvoked );
 
-			AssertNotNull(mainType);
-			AssertNotNull(handlerFieldBuilder);
-			AssertNotNull(constructorBuilder);
+			Assert.IsNotNull(mainType);
+			Assert.IsNotNull(handlerFieldBuilder);
+			Assert.IsNotNull(constructorBuilder);
 
 			m_enhanceInvoked = true;
 		}
 
 		private Type[] ScreenInterfaces(Type[] interfaces)
 		{
-			Assert( !m_screenInvoked );
+			Assert.IsTrue( !m_screenInvoked );
 
-			AssertNotNull(interfaces);
+			Assert.IsNotNull(interfaces);
 
 			m_screenInvoked = true;
 

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
Tue Sep 28 19:41:10 2004
@@ -27,7 +27,7 @@
 	/// Summary description for ProxyGeneratorTestCase.
 	/// 
 	[TestFixture]
-	public class ProxyGeneratorTestCase : Assertion
+	public class ProxyGeneratorTestCase
 	{
 		private ProxyGenerator m_generator;
 
@@ -43,13 +43,13 @@
 			object proxy = m_generator.CreateClassProxy( 
 				typeof(ServiceClass), new ResultModifiedInvocationHandler( new ServiceClass() ) );
 			
-			AssertNotNull( proxy );
-			Assert( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
 
 			ServiceClass inter = (ServiceClass) proxy;
 
-			AssertEquals( 44, inter.Sum( 20, 25 ) );
-			AssertEquals( true, inter.Valid );
+			Assert.AreEqual( 44, inter.Sum( 20, 25 ) );
+			Assert.AreEqual( true, inter.Valid );
 		}
 
 		[Test]
@@ -58,15 +58,15 @@
 			object proxy = m_generator.CreateClassProxy( 
 				typeof(SpecializedServiceClass), new ResultModifiedInvocationHandler( new SpecializedServiceClass()
) );
 			
-			AssertNotNull( proxy );
-			Assert( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
-			Assert( typeof(SpecializedServiceClass).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsTrue( typeof(SpecializedServiceClass).IsAssignableFrom( proxy.GetType() ) );
 
 			SpecializedServiceClass inter = (SpecializedServiceClass) proxy;
 
-			AssertEquals( 44, inter.Sum( 20, 25 ) );
-			AssertEquals( -6, inter.Subtract( 20, 25 ) );
-			AssertEquals( true, inter.Valid );
+			Assert.AreEqual( 44, inter.Sum( 20, 25 ) );
+			Assert.AreEqual( -6, inter.Subtract( 20, 25 ) );
+			Assert.AreEqual( true, inter.Valid );
 		}
 
 		[Test]
@@ -75,13 +75,13 @@
 			object proxy = m_generator.CreateClassProxy( 
 				typeof(MyInterfaceImpl), new ResultModifiedInvocationHandler( new MyInterfaceImpl() )
);
 			
-			AssertNotNull( proxy );
-			Assert( typeof(MyInterfaceImpl).IsAssignableFrom( proxy.GetType() ) );
-			Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(MyInterfaceImpl).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsTrue( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
 
 			IMyInterface inter = (IMyInterface) proxy;
 
-			AssertEquals( 44, inter.Calc( 20, 25 ) );
+			Assert.AreEqual( 44, inter.Calc( 20, 25 ) );
 		}
 
 		[Test]
@@ -90,12 +90,12 @@
 			object proxy = m_generator.CreateClassProxy( 
 				typeof(NoVirtualMethodClass), new ResultModifiedInvocationHandler( new SpecializedServiceClass()
) );
 			
-			AssertNotNull( proxy );
-			Assert( typeof(NoVirtualMethodClass).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(NoVirtualMethodClass).IsAssignableFrom( proxy.GetType() ) );
 
 			NoVirtualMethodClass inter = (NoVirtualMethodClass) proxy;
 
-			AssertEquals( 45, inter.Sum( 20, 25 ) );
+			Assert.AreEqual( 45, inter.Sum( 20, 25 ) );
 		}
 
 		[Test]
@@ -104,12 +104,12 @@
 			object proxy = m_generator.CreateClassProxy( 
 				typeof(SealedMethodsClass), new ResultModifiedInvocationHandler( new SpecializedServiceClass()
) );
 			
-			AssertNotNull( proxy );
-			Assert( typeof(SealedMethodsClass).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(SealedMethodsClass).IsAssignableFrom( proxy.GetType() ) );
 
 			SealedMethodsClass inter = (SealedMethodsClass) proxy;
 
-			AssertEquals( 45, inter.Sum( 20, 25 ) );
+			Assert.AreEqual( 45, inter.Sum( 20, 25 ) );
 		}
 
 		[Test]
@@ -152,18 +152,18 @@
 			object proxy = m_generator.CreateProxy( 
 				typeof(IMyInterface), new StandardInvocationHandler( new MyInterfaceImpl() ) );
 			
-			AssertNotNull( proxy );
-			Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
 
 			IMyInterface inter = (IMyInterface) proxy;
 
-			AssertEquals( 45, inter.Calc( 20, 25 ) );
+			Assert.AreEqual( 45, inter.Calc( 20, 25 ) );
 
 			inter.Name = "opa";
-			AssertEquals( "opa", inter.Name );
+			Assert.AreEqual( "opa", inter.Name );
 
 			inter.Started = true;
-			AssertEquals( true, inter.Started );
+			Assert.AreEqual( true, inter.Started );
 		}
 
 		[Test]
@@ -172,20 +172,20 @@
 			object proxy = m_generator.CreateProxy( 
 				typeof(IMySecondInterface), new StandardInvocationHandler( new MySecondInterfaceImpl()
) );
 
-			AssertNotNull( proxy );
-			Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
-			Assert( typeof(IMySecondInterface).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsTrue( typeof(IMySecondInterface).IsAssignableFrom( proxy.GetType() ) );
 
 			IMySecondInterface inter = (IMySecondInterface) proxy;
 			inter.Calc(1, 1);
 
 			inter.Name = "hammett";
-			AssertEquals( "hammett", inter.Name );
+			Assert.AreEqual( "hammett", inter.Name );
 
 			inter.Address = "pereira leite, 44";
-			AssertEquals( "pereira leite, 44", inter.Address );
+			Assert.AreEqual( "pereira leite, 44", inter.Address );
 			
-			AssertEquals( 45, inter.Calc( 20, 25 ) );
+			Assert.AreEqual( 45, inter.Calc( 20, 25 ) );
 		}
 
 		[Test]
@@ -196,14 +196,14 @@
 			object proxy = m_generator.CreateProxy( 
 				typeof(IServiceStatus), new StandardInvocationHandler( service ) );
 			
-			AssertNotNull( proxy );
-			Assert( typeof(IServiceStatus).IsAssignableFrom( proxy.GetType() ) );
+			Assert.IsNotNull( proxy );
+			Assert.IsTrue( typeof(IServiceStatus).IsAssignableFrom( proxy.GetType() ) );
 
 			IServiceStatus inter = (IServiceStatus) proxy;
-			AssertEquals( State.Invalid, inter.ActualState );
+			Assert.AreEqual( State.Invalid, inter.ActualState );
 			
 			inter.ChangeState( State.Valid );
-			AssertEquals( State.Valid, inter.ActualState );
+			Assert.AreEqual( State.Valid, inter.ActualState );
 		}
 
 		public class MyInterfaceProxy : IInvocationHandler

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
Tue Sep 28 19:41:10 2004
@@ -18,13 +18,13 @@
 
 	using NUnit.Framework;
 
-      using Apache.Avalon.DynamicProxy.Test.Classes;
+	using Apache.Avalon.DynamicProxy.Test.Classes;
 
 	/// 
 	/// Summary description for SerializableClassTestCase.
 	/// 
 	[TestFixture]
-	public class SerializableClassTestCase : Assertion
+	public class SerializableClassTestCase
 	{
 		[Test]
 		public void CreateSerializable()
@@ -35,7 +35,7 @@
 			MySerializableClass proxy = (MySerializableClass) 
 				generator.CreateClassProxy( typeof(MySerializableClass), new StandardInvocationHandler(myClass)
);
 
-			Assert( proxy.GetType().IsSerializable );
+			Assert.IsTrue( proxy.GetType().IsSerializable );
 		}
 	}
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47444 - avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest
2004-09-29T02:28:26Z

Author: hammett
Date: Tue Sep 28 19:28:25 2004
New Revision: 47444

Removed:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/
Log:
Reorganizing directories.

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47443 - in avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src: . DynamicProxy DynamicProxy/Builder DynamicProxy/Builder/CodeGenerators DynamicProxyTest DynamicProxyTest/ClassInterfaces DynamicProxyTest/Classes
2004-09-29T02:27:47Z

Author: hammett
Date: Tue Sep 28 19:27:47 2004
New Revision: 47443

Added:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/ModuleScope.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/OpCodesDictionary.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/GeneratorContext.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/IProxyBuilder.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/IInvocationHandler.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/StandardInvocationHandler.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/AssemblyInfo.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CachedTypeTestCase.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IMyInterface.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IMySecondInterface.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IServiceStatus.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/MyInterfaceImpl.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/MySecondInterfaceImpl.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/ServiceStatusImpl.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/MySerializableClass.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/NoVirtualMethodClass.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/SealedMethodsClass.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/ServiceClass.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/SpecializedServiceClass.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs   (contents, props changed)
Log:
Reorganizing directories.

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,150 @@
+
+    
+        
+            
+                
+                
+            
+            
+                
+                
+                
+            
+        
+        
+            
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+            
+        
+    
+
+

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,32 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Avalon DynamicProxy")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("The Apache Software Foundation")]
+[assembly: AssemblyProduct("Avalon DynamicProxy")]
+[assembly: AssemblyCopyright("Copyright (c) 2004 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+[assembly: AssemblyVersion("1.0.0.1")]
+
+#if STRONG
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("../../../../ApacheAvalon.snk")]
+[assembly: AssemblyKeyName("")]
+#endif

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,472 @@
+using System.Text;
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder.CodeGenerators
+{
+	using System;
+	using System.Collections;
+	using System.Reflection;
+	using System.Reflection.Emit;
+
+	/// 
+	/// Summary description for BaseCodeGenerator.
+	/// 
+	public abstract class BaseCodeGenerator
+	{
+
+		private Type m_baseType = typeof (Object);
+		private TypeBuilder m_typeBuilder;
+		private FieldBuilder m_handlerField;
+		private ConstructorBuilder m_constBuilder;
+		private IList m_generated = new ArrayList();
+
+		private GeneratorContext m_context;
+		private ModuleScope m_moduleScope;
+
+		protected BaseCodeGenerator(ModuleScope moduleScope) : this(moduleScope, new GeneratorContext())
+		{
+		}
+
+		protected BaseCodeGenerator(ModuleScope moduleScope, GeneratorContext context)
+		{
+			m_moduleScope = moduleScope;
+			m_context = context;
+		}
+
+		protected ModuleScope ModuleScope
+		{
+			get { return m_moduleScope; }
+		}
+
+		protected GeneratorContext Context
+		{
+			get { return m_context; }
+		}
+
+		protected TypeBuilder MainTypeBuilder
+		{
+			get { return m_typeBuilder; }
+		}
+
+		protected FieldBuilder HandlerFieldBuilder
+		{
+			get { return m_handlerField; }
+		}
+
+		protected ConstructorBuilder DefaultConstructorBuilder
+		{
+			get { return m_constBuilder; }
+		}
+
+		protected Type GetFromCache( Type baseClass, Type[] interfaces )
+		{
+			return ModuleScope[ GenerateTypeName( baseClass, interfaces ) ] as Type;
+		}
+
+		protected void RegisterInCache( Type generatedType )
+		{
+			ModuleScope[ generatedType.Name ] = generatedType;
+		}
+
+		protected virtual TypeBuilder CreateTypeBuilder(Type baseType, Type[] interfaces)
+		{
+			String typeName = GenerateTypeName(baseType, interfaces);
+
+			ModuleBuilder moduleBuilder = ModuleScope.ObtainDynamicModule();
+
+			TypeAttributes flags = TypeAttributes.Public | TypeAttributes.Class; 
+
+			if (baseType != typeof(Object))
+			{
+				if (baseType.IsSerializable)
+				{
+					flags |= TypeAttributes.Serializable;
+				}
+			}
+
+			m_baseType = baseType;
+			m_typeBuilder = moduleBuilder.DefineType(
+				typeName, flags, baseType, interfaces);
+
+			m_handlerField = GenerateField();
+			m_constBuilder = GenerateConstructor();
+
+			return m_typeBuilder;
+		}
+
+		protected virtual String GenerateTypeName(Type type, Type[] interfaces)
+		{
+			StringBuilder sb = new StringBuilder();
+			foreach(Type inter in interfaces)
+			{
+				sb.Append('_');
+				sb.Append(inter.Name);
+			}
+			/// Naive implementation
+			return String.Format("ProxyType{0}{1}", type.Name, sb.ToString());
+		}
+
+		protected virtual void EnhanceType()
+		{
+			if (Context.EnhanceType != null)
+			{
+				Context.EnhanceType(MainTypeBuilder, HandlerFieldBuilder, DefaultConstructorBuilder);
+			}
+		}
+
+		protected virtual Type[] ScreenInterfaces(Type[] interfaces)
+		{
+			if (Context.ScreenInterfaces != null)
+			{
+				interfaces = Context.ScreenInterfaces(interfaces);
+			}
+
+			return interfaces;
+		}
+
+		protected virtual Type CreateType()
+		{
+			Type newType = MainTypeBuilder.CreateType();
+
+			RegisterInCache( newType );
+
+			return newType;
+		}
+
+		/// 
+		/// Generates a public field holding the 
+		/// 
+		///  instance
+		protected FieldBuilder GenerateField()
+		{
+			return GenerateField("handler", typeof (IInvocationHandler));
+		}
+
+		/// 
+		/// Generates a public field
+		/// 
+		/// Field's name
+		/// Field's type
+		/// 
+		protected FieldBuilder GenerateField(String name, Type type)
+		{
+			return m_typeBuilder.DefineField(name,
+			                                 typeof (IInvocationHandler), FieldAttributes.Public);
+		}
+
+		/// 
+		/// Generates one public constructor receiving 
+		/// the  instance.
+		/// 
+		///  instance
+		protected ConstructorBuilder GenerateConstructor()
+		{
+			ConstructorBuilder consBuilder = m_typeBuilder.DefineConstructor(
+				MethodAttributes.Public,
+				CallingConventions.Standard,
+				new Type[] {typeof (IInvocationHandler)});
+
+			ILGenerator ilGenerator = consBuilder.GetILGenerator();
+			ilGenerator.Emit(OpCodes.Ldarg_0);
+			ilGenerator.Emit(OpCodes.Call, m_baseType.GetConstructor(new Type[0]));
+			ilGenerator.Emit(OpCodes.Ldarg_0);
+			ilGenerator.Emit(OpCodes.Ldarg_1);
+			ilGenerator.Emit(OpCodes.Stfld, m_handlerField);
+			ilGenerator.Emit(OpCodes.Ret);
+
+			return consBuilder;
+		}
+
+		/// 
+		/// 
+		/// 
+		/// 
+		protected void GenerateInterfaceImplementation(Type[] interfaces)
+		{
+			foreach(Type inter in interfaces)
+			{
+				if (!Context.ShouldSkip(inter))
+				{
+					GenerateTypeImplementation(inter, false);
+				}
+			}
+		}
+
+		/// 
+		/// Iterates over the interfaces and generate implementation 
+		/// for each method in it.
+		/// 
+		/// Type class
+		/// Interface type
+		protected void GenerateTypeImplementation(Type type, bool ignoreInterfaces)
+		{
+			if (m_generated.Contains(type))
+			{
+				return;
+			}
+			else
+			{
+				m_generated.Add(type);
+			}
+
+			if (!ignoreInterfaces)
+			{
+				Type[] baseInterfaces = type.FindInterfaces(new TypeFilter(NoFilterImpl), type);
+
+				GenerateInterfaceImplementation(baseInterfaces);
+			}
+
+			PropertyBuilder[] propertiesBuilder = GenerateProperties(type);
+			GenerateMethods(type, propertiesBuilder);
+		}
+
+		protected virtual PropertyBuilder[] GenerateProperties(Type inter)
+		{
+			PropertyInfo[] properties = inter.GetProperties();
+			PropertyBuilder[] propertiesBuilder = new PropertyBuilder[properties.Length];
+
+			for(int i = 0; i < properties.Length; i++)
+			{
+				propertiesBuilder[i] = GeneratePropertyImplementation(properties[i]);
+			}
+
+			return propertiesBuilder;
+		}
+
+		protected virtual void GenerateMethods(Type inter, PropertyBuilder[] propertiesBuilder)
+		{
+			MethodInfo[] methods = inter.GetMethods();
+
+			foreach(MethodInfo method in methods)
+			{
+				GenerateMethodImplementation(method, propertiesBuilder);
+			}
+		}
+
+		/// 
+		/// Generate property implementation
+		/// 
+		/// 
+		protected PropertyBuilder GeneratePropertyImplementation(PropertyInfo property)
+		{
+			return m_typeBuilder.DefineProperty(
+				property.Name, property.Attributes, property.PropertyType, null);
+		}
+
+		/// 
+		/// Generates implementation for each method.
+		/// 
+		/// 
+		/// 
+		protected void GenerateMethodImplementation(
+			MethodInfo method, PropertyBuilder[] properties)
+		{
+			if (method.IsFinal)
+			{
+				return;
+			}
+
+			ParameterInfo[] parameterInfo = method.GetParameters();
+
+			Type[] parameters = new Type[parameterInfo.Length];
+
+			for(int i = 0; i < parameterInfo.Length; i++)
+			{
+				parameters[i] = parameterInfo[i].ParameterType;
+			}
+
+			MethodAttributes atts = MethodAttributes.Public | MethodAttributes.Virtual;
+
+			if (method.Name.StartsWith("set_") || method.Name.StartsWith("get_"))
+			{
+				atts = MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.Virtual;
+			}
+
+			MethodBuilder methodBuilder =
+				m_typeBuilder.DefineMethod(method.Name, atts, CallingConventions.Standard,
+				                           method.ReturnType, parameters);
+
+			if (method.Name.StartsWith("set_") || method.Name.StartsWith("get_"))
+			{
+				foreach(PropertyBuilder property in properties)
+				{
+					if (property == null)
+					{
+						break;
+					}
+
+					if (!property.Name.Equals(method.Name.Substring(4)))
+					{
+						continue;
+					}
+
+					if (methodBuilder.Name.StartsWith("set_"))
+					{
+						property.SetSetMethod(methodBuilder);
+						break;
+					}
+					else
+					{
+						property.SetGetMethod(methodBuilder);
+						break;
+					}
+				}
+			}
+
+			WriteILForMethod(method, methodBuilder, parameters, HandlerFieldBuilder);
+		}
+
+		/// 
+		/// Writes the stack for the method implementation. This 
+		/// method generates the IL stack for property get/set method and
+		/// ordinary methods.
+		/// 
+		/// 
+		/// The method implementation would be as simple as:
+		/// 
+		/// public void SomeMethod( int parameter )
+		/// {
+		///     MethodBase method = MethodBase.GetCurrentMethod();
+		///     handler.Invoke( this, method, new object[] { parameter } );
+		/// }
+		/// 
+		/// 
+		///  being constructed.
+		/// 
+		/// 
+		protected void WriteILForMethod(MethodInfo method, MethodBuilder builder,
+		                                Type[] parameters, FieldBuilder handlerField)
+		{
+			int arrayPositionInStack = 1;
+
+			ILGenerator ilGenerator = builder.GetILGenerator();
+
+			ilGenerator.DeclareLocal(typeof (MethodBase));
+
+			if (builder.ReturnType != typeof (void))
+			{
+				ilGenerator.DeclareLocal(builder.ReturnType);
+				arrayPositionInStack = 2;
+			}
+
+			ilGenerator.DeclareLocal(typeof (object[]));
+
+			ilGenerator.Emit(OpCodes.Ldtoken, method);
+			ilGenerator.Emit(OpCodes.Call, typeof (MethodBase).GetMethod("GetMethodFromHandle"));
+
+			ilGenerator.Emit(OpCodes.Stloc_0);
+			ilGenerator.Emit(OpCodes.Ldarg_0);
+			ilGenerator.Emit(OpCodes.Ldfld, handlerField);
+			ilGenerator.Emit(OpCodes.Ldarg_0);
+			ilGenerator.Emit(OpCodes.Ldloc_0);
+			ilGenerator.Emit(OpCodes.Ldc_I4, parameters.Length);
+			ilGenerator.Emit(OpCodes.Newarr, typeof (object));
+
+			if (parameters.Length != 0)
+			{
+				ilGenerator.Emit(OpCodes.Stloc, arrayPositionInStack);
+				ilGenerator.Emit(OpCodes.Ldloc, arrayPositionInStack);
+			}
+
+			for(int c = 0; c < parameters.Length; c++)
+			{
+				ilGenerator.Emit(OpCodes.Ldc_I4, c);
+				ilGenerator.Emit(OpCodes.Ldarg, c + 1);
+
+				if (parameters[c].IsValueType)
+				{
+					ilGenerator.Emit(OpCodes.Box, parameters[c].UnderlyingSystemType);
+				}
+
+				ilGenerator.Emit(OpCodes.Stelem_Ref);
+				ilGenerator.Emit(OpCodes.Ldloc, arrayPositionInStack);
+			}
+
+			ilGenerator.Emit(OpCodes.Callvirt, typeof (IInvocationHandler).GetMethod("Invoke"));
+
+			if (builder.ReturnType != typeof (void))
+			{
+				if (!builder.ReturnType.IsValueType)
+				{
+					ilGenerator.Emit(OpCodes.Castclass, builder.ReturnType);
+				}
+				else
+				{
+					ilGenerator.Emit(OpCodes.Unbox, builder.ReturnType);
+					ilGenerator.Emit(ConvertTypeToOpCode(builder.ReturnType));
+				}
+
+				ilGenerator.Emit(OpCodes.Stloc, 1);
+
+				Label label = ilGenerator.DefineLabel();
+				ilGenerator.Emit(OpCodes.Br_S, label);
+				ilGenerator.MarkLabel(label);
+				ilGenerator.Emit(OpCodes.Ldloc, 1);
+			}
+			else
+			{
+				ilGenerator.Emit(OpCodes.Pop);
+			}
+
+			ilGenerator.Emit(OpCodes.Ret);
+		}
+
+		/// 
+		/// Converts a Value type to a correspondent OpCode of 
+		/// 
+		/// 
+		/// 
+		protected virtual OpCode ConvertTypeToOpCode(Type type)
+		{
+			if (type.IsEnum)
+			{
+				Enum baseType = (Enum) Activator.CreateInstance(type);
+				TypeCode code = baseType.GetTypeCode();
+
+				switch(code)
+				{
+					case TypeCode.Byte:
+						type = typeof (Byte);
+						break;
+					case TypeCode.Int16:
+						type = typeof (Int16);
+						break;
+					case TypeCode.Int32:
+						type = typeof (Int32);
+						break;
+					case TypeCode.Int64:
+						type = typeof (Int64);
+						break;
+				}
+
+				return ConvertTypeToOpCode(type);
+			}
+
+			OpCode opCode = OpCodesDictionary.Instance[ type ];
+
+			if (Object.ReferenceEquals(opCode, OpCodesDictionary.EmptyOpCode))
+			{
+				throw new ArgumentException("Type " + type + " could not be converted to a OpCode");
+			}
+
+			return opCode;
+		}
+
+		public static bool NoFilterImpl(Type type, object criteria)
+		{
+			return true;
+		}
+	}
+}
\ No newline at end of file

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,52 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder.CodeGenerators
+{
+	using System;
+
+	/// 
+	/// Summary description for ClassProxyGenerator.
+	/// 
+	public class ClassProxyGenerator : BaseCodeGenerator
+	{
+		public ClassProxyGenerator(ModuleScope scope) : base(scope)
+		{
+		}
+
+		public ClassProxyGenerator(ModuleScope scope, GeneratorContext context) : base(scope, context)
+		{
+		}
+
+		public Type GenerateCode(Type baseClass)
+		{
+			Type[] interfaces = new Type[0];
+			interfaces = ScreenInterfaces(interfaces);
+
+			Type cacheType = GetFromCache(baseClass, interfaces);
+			
+			if (cacheType != null)
+			{
+				return cacheType;
+			}
+
+			CreateTypeBuilder( baseClass, interfaces );
+			GenerateTypeImplementation( baseClass, true );
+
+			EnhanceType();
+
+			return CreateType();
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,52 @@
+ // Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder.CodeGenerators
+{
+	using System;
+
+	/// 
+	/// Summary description for InterfaceProxyGenerator.
+	/// 
+	public class InterfaceProxyGenerator : BaseCodeGenerator
+	{
+		public InterfaceProxyGenerator(ModuleScope scope) : base(scope)
+		{
+		}
+
+		public InterfaceProxyGenerator(ModuleScope scope, GeneratorContext context) : base(scope, context)
+		{
+		}
+
+		public virtual Type GenerateCode(Type[] interfaces)
+		{
+			interfaces = ScreenInterfaces(interfaces);
+
+			Type cacheType = GetFromCache(typeof(Object), interfaces);
+			
+			if (cacheType != null)
+			{
+				return cacheType;
+			}
+
+			CreateTypeBuilder( typeof(Object), interfaces );
+			GenerateInterfaceImplementation( interfaces );
+
+			EnhanceType();
+
+			return CreateType();
+		}
+
+	}
+}
\ No newline at end of file

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/ModuleScope.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/ModuleScope.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,80 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder.CodeGenerators
+{
+	using System;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Collections;
+
+	/// 
+	/// Summary description for ModuleScope.
+	/// 
+	public class ModuleScope
+	{
+		private static readonly String FILE_NAME = "GeneratedAssembly.dll";
+
+		/// 
+		/// Avoid leaks caused by non disposal of generated types.
+		/// 
+		private ModuleBuilder m_moduleBuilder = null;
+
+		/// 
+		/// Keep track of generated types
+		/// 
+		private Hashtable m_typeCache = Hashtable.Synchronized(new Hashtable());
+
+		/// 
+		/// Used to lock the module builder creation
+		/// 
+		private object m_lockobj = new object();
+
+		private AssemblyBuilder m_assemblyBuilder;
+
+		public ModuleBuilder ObtainDynamicModule()
+		{
+			lock (m_lockobj)
+			{
+				if (m_moduleBuilder == null)
+				{
+					AssemblyName assemblyName = new AssemblyName();
+					assemblyName.Name = "DynamicAssemblyProxyGen";
+
+#if ( DEBUG )
+					m_assemblyBuilder =
+						AppDomain.CurrentDomain.DefineDynamicAssembly(
+						assemblyName,
+						AssemblyBuilderAccess.RunAndSave);
+					m_moduleBuilder = m_assemblyBuilder.DefineDynamicModule(assemblyName.Name, FILE_NAME);
+#else
+					m_assemblyBuilder =
+						AppDomain.CurrentDomain.DefineDynamicAssembly(
+							assemblyName,
+							AssemblyBuilderAccess.Run);
+					m_moduleBuilder = m_assemblyBuilder.DefineDynamicModule(assemblyName.Name, true);
+#endif
+				}
+			}
+
+			return m_moduleBuilder;
+		}
+
+		public Type this[String name]
+		{
+			get { return m_typeCache[name] as Type; }
+			set { m_typeCache[name] = value; }
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/OpCodesDictionary.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/CodeGenerators/OpCodesDictionary.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,64 @@
+using System.Reflection.Emit;
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder.CodeGenerators
+{
+	using System;
+	using System.Collections;
+
+	/// 
+	/// Summary description for OpCodesDictionary.
+	/// 
+	public sealed class OpCodesDictionary : DictionaryBase
+	{
+		private static readonly OpCodesDictionary m_dict = new OpCodesDictionary();
+
+		private static readonly OpCode m_emptyOpCode = new OpCode();
+
+		private OpCodesDictionary() : base()
+		{
+			Dictionary[ typeof (Int16) ] = OpCodes.Ldind_I2;
+			Dictionary[ typeof (Int32) ] = OpCodes.Ldind_I4;
+			Dictionary[ typeof (Int64) ] = OpCodes.Ldind_I8;
+			Dictionary[ typeof (float) ] = OpCodes.Ldind_R4;
+			Dictionary[ typeof (double) ] = OpCodes.Ldind_R8;
+			Dictionary[ typeof (UInt16) ] = OpCodes.Ldind_U2;
+			Dictionary[ typeof (UInt32) ] = OpCodes.Ldind_U4;
+			Dictionary[ typeof (bool) ] = OpCodes.Ldind_I4;
+		}
+
+		public OpCode this[Type type]
+		{
+			get
+			{
+				if (Dictionary.Contains(type))
+				{
+					return (OpCode) Dictionary[ type ];
+				}
+				return EmptyOpCode;
+			}
+		}
+
+		public static OpCodesDictionary Instance
+		{
+			get { return m_dict; }
+		}
+
+		public static OpCode EmptyOpCode
+		{
+			get { return m_emptyOpCode; }
+		}
+	}
+}
\ No newline at end of file

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/DefaultProxyBuilder.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,60 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder
+{
+	using System;
+	using Apache.Avalon.DynamicProxy.Builder.CodeGenerators;
+
+	/// 
+	/// Summary description for DefaultProxyBuilder.
+	/// 
+	public class DefaultProxyBuilder : IProxyBuilder
+	{
+		ModuleScope m_scope = new ModuleScope();
+
+		public DefaultProxyBuilder()
+		{
+			
+		}
+
+		#region IProxyBuilder Members
+
+		public virtual Type CreateInterfaceProxy(Type[] interfaces)
+		{
+			InterfaceProxyGenerator generator = new InterfaceProxyGenerator(m_scope);
+			return generator.GenerateCode( interfaces );
+		}
+
+		public virtual Type CreateClassProxy(Type theClass)
+		{
+			ClassProxyGenerator generator = new ClassProxyGenerator(m_scope);
+			return generator.GenerateCode( theClass );
+		}
+
+		public virtual Type CreateCustomInterfaceProxy(Type[] interfaces, GeneratorContext context)
+		{
+			InterfaceProxyGenerator generator = new InterfaceProxyGenerator(m_scope, context);
+			return generator.GenerateCode( interfaces );
+		}
+
+		public virtual Type CreateCustomClassProxy(Type theClass, GeneratorContext context)
+		{
+			ClassProxyGenerator generator = new ClassProxyGenerator(m_scope, context);
+			return generator.GenerateCode( theClass );
+		}
+
+		#endregion
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/GeneratorContext.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/GeneratorContext.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,68 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy
+{
+	using System;
+	using System.Collections;
+
+	/// 
+	/// Summary description for GeneratorContext.
+	/// 
+	public sealed class GeneratorContext : DictionaryBase
+	{
+		private EnhanceTypeDelegate m_enhance;
+		private ScreenInterfacesDelegate m_screenInterfaces;
+		private IList m_skipInterfaces = new ArrayList();
+
+		public GeneratorContext()
+		{
+		}
+
+		public GeneratorContext(EnhanceTypeDelegate enhanceDelegate, 
+			ScreenInterfacesDelegate screenDelegate)
+		{
+			m_enhance = enhanceDelegate;
+			m_screenInterfaces = screenDelegate;
+		}
+
+		public EnhanceTypeDelegate EnhanceType
+		{
+			get { return m_enhance; }
+			set { m_enhance = value; }
+		}
+
+		public ScreenInterfacesDelegate ScreenInterfaces
+		{
+			get { return m_screenInterfaces; }
+			set { m_screenInterfaces = value; }
+		}
+
+		public bool ShouldSkip( Type interfaceType )
+		{
+			return m_skipInterfaces.Contains( interfaceType );
+		}
+
+		public void AddInterfaceToSkip( Type interfaceType )
+		{
+			m_skipInterfaces.Add( interfaceType );
+		}
+
+		public object this[ String key ]
+		{
+			get { return Dictionary[key]; }
+			set { Dictionary[key] = value; }
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/IProxyBuilder.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Builder/IProxyBuilder.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,32 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder
+{
+	using System;
+
+	/// 
+	/// Summary description for IProxyBuilder.
+	/// 
+	public interface IProxyBuilder
+	{
+		Type CreateInterfaceProxy( Type[] interfaces );
+
+		Type CreateCustomInterfaceProxy( Type[] interfaces, GeneratorContext context );
+
+		Type CreateClassProxy( Type theClass );
+
+		Type CreateCustomClassProxy( Type theClass, GeneratorContext context );
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,29 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Avalon.DynamicProxy", "Apache.Avalon.DynamicProxy.csproj", "{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Avalon.DynamicProxy.Test", "DynamicProxyTest\Apache.Avalon.DynamicProxy.Test.csproj", "{EF89321E-FB2A-41B6-85B3-794D50A55CF1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}.Debug.ActiveCfg = Debug|.NET
+		{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}.Debug.Build.0 = Debug|.NET
+		{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}.Release.ActiveCfg = Release|.NET
+		{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}.Release.Build.0 = Release|.NET
+		{EF89321E-FB2A-41B6-85B3-794D50A55CF1}.Debug.ActiveCfg = Debug|.NET
+		{EF89321E-FB2A-41B6-85B3-794D50A55CF1}.Debug.Build.0 = Debug|.NET
+		{EF89321E-FB2A-41B6-85B3-794D50A55CF1}.Release.ActiveCfg = Release|.NET
+		{EF89321E-FB2A-41B6-85B3-794D50A55CF1}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/IInvocationHandler.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/IInvocationHandler.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,35 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy
+{
+	using System;
+	using System.Reflection;
+
+	/// 
+	/// Defines the handler that will receive all methods 
+	/// invoked on the proxy object.
+	/// 
+	public interface IInvocationHandler
+	{
+		/// 
+		/// Implementation should invoke the method on the real object.
+		/// 
+		/// proxy instance
+		///  being invoked.
+		/// Arguments of method - if any
+		/// Should return the result of method invocation
+		object Invoke(object proxy, MethodInfo method, params object[] arguments);
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ProxyGenerator.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,201 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy
+{
+	using System;
+	using System.Reflection.Emit;
+
+	using Apache.Avalon.DynamicProxy.Builder;
+
+	public delegate void EnhanceTypeDelegate( TypeBuilder mainType, FieldBuilder handlerFieldBuilder, ConstructorBuilder constructorBuilder );
+
+	public delegate Type[] ScreenInterfacesDelegate( Type[] interfaces );
+
+	/// 
+	/// Generates a Java style proxy. This overrides the .Net proxy requirements 
+	/// that forces one to extend MarshalByRefObject or (for a different purpose)
+	/// ContextBoundObject to have a Proxiable class.
+	/// 
+	/// 
+	/// The  should be used to generate a class 
+	/// implementing the specified interfaces. The class implementation will 
+	/// only call the internal  instance.
+	/// 
+	/// 
+	/// This proxy implementation currently doesn't not supports ref and out arguments 
+	/// in methods.
+	/// 
+	/// 
+	/// 
+	/// MyInvocationHandler handler = ...
+	/// ProxyGenerator generator = new ProxyGenerator();
+	/// IInterfaceExposed proxy = 
+	///		generator.CreateProxy( new Type[] { typeof(IInterfaceExposed) }, handler );
+	/// 
+	/// 
+	public class ProxyGenerator
+	{
+		private IProxyBuilder m_builder;
+
+		public ProxyGenerator(IProxyBuilder builder)
+		{
+			m_builder = builder;
+		}
+
+		public ProxyGenerator() : this( new DefaultProxyBuilder() )
+		{
+		}
+
+		public IProxyBuilder ProxyBuilder
+		{
+			get { return m_builder; }
+			set { m_builder = value; }
+		}
+
+		public virtual object CreateClassProxy(Type baseClass, IInvocationHandler handler)
+		{
+			AssertCreateClassProxyArguments(baseClass, handler);
+
+			Type newType = ProxyBuilder.CreateClassProxy(baseClass);
+			return CreateProxyInstance( newType, handler );
+		}
+
+		public virtual object CreateCustomClassProxy(Type baseClass, 
+			IInvocationHandler handler, GeneratorContext context)
+		{
+			AssertCreateClassProxyArguments(baseClass, handler, context);
+
+			Type newType = ProxyBuilder.CreateCustomClassProxy(baseClass, context);
+			return CreateProxyInstance( newType, handler, context );
+		}
+
+		/// 
+		/// Generates a proxy implementing all the specified interfaces and
+		/// redirecting method invocations to the specifed handler.
+		/// 
+		/// Interface to be implemented
+		/// instance of 
+		/// Proxy instance
+		public virtual object CreateProxy(Type theInterface, IInvocationHandler handler)
+		{
+			return CreateProxy(new Type[] {theInterface}, handler);
+		}
+
+		/// 
+		/// Generates a proxy implementing all the specified interfaces and
+		/// redirecting method invocations to the specifed handler.
+		/// 
+		/// Array of interfaces to be implemented
+		/// instance of 
+		/// Proxy instance
+		public virtual object CreateProxy(Type[] interfaces, IInvocationHandler handler)
+		{
+			AssertCreateProxyArguments(interfaces, handler);
+
+			Type newType = ProxyBuilder.CreateInterfaceProxy(interfaces);
+			return CreateProxyInstance( newType, handler );
+		}
+
+		/// 
+		/// 
+		/// 
+		/// 
+		/// 
+		/// 
+		/// 
+		public virtual object CreateCustomProxy(Type theInterface, 
+			IInvocationHandler handler, 
+			GeneratorContext context )
+		{
+			return CreateCustomProxy( new Type[] { theInterface }, handler, context );
+		}
+
+		/// 
+		/// 
+		/// 
+		/// 
+		/// 
+		/// 
+		/// 
+		public virtual object CreateCustomProxy(Type[] interfaces, 
+			IInvocationHandler handler, GeneratorContext context )
+		{
+			AssertCreateProxyArguments( interfaces, handler, context );
+			Type newType = ProxyBuilder.CreateCustomInterfaceProxy(interfaces, context);
+			return CreateProxyInstance( newType, handler, context );
+		}
+
+		protected virtual object CreateProxyInstance(Type type, IInvocationHandler handler)
+		{
+			return Activator.CreateInstance(type, new object[] {handler});
+		}
+
+		protected virtual object CreateProxyInstance(Type type, IInvocationHandler handler, GeneratorContext context)
+		{
+			return CreateProxyInstance( type, handler );
+		}
+
+		protected static void AssertCreateProxyArguments(Type[] interfaces, IInvocationHandler handler)
+		{
+			if (interfaces == null)
+			{
+				throw new ArgumentNullException("interfaces");
+			}
+			if (handler == null)
+			{
+				throw new ArgumentNullException("handler");
+			}
+			if (interfaces.Length == 0)
+			{
+				throw new ArgumentException("Can't handle an empty interface array");
+			}
+		}
+
+		protected static void AssertCreateProxyArguments(Type[] interfaces, IInvocationHandler handler, GeneratorContext context)
+		{
+			AssertCreateProxyArguments(interfaces, handler);
+
+			if (context == null)
+			{
+				throw new ArgumentNullException("context");
+			}
+		}
+
+		protected static void AssertCreateClassProxyArguments(Type baseClass, IInvocationHandler handler)
+		{
+			if (baseClass == null)
+			{
+				throw new ArgumentNullException("theClass");
+			}
+			if (baseClass.IsInterface)
+			{
+				throw new ArgumentException("'baseClass' must be a class, not an interface");
+			}
+			if (handler == null)
+			{
+				throw new ArgumentNullException("handler");
+			}
+		}
+
+		protected static void AssertCreateClassProxyArguments(Type baseClass, IInvocationHandler handler, GeneratorContext context)
+		{
+			AssertCreateClassProxyArguments(baseClass, handler);
+			if (context == null)
+			{
+				throw new ArgumentNullException("context");
+			}
+		}
+	}
+}
\ No newline at end of file

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/StandardInvocationHandler.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/StandardInvocationHandler.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,68 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy
+{
+	using System;
+
+	/// 
+	/// Provides a standard implementation of .
+	/// Methods PreInvoke, PostInvoke can be overrided to customize its behavior.
+	/// 
+	public class StandardInvocationHandler : IInvocationHandler
+	{
+		private object m_target;
+
+		public StandardInvocationHandler(object target)
+		{
+			if (target == null)
+			{
+				throw new ArgumentNullException("target");
+			}
+
+			m_target = target;
+		}
+
+		protected virtual void PreInvoke(object proxy, System.Reflection.MethodInfo method, params object[] arguments)
+		{
+		}
+
+		protected virtual void PostInvoke(object proxy, System.Reflection.MethodInfo method, ref object returnValue, params object[] arguments)
+		{
+		}
+
+		#region IInvocationHandler Members
+
+		public virtual object Invoke(object proxy, System.Reflection.MethodInfo method, params object[] arguments)
+		{
+			PreInvoke(proxy, method, arguments);
+
+			object returnValue = method.Invoke( Target, arguments );
+
+			PostInvoke(proxy, method, ref returnValue, arguments);
+			
+			return returnValue;
+		}
+
+		#endregion
+
+		public object Target
+		{
+			get
+			{
+				return m_target;
+			}
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,181 @@
+
+    
+        
+            
+                
+                
+            
+            
+                
+                
+                
+                
+                
+            
+        
+        
+            
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+            
+        
+    
+
+

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/AssemblyInfo.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/AssemblyInfo.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,27 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Avalon DynamicProxy Test cases")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("The Apache Software Foundation")]
+[assembly: AssemblyProduct("Avalon DynamicProxy Test cases")]
+[assembly: AssemblyCopyright("Copyright (c) 2004 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+[assembly: AssemblyVersion("1.0.0.1")]
+

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CachedTypeTestCase.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CachedTypeTestCase.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,47 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test
+{
+	using System;
+
+	using NUnit.Framework;
+
+	using Apache.Avalon.DynamicProxy.Test.Classes;
+
+	/// 
+	/// Summary description for CachedTypeTestCase.
+	/// 
+	[TestFixture]
+	public class CachedTypeTestCase
+	{
+		private ProxyGenerator m_generator = new ProxyGenerator();
+
+		[Test]
+		public void CachedClassProxies()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(ServiceClass), new StandardInvocationHandler( new ServiceClass() ) );
+			
+			Assert.IsNotNull(proxy);
+			Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+
+			proxy = m_generator.CreateClassProxy( 
+				typeof(ServiceClass), new StandardInvocationHandler( new ServiceClass() ) );
+			
+			Assert.IsNotNull(proxy);
+			Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IMyInterface.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IMyInterface.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,40 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.ClassInterfaces
+{
+	using System;
+
+	/// 
+	/// Summary description for IMyInterface.
+	/// 
+	public interface IMyInterface
+	{
+		String Name
+		{
+			get;
+			set;
+		}
+
+		bool Started
+		{
+			get;
+			set;
+		}
+
+		int Calc(int x, int y);
+
+		int Calc(int x, int y, int z, Single k);
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IMySecondInterface.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IMySecondInterface.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,30 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.ClassInterfaces
+{
+	using System;
+
+	/// 
+	/// Summary description for IMySecondInterface.
+	/// 
+	public interface IMySecondInterface : IMyInterface
+	{
+		String Address
+		{
+			get;
+			set;
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IServiceStatus.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/IServiceStatus.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,45 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.ClassInterfaces
+{
+	using System;
+
+	/// 
+	/// Simple enum declaration
+	/// 
+	public enum State
+	{
+		Valid, 
+		Invalid
+	}
+
+	/// 
+	/// Summary description for IServiceStatus.
+	/// 
+	public interface IServiceStatus
+	{
+		int Requests
+		{
+			get;
+		}
+
+		State ActualState
+		{
+			get;
+		}
+
+		void ChangeState(State state);
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/MyInterfaceImpl.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/MyInterfaceImpl.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,69 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.ClassInterfaces
+{
+	using System;
+
+	/// 
+	/// Summary description for MyInterfaceImpl.
+	/// 
+	public class MyInterfaceImpl : IMyInterface
+	{
+		private String m_name;
+		private bool m_started;
+
+		public MyInterfaceImpl()
+		{
+		}
+
+		#region IMyInterface Members
+
+		public String Name
+		{
+			get
+			{
+				return m_name;
+			}
+			set
+			{
+				m_name = value;
+			}
+		}
+
+		public bool Started
+		{
+			get
+			{
+				return m_started;
+			}
+			set
+			{
+				m_started = value;
+			}
+		}
+
+		public virtual int Calc(int x, int y)
+		{
+			return x + y;
+		}
+
+		public virtual int Calc(int x, int y, int z, Single k)
+		{
+			return x + y + z + (int)k;
+		}
+
+		#endregion
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/MySecondInterfaceImpl.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/MySecondInterfaceImpl.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,46 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.ClassInterfaces
+{
+	using System;
+
+	/// 
+	/// Summary description for MySecondInterfaceImpl.
+	/// 
+	public class MySecondInterfaceImpl : MyInterfaceImpl, IMySecondInterface
+	{
+		private String m_address;
+
+		public MySecondInterfaceImpl()
+		{
+		}
+
+		#region IMySecondInterface Members
+
+		public String Address
+		{
+			get
+			{
+				return m_address;
+			}
+			set
+			{
+				m_address = value;
+			}
+		}
+
+		#endregion
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/ServiceStatusImpl.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ClassInterfaces/ServiceStatusImpl.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,55 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.ClassInterfaces
+{
+	using System;
+
+	/// 
+	/// Summary description for ServiceStatusImpl.
+	/// 
+	public class ServiceStatusImpl : IServiceStatus
+	{
+		private State m_state = State.Invalid;
+
+		public ServiceStatusImpl()
+		{
+		}
+
+		#region IServiceStatus Members
+
+		public int Requests
+		{
+			get
+			{
+				return 10;
+			}
+		}
+
+		public State ActualState
+		{
+			get
+			{
+				return m_state;
+			}
+		}
+
+		public void ChangeState(State state)
+		{
+			m_state = state;
+		}
+
+		#endregion
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/MySerializableClass.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/MySerializableClass.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,30 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.Classes
+{
+	using System;
+
+	/// 
+	/// Summary description for MySerializableClass.
+	/// 
+	[Serializable]
+	public class MySerializableClass
+	{
+		public double CalculateSumDistanceNow()
+		{
+			return Math.PI;
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/NoVirtualMethodClass.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/NoVirtualMethodClass.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,29 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.Classes
+{
+	using System;
+
+	/// 
+	/// Summary description for NoVirtualMethodClass.
+	/// 
+	public class NoVirtualMethodClass
+	{
+		public int Sum(int b1, int b2)
+		{
+			return b1 + b2;
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/SealedMethodsClass.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/SealedMethodsClass.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,29 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.Classes
+{
+	using System;
+
+	/// 
+	/// Summary description for SealedMethodsClass.
+	/// 
+	public class SealedMethodsClass : ServiceClass
+	{
+		public override sealed int Sum(int b1, int b2)
+		{
+			return b1 + b2;
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/ServiceClass.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/ServiceClass.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,74 @@
+ // Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.Classes
+{
+	using System;
+
+	/// 
+	/// Summary description for ServiceClass.
+	/// 
+	public class ServiceClass
+	{
+		public virtual int Sum(int b1, int b2)
+		{
+			return b1 + b2;
+		}
+
+		public virtual byte Sum(byte b1, byte b2)
+		{
+			return System.Convert.ToByte( b1 + b2 );
+		}
+
+		public virtual long Sum(long b1, long b2)
+		{
+			return b1 + b2;
+		}
+
+		public virtual short Sum(short b1, short b2)
+		{
+			return (short) (b1 + b2);
+		}
+
+		public virtual float Sum(float b1, float b2)
+		{
+			return b1 + b2;
+		}
+
+		public virtual double Sum(double b1, double b2)
+		{
+			return b1 + b2;
+		}
+
+		public virtual UInt16 Sum(UInt16 b1, UInt16 b2)
+		{
+			return (UInt16) (b1 + b2);
+		}
+
+		public virtual UInt32 Sum(UInt32 b1, UInt32 b2)
+		{
+			return b1 + b2;
+		}
+
+		public virtual UInt64 Sum(UInt64 b1, UInt64 b2)
+		{
+			return b1 + b2;
+		}
+
+		public virtual bool Valid
+		{
+			get { return true; }
+		}
+	}
+}
\ No newline at end of file

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/SpecializedServiceClass.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Classes/SpecializedServiceClass.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,29 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.Classes
+{
+	using System;
+
+	/// 
+	/// Summary description for SpecializedServiceClass.
+	/// 
+	public class SpecializedServiceClass : ServiceClass
+	{
+		public virtual int Subtract(int b1, int b2)
+		{
+			return b1 - b2;
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,96 @@
+using Apache.Avalon.DynamicProxy.Test.Classes;
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test
+{
+	using System;
+	using System.Reflection.Emit;
+
+	using NUnit.Framework;
+
+	using Apache.Avalon.DynamicProxy.Test.ClassInterfaces;
+
+	/// 
+	/// Summary description for CustomProxyGeneratorTestCase.
+	/// 
+	[TestFixture]
+	public class CustomProxyGeneratorTestCase : Assertion
+	{
+		private ProxyGenerator m_generator;
+		private bool m_enhanceInvoked;
+		private bool m_screenInvoked;
+
+		[SetUp]
+		public void Init()
+		{
+			m_generator = new ProxyGenerator();
+			m_enhanceInvoked = false;
+			m_screenInvoked = false;
+		}
+
+		[Test]
+		public void CreateCustomProxy()
+		{
+			GeneratorContext context = new GeneratorContext( 
+				new EnhanceTypeDelegate(EnhanceType),
+				new ScreenInterfacesDelegate(ScreenInterfaces));
+
+			object proxy = m_generator.CreateCustomProxy(
+				typeof (IMyInterface), 
+				new StandardInvocationHandler(new MyInterfaceImpl()), context);
+
+			Assert( m_enhanceInvoked );
+			Assert( m_screenInvoked );
+		}
+
+		[Test]
+		public void CreateCustomClassProxy()
+		{
+			GeneratorContext context = new GeneratorContext( 
+				new EnhanceTypeDelegate(EnhanceType),
+				new ScreenInterfacesDelegate(ScreenInterfaces));
+
+			object proxy = m_generator.CreateCustomClassProxy(
+				typeof (ServiceClass), 
+				new StandardInvocationHandler(new ServiceClass()),
+				context);
+
+			Assert( m_enhanceInvoked );
+			Assert( m_screenInvoked );
+		}
+
+		private void EnhanceType(TypeBuilder mainType, FieldBuilder handlerFieldBuilder, ConstructorBuilder constructorBuilder)
+		{
+			Assert( !m_enhanceInvoked );
+
+			AssertNotNull(mainType);
+			AssertNotNull(handlerFieldBuilder);
+			AssertNotNull(constructorBuilder);
+
+			m_enhanceInvoked = true;
+		}
+
+		private Type[] ScreenInterfaces(Type[] interfaces)
+		{
+			Assert( !m_screenInvoked );
+
+			AssertNotNull(interfaces);
+
+			m_screenInvoked = true;
+
+			return interfaces;
+		}
+	}
+}
\ No newline at end of file

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,239 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test
+{
+	using System;
+	using System.Reflection;
+
+	using NUnit.Framework;
+
+	using Apache.Avalon.DynamicProxy;
+	using Apache.Avalon.DynamicProxy.Test.Classes;
+	using Apache.Avalon.DynamicProxy.Test.ClassInterfaces;
+
+	/// 
+	/// Summary description for ProxyGeneratorTestCase.
+	/// 
+	[TestFixture]
+	public class ProxyGeneratorTestCase : Assertion
+	{
+		private ProxyGenerator m_generator;
+
+		[SetUp]
+		public void Init()
+		{
+			m_generator = new ProxyGenerator();
+		}
+
+		[Test]
+		public void ProxyForClass()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(ServiceClass), new ResultModifiedInvocationHandler( new ServiceClass() ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+
+			ServiceClass inter = (ServiceClass) proxy;
+
+			AssertEquals( 44, inter.Sum( 20, 25 ) );
+			AssertEquals( true, inter.Valid );
+		}
+
+		[Test]
+		public void ProxyForClassWithSuperClass()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(SpecializedServiceClass), new ResultModifiedInvocationHandler( new SpecializedServiceClass() ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+			Assert( typeof(SpecializedServiceClass).IsAssignableFrom( proxy.GetType() ) );
+
+			SpecializedServiceClass inter = (SpecializedServiceClass) proxy;
+
+			AssertEquals( 44, inter.Sum( 20, 25 ) );
+			AssertEquals( -6, inter.Subtract( 20, 25 ) );
+			AssertEquals( true, inter.Valid );
+		}
+
+		[Test]
+		public void ProxyForClassWhichImplementsInterfaces()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(MyInterfaceImpl), new ResultModifiedInvocationHandler( new MyInterfaceImpl() ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(MyInterfaceImpl).IsAssignableFrom( proxy.GetType() ) );
+			Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
+
+			IMyInterface inter = (IMyInterface) proxy;
+
+			AssertEquals( 44, inter.Calc( 20, 25 ) );
+		}
+
+		[Test]
+		public void ProxyingClassWithoutVirtualMethods()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(NoVirtualMethodClass), new ResultModifiedInvocationHandler( new SpecializedServiceClass() ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(NoVirtualMethodClass).IsAssignableFrom( proxy.GetType() ) );
+
+			NoVirtualMethodClass inter = (NoVirtualMethodClass) proxy;
+
+			AssertEquals( 45, inter.Sum( 20, 25 ) );
+		}
+
+		[Test]
+		public void ProxyingClassWithSealedMethods()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(SealedMethodsClass), new ResultModifiedInvocationHandler( new SpecializedServiceClass() ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(SealedMethodsClass).IsAssignableFrom( proxy.GetType() ) );
+
+			SealedMethodsClass inter = (SealedMethodsClass) proxy;
+
+			AssertEquals( 45, inter.Sum( 20, 25 ) );
+		}
+
+		[Test]
+		public void CreateClassProxyInvalidArguments()
+		{
+			try
+			{
+				m_generator.CreateClassProxy( 
+					typeof(ICloneable), new StandardInvocationHandler( new SpecializedServiceClass() ) );
+			}
+			catch(ArgumentException)
+			{
+				// Expected
+			}
+
+			try
+			{
+				m_generator.CreateClassProxy( 
+					null, new StandardInvocationHandler( new SpecializedServiceClass() ) );
+			}
+			catch(ArgumentNullException)
+			{
+				// Expected
+			}
+
+			try
+			{
+				m_generator.CreateClassProxy( 
+					typeof(SpecializedServiceClass), null );
+			}
+			catch(ArgumentNullException)
+			{
+				// Expected
+			}
+		}
+
+		[Test]
+		public void TestGenerationSimpleInterface()
+		{
+			object proxy = m_generator.CreateProxy( 
+				typeof(IMyInterface), new StandardInvocationHandler( new MyInterfaceImpl() ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
+
+			IMyInterface inter = (IMyInterface) proxy;
+
+			AssertEquals( 45, inter.Calc( 20, 25 ) );
+
+			inter.Name = "opa";
+			AssertEquals( "opa", inter.Name );
+
+			inter.Started = true;
+			AssertEquals( true, inter.Started );
+		}
+
+		[Test]
+		public void TestGenerationWithInterfaceHeritage()
+		{
+			object proxy = m_generator.CreateProxy( 
+				typeof(IMySecondInterface), new StandardInvocationHandler( new MySecondInterfaceImpl() ) );
+
+			AssertNotNull( proxy );
+			Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType() ) );
+			Assert( typeof(IMySecondInterface).IsAssignableFrom( proxy.GetType() ) );
+
+			IMySecondInterface inter = (IMySecondInterface) proxy;
+			inter.Calc(1, 1);
+
+			inter.Name = "hammett";
+			AssertEquals( "hammett", inter.Name );
+
+			inter.Address = "pereira leite, 44";
+			AssertEquals( "pereira leite, 44", inter.Address );
+			
+			AssertEquals( 45, inter.Calc( 20, 25 ) );
+		}
+
+		[Test]
+		public void TestEnumProperties()
+		{
+			ServiceStatusImpl service = new ServiceStatusImpl();
+
+			object proxy = m_generator.CreateProxy( 
+				typeof(IServiceStatus), new StandardInvocationHandler( service ) );
+			
+			AssertNotNull( proxy );
+			Assert( typeof(IServiceStatus).IsAssignableFrom( proxy.GetType() ) );
+
+			IServiceStatus inter = (IServiceStatus) proxy;
+			AssertEquals( State.Invalid, inter.ActualState );
+			
+			inter.ChangeState( State.Valid );
+			AssertEquals( State.Valid, inter.ActualState );
+		}
+
+		public class MyInterfaceProxy : IInvocationHandler
+		{
+			#region IInvocationHandler Members
+
+			public object Invoke(object proxy, MethodInfo method, params object[] arguments)
+			{
+				return null;
+			}
+
+			#endregion
+		}
+	}
+
+	public class ResultModifiedInvocationHandler : StandardInvocationHandler
+	{
+		public ResultModifiedInvocationHandler( object instanceDelegate ) : base(instanceDelegate)
+		{
+		}
+
+		protected override void PostInvoke(object proxy, System.Reflection.MethodInfo method, ref object returnValue, params object[] arguments)
+		{
+			if ( returnValue != null && returnValue.GetType() == typeof(int))
+			{
+				int value = (int) returnValue;
+				returnValue = --value;
+			}
+		}
+	}
+}
+
+

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs	Tue Sep 28 19:27:47 2004
@@ -0,0 +1,41 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test
+{
+	using System;
+
+	using NUnit.Framework;
+
+      using Apache.Avalon.DynamicProxy.Test.Classes;
+
+	/// 
+	/// Summary description for SerializableClassTestCase.
+	/// 
+	[TestFixture]
+	public class SerializableClassTestCase : Assertion
+	{
+		[Test]
+		public void CreateSerializable()
+		{
+			MySerializableClass myClass = new MySerializableClass();
+
+			ProxyGenerator generator = new ProxyGenerator();
+			MySerializableClass proxy = (MySerializableClass) 
+				generator.CreateClassProxy( typeof(MySerializableClass), new StandardInvocationHandler(myClass) );
+
+			Assert( proxy.GetType().IsSerializable );
+		}
+	}
+}

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47441 - avalon/trunk/central/laboratory/avalon-net/DynamicProxy
2004-09-29T02:12:52Z

Author: hammett
Date: Tue Sep 28 19:12:52 2004
New Revision: 47441

Removed:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy-compilations.build
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy-helper.build
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy.build
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/build.cmd
Log:


---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47291 - in avalon/trunk/central/laboratory/avalon-net/DynamicProxy: . Builder Builder/CodeGenerators DynamicProxyTest DynamicProxyTest/Classes
2004-09-27T14:34:27Z

Author: hammett
Date: Mon Sep 27 07:34:26 2004
New Revision: 47291

Added:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ModuleScope.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/CachedTypeTestCase.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Classes/MySerializableClass.cs   (contents, props changed)
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/SerializableClassTestCase.cs   (contents, props changed)
Modified:
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/DefaultProxyBuilder.cs
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy-compilations.build
   avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
Log:
added Type Cache and ModuleScope.

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Apache.Avalon.DynamicProxy.csproj	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Apache.Avalon.DynamicProxy.csproj	Mon Sep 27 07:34:26 2004
@@ -56,7 +56,7 @@
                     NoStdLib = "false"
                     NoWarn = ""
                     Optimize = "true"
-                    OutputPath = "bin\Release\"
+                    OutputPath = "..\..\bin\"
                     RegisterForComInterop = "false"
                     RemoveIntegerChecks = "false"
                     TreatWarningsAsErrors = "false"
@@ -130,6 +130,11 @@
                 />
                 
+                

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/BaseCodeGenerator.cs	Mon Sep 27 07:34:26 2004
@@ -1,4 +1,5 @@
- // Copyright 2004 The Apache Software Foundation
+using System.Text;
+// Copyright 2004 The Apache Software Foundation
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,24 +25,29 @@
 	/// 
 	public abstract class BaseCodeGenerator
 	{
-		private static readonly String FILE_NAME = "GeneratedAssembly.dll";
 
-		private Type m_baseType = typeof(Object);
-		private AssemblyBuilder m_assemblyBuilder;
+		private Type m_baseType = typeof (Object);
 		private TypeBuilder m_typeBuilder;
 		private FieldBuilder m_handlerField;
 		private ConstructorBuilder m_constBuilder;
 		private IList m_generated = new ArrayList();
 
 		private GeneratorContext m_context;
+		private ModuleScope m_moduleScope;
 
-		protected BaseCodeGenerator(GeneratorContext context)
+		protected BaseCodeGenerator(ModuleScope moduleScope) : this(moduleScope, new GeneratorContext())
 		{
+		}
+
+		protected BaseCodeGenerator(ModuleScope moduleScope, GeneratorContext context)
+		{
+			m_moduleScope = moduleScope;
 			m_context = context;
 		}
 
-		protected BaseCodeGenerator() : this(new GeneratorContext())
+		protected ModuleScope ModuleScope
 		{
+			get { return m_moduleScope; }
 		}
 
 		protected GeneratorContext Context
@@ -64,37 +70,35 @@
 			get { return m_constBuilder; }
 		}
 
-		protected virtual ModuleBuilder CreateDynamicModule()
+		protected Type GetFromCache( Type baseClass, Type[] interfaces )
 		{
-			AssemblyName assemblyName = new AssemblyName();
-			assemblyName.Name = "DynamicAssemblyProxyGen";
-
-			ModuleBuilder moduleBuilder = null;
-
-#if (DEBUG)
-			m_assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(
-					assemblyName,
-					AssemblyBuilderAccess.RunAndSave);
-			moduleBuilder = m_assemblyBuilder.DefineDynamicModule(assemblyName.Name, FILE_NAME);
-#else
-			m_assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(
-					assemblyName,
-					AssemblyBuilderAccess.Run);
-			moduleBuilder = m_assemblyBuilder.DefineDynamicModule(assemblyName.Name, true);
-#endif
+			return ModuleScope[ GenerateTypeName( baseClass, interfaces ) ] as Type;
+		}
 
-			return moduleBuilder;
+		protected void RegisterInCache( Type generatedType )
+		{
+			ModuleScope[ generatedType.Name ] = generatedType;
 		}
 
 		protected virtual TypeBuilder CreateTypeBuilder(Type baseType, Type[] interfaces)
 		{
-			ModuleBuilder moduleBuilder = CreateDynamicModule();
+			String typeName = GenerateTypeName(baseType, interfaces);
+
+			ModuleBuilder moduleBuilder = ModuleScope.ObtainDynamicModule();
+
+			TypeAttributes flags = TypeAttributes.Public | TypeAttributes.Class; 
+
+			if (baseType != typeof(Object))
+			{
+				if (baseType.IsSerializable)
+				{
+					flags |= TypeAttributes.Serializable;
+				}
+			}
 
 			m_baseType = baseType;
 			m_typeBuilder = moduleBuilder.DefineType(
-				"ProxyType", TypeAttributes.Public | TypeAttributes.Class, baseType, interfaces);
+				typeName, flags, baseType, interfaces);
 
 			m_handlerField = GenerateField();
 			m_constBuilder = GenerateConstructor();
@@ -102,6 +106,18 @@
 			return m_typeBuilder;
 		}
 
+		protected virtual String GenerateTypeName(Type type, Type[] interfaces)
+		{
+			StringBuilder sb = new StringBuilder();
+			foreach(Type inter in interfaces)
+			{
+				sb.Append('_');
+				sb.Append(inter.Name);
+			}
+			/// Naive implementation
+			return String.Format("ProxyType{0}{1}", type.Name, sb.ToString());
+		}
+
 		protected virtual void EnhanceType()
 		{
 			if (Context.EnhanceType != null)
@@ -123,9 +139,9 @@
 		protected virtual Type CreateType()
 		{
 			Type newType = MainTypeBuilder.CreateType();
-#if (DEBUG)
-			m_assemblyBuilder.Save(FILE_NAME);
-#endif
+
+			RegisterInCache( newType );
+
 			return newType;
 		}
 
@@ -135,7 +151,7 @@
 		///  instance
 		protected FieldBuilder GenerateField()
 		{
-			return GenerateField("handler", typeof (IInvocationHandler) );
+			return GenerateField("handler", typeof (IInvocationHandler));
 		}
 
 		/// 
@@ -144,10 +160,10 @@
 		/// Field's name
 		/// Field's type
 		/// 
-		protected FieldBuilder GenerateField( String name, Type type )
+		protected FieldBuilder GenerateField(String name, Type type)
 		{
 			return m_typeBuilder.DefineField(name,
-				typeof (IInvocationHandler), FieldAttributes.Public);
+			                                 typeof (IInvocationHandler), FieldAttributes.Public);
 		}
 
 		/// 
@@ -181,7 +197,7 @@
 		{
 			foreach(Type inter in interfaces)
 			{
-				if (!Context.ShouldSkip( inter ))
+				if (!Context.ShouldSkip(inter))
 				{
 					GenerateTypeImplementation(inter, false);
 				}
@@ -194,7 +210,7 @@
 		/// 
 		/// Type class
 		/// Interface type
-		protected void GenerateTypeImplementation(Type type, bool ignoreInterfaces )
+		protected void GenerateTypeImplementation(Type type, bool ignoreInterfaces)
 		{
 			if (m_generated.Contains(type))
 			{
@@ -202,7 +218,7 @@
 			}
 			else
 			{
-				m_generated.Add( type );
+				m_generated.Add(type);
 			}
 
 			if (!ignoreInterfaces)
@@ -216,7 +232,7 @@
 			GenerateMethods(type, propertiesBuilder);
 		}
 
-		protected virtual PropertyBuilder[] GenerateProperties( Type inter )
+		protected virtual PropertyBuilder[] GenerateProperties(Type inter)
 		{
 			PropertyInfo[] properties = inter.GetProperties();
 			PropertyBuilder[] propertiesBuilder = new PropertyBuilder[properties.Length];
@@ -229,7 +245,7 @@
 			return propertiesBuilder;
 		}
 
-		protected virtual void GenerateMethods( Type inter, PropertyBuilder[] propertiesBuilder )
+		protected virtual void GenerateMethods(Type inter, PropertyBuilder[] propertiesBuilder)
 		{
 			MethodInfo[] methods = inter.GetMethods();
 

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ClassProxyGenerator.cs	Mon Sep 27 07:34:26 2004
@@ -21,11 +21,11 @@
 	/// 
 	public class ClassProxyGenerator : BaseCodeGenerator
 	{
-		public ClassProxyGenerator() : base()
+		public ClassProxyGenerator(ModuleScope scope) : base(scope)
 		{
 		}
 
-		public ClassProxyGenerator(GeneratorContext context) : base(context)
+		public ClassProxyGenerator(ModuleScope scope, GeneratorContext context) : base(scope, context)
 		{
 		}
 
@@ -33,6 +33,13 @@
 		{
 			Type[] interfaces = new Type[0];
 			interfaces = ScreenInterfaces(interfaces);
+
+			Type cacheType = GetFromCache(baseClass, interfaces);
+			
+			if (cacheType != null)
+			{
+				return cacheType;
+			}
 
 			CreateTypeBuilder( baseClass, interfaces );
 			GenerateTypeImplementation( baseClass, true );

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/InterfaceProxyGenerator.cs	Mon Sep 27 07:34:26 2004
@@ -21,17 +21,24 @@
 	/// 
 	public class InterfaceProxyGenerator : BaseCodeGenerator
 	{
-		public InterfaceProxyGenerator() : base()
+		public InterfaceProxyGenerator(ModuleScope scope) : base(scope)
 		{
 		}
 
-		public InterfaceProxyGenerator(GeneratorContext context) : base(context)
+		public InterfaceProxyGenerator(ModuleScope scope, GeneratorContext context) : base(scope, context)
 		{
 		}
 
 		public virtual Type GenerateCode(Type[] interfaces)
 		{
 			interfaces = ScreenInterfaces(interfaces);
+
+			Type cacheType = GetFromCache(typeof(Object), interfaces);
+			
+			if (cacheType != null)
+			{
+				return cacheType;
+			}
 
 			CreateTypeBuilder( typeof(Object), interfaces );
 			GenerateInterfaceImplementation( interfaces );

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ModuleScope.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/CodeGenerators/ModuleScope.cs	Mon Sep 27 07:34:26 2004
@@ -0,0 +1,80 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Builder.CodeGenerators
+{
+	using System;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Collections;
+
+	/// 
+	/// Summary description for ModuleScope.
+	/// 
+	public class ModuleScope
+	{
+		private static readonly String FILE_NAME = "GeneratedAssembly.dll";
+
+		/// 
+		/// Avoid leaks caused by non disposal of generated types.
+		/// 
+		private ModuleBuilder m_moduleBuilder = null;
+
+		/// 
+		/// Keep track of generated types
+		/// 
+		private Hashtable m_typeCache = Hashtable.Synchronized(new Hashtable());
+
+		/// 
+		/// Used to lock the module builder creation
+		/// 
+		private object m_lockobj = new object();
+
+		private AssemblyBuilder m_assemblyBuilder;
+
+		public ModuleBuilder ObtainDynamicModule()
+		{
+			lock (m_lockobj)
+			{
+				if (m_moduleBuilder == null)
+				{
+					AssemblyName assemblyName = new AssemblyName();
+					assemblyName.Name = "DynamicAssemblyProxyGen";
+
+#if ( DEBUG )
+					m_assemblyBuilder =
+						AppDomain.CurrentDomain.DefineDynamicAssembly(
+						assemblyName,
+						AssemblyBuilderAccess.RunAndSave);
+					m_moduleBuilder = m_assemblyBuilder.DefineDynamicModule(assemblyName.Name, FILE_NAME);
+#else
+					m_assemblyBuilder =
+						AppDomain.CurrentDomain.DefineDynamicAssembly(
+							assemblyName,
+							AssemblyBuilderAccess.Run);
+					m_moduleBuilder = m_assemblyBuilder.DefineDynamicModule(assemblyName.Name, true);
+#endif
+				}
+			}
+
+			return m_moduleBuilder;
+		}
+
+		public Type this[String name]
+		{
+			get { return m_typeCache[name] as Type; }
+			set { m_typeCache[name] = value; }
+		}
+	}
+}

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/DefaultProxyBuilder.cs
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/DefaultProxyBuilder.cs	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/DefaultProxyBuilder.cs	Mon Sep 27 07:34:26 2004
@@ -1,4 +1,3 @@
-using Apache.Avalon.DynamicProxy.Builder.CodeGenerators;
 // Copyright 2004 The Apache Software Foundation
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,35 +15,43 @@
 namespace Apache.Avalon.DynamicProxy.Builder
 {
 	using System;
+	using Apache.Avalon.DynamicProxy.Builder.CodeGenerators;
 
 	/// 
 	/// Summary description for DefaultProxyBuilder.
 	/// 
 	public class DefaultProxyBuilder : IProxyBuilder
 	{
+		ModuleScope m_scope = new ModuleScope();
+
+		public DefaultProxyBuilder()
+		{
+			
+		}
+
 		#region IProxyBuilder Members
 
 		public virtual Type CreateInterfaceProxy(Type[] interfaces)
 		{
-			InterfaceProxyGenerator generator = new InterfaceProxyGenerator();
+			InterfaceProxyGenerator generator = new InterfaceProxyGenerator(m_scope);
 			return generator.GenerateCode( interfaces );
 		}
 
 		public virtual Type CreateClassProxy(Type theClass)
 		{
-			ClassProxyGenerator generator = new ClassProxyGenerator();
+			ClassProxyGenerator generator = new ClassProxyGenerator(m_scope);
 			return generator.GenerateCode( theClass );
 		}
 
 		public virtual Type CreateCustomInterfaceProxy(Type[] interfaces, GeneratorContext context)
 		{
-			InterfaceProxyGenerator generator = new InterfaceProxyGenerator(context);
+			InterfaceProxyGenerator generator = new InterfaceProxyGenerator(m_scope, context);
 			return generator.GenerateCode( interfaces );
 		}
 
 		public virtual Type CreateCustomClassProxy(Type theClass, GeneratorContext context)
 		{
-			ClassProxyGenerator generator = new ClassProxyGenerator(context);
+			ClassProxyGenerator generator = new ClassProxyGenerator(m_scope, context);
 			return generator.GenerateCode( theClass );
 		}
 

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy-compilations.build
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy-compilations.build	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy-compilations.build	Mon Sep 27 07:34:26 2004
@@ -1,300 +1,300 @@
-
-
-
-
-    
-
-        
-        
-        
-        
-        
-        
-        
-        
-        
-    
-
-    
-        
-        
-        
-            
-            
-        
-        
-            
-                
-            
-            
-                
-            
-        
-        
-        
-            
-            
-        
-        
-            
-                
-            
-            
-                
-            
-        
-        
-        
-            
-            
-        
-        
-            
-                
-            
-            
-                
-            
-        
-        
-        
-            
-            
-        
-        
-            
-                
-            
-            
-                
-            
-        
-    
-
-    
-        
-    
-
-    
-        
-        
-        
-        
-        
-            
-            
-            
-                
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-            
-                
-                
-            
-        
-        
-            
-                
-                    
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-        
-        
-        
-    
-
-    
-        
-        
-        
-        
-        
-            
-            
-            
-                
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-            
-                
-                
-            
-        
-        
-            
-                
-                    
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-        
-        
-        
-    
-
-    
-        
-        
-        
-        
-        
-            
-            
-            
-                
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-            
-                
-                
-            
-        
-        
-            
-                
-                    
-                    
-                
-                
-                    
-                    
-                    
-                
-            
-        
-        
-        
-    
-
-    
-        
-        
-        
-        
-        
-            
-            
-            
-                
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-            
-                
-                
-            
-        
-        
-            
-                
-                    
-                    
-                
-                
-                    
-                    
-                    
-                    
-                
-            
-        
-        
-        
-    
-
-    
-        
-        
-            
-                
-            
-            
-                
-                
-                
-                
-                
-                
-                
-                
-                
-                
-            
-        
-    
-
-
+
+
+
+
+    
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+
+    
+        
+        
+        
+            
+            
+        
+        
+            
+                
+            
+            
+                
+            
+        
+        
+        
+            
+            
+        
+        
+            
+                
+            
+            
+                
+            
+        
+        
+        
+            
+            
+        
+        
+            
+                
+            
+            
+                
+            
+        
+        
+        
+            
+            
+        
+        
+            
+                
+            
+            
+                
+            
+        
+    
+
+    
+        
+    
+
+    
+        
+        
+        
+        
+        
+            
+            
+            
+                
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+            
+                
+                
+            
+        
+        
+            
+                
+                    
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+        
+        
+        
+    
+
+    
+        
+        
+        
+        
+        
+            
+            
+            
+                
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+            
+                
+                
+            
+        
+        
+            
+                
+                    
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+        
+        
+        
+    
+
+    
+        
+        
+        
+        
+        
+            
+            
+            
+                
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+            
+                
+                
+            
+        
+        
+            
+                
+                    
+                    
+                
+                
+                    
+                    
+                    
+                
+            
+        
+        
+        
+    
+
+    
+        
+        
+        
+        
+        
+            
+            
+            
+                
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+            
+                
+                
+            
+        
+        
+            
+                
+                    
+                    
+                
+                
+                    
+                    
+                    
+                    
+                
+            
+        
+        
+        
+    
+
+    
+        
+        
+            
+                
+            
+            
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+            
+        
+    
+
+

Modified: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
==============================================================================
--- avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj	(original)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj	Mon Sep 27 07:34:26 2004
@@ -56,7 +56,7 @@
                     NoStdLib = "false"
                     NoWarn = ""
                     Optimize = "true"
-                    OutputPath = "bin\Release\"
+                    OutputPath = "..\..\bin\"
                     RegisterForComInterop = "false"
                     RemoveIntegerChecks = "false"
                     TreatWarningsAsErrors = "false"
@@ -87,7 +87,8 @@
                 
             
         
@@ -99,12 +100,27 @@
                     BuildAction = "Compile"
                 />
                 
+                
                 
+                
+                

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/CachedTypeTestCase.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/CachedTypeTestCase.cs	Mon Sep 27 07:34:26 2004
@@ -0,0 +1,46 @@
+using Apache.Avalon.DynamicProxy.Test.Classes;
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test
+{
+	using System;
+
+	using NUnit.Framework;
+
+	/// 
+	/// Summary description for CachedTypeTestCase.
+	/// 
+	[TestFixture]
+	public class CachedTypeTestCase
+	{
+		private ProxyGenerator m_generator = new ProxyGenerator();
+
+		[Test]
+		public void CachedClassProxies()
+		{
+			object proxy = m_generator.CreateClassProxy( 
+				typeof(ServiceClass), new StandardInvocationHandler( new ServiceClass() ) );
+			
+			Assert.IsNotNull(proxy);
+			Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+
+			proxy = m_generator.CreateClassProxy( 
+				typeof(ServiceClass), new StandardInvocationHandler( new ServiceClass() ) );
+			
+			Assert.IsNotNull(proxy);
+			Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom( proxy.GetType() ) );
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Classes/MySerializableClass.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/Classes/MySerializableClass.cs	Mon Sep 27 07:34:26 2004
@@ -0,0 +1,30 @@
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test.Classes
+{
+	using System;
+
+	/// 
+	/// Summary description for MySerializableClass.
+	/// 
+	[Serializable]
+	public class MySerializableClass
+	{
+		public double CalculateSumDistanceNow()
+		{
+			return Math.PI;
+		}
+	}
+}

Added: avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/SerializableClassTestCase.cs
==============================================================================
--- (empty file)
+++ avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxyTest/SerializableClassTestCase.cs	Mon Sep 27 07:34:26 2004
@@ -0,0 +1,40 @@
+using Apache.Avalon.DynamicProxy.Test.Classes;
+// Copyright 2004 The Apache Software Foundation
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Apache.Avalon.DynamicProxy.Test
+{
+	using System;
+
+	using NUnit.Framework;
+
+	/// 
+	/// Summary description for SerializableClassTestCase.
+	/// 
+	[TestFixture]
+	public class SerializableClassTestCase : Assertion
+	{
+		[Test]
+		public void CreateSerializable()
+		{
+			MySerializableClass myClass = new MySerializableClass();
+
+			ProxyGenerator generator = new ProxyGenerator();
+			MySerializableClass proxy = (MySerializableClass) 
+				generator.CreateClassProxy( typeof(MySerializableClass), new StandardInvocationHandler(myClass) );
+
+			Assert( proxy.GetType().IsSerializable );
+		}
+	}
+}

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47150 - avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model
2004-09-24T11:35:52Z

Author: niclas
Date: Fri Sep 24 04:35:50 2004
New Revision: 47150

Modified:
   avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java
Log:
Patch from Peter Neubauer removing a JDK1.4 constructor.

Modified: avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java
==============================================================================
--- avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java
(original)
+++ avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/CyclicDependencyException.java
Fri Sep 24 04:35:50 2004
@@ -46,12 +46,4 @@
         super( arg0 );
     }
 
-    /**
-     * @see RuntimeException
-     */
-    public CyclicDependencyException( String arg0, Throwable arg1 )
-    {
-        super( arg0, arg1 );
-    }
-
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47113 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks
2004-09-23T17:51:13Z

Author: niclas
Date: Thu Sep 23 10:51:12 2004
New Revision: 47113

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java
Log:
Flatten feature added as requested by Cameron Taggart and patched by Stephen McConnell.

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReplicateTask.java	Thu
Sep 23 10:51:12 2004
@@ -43,6 +43,12 @@
     private Path m_path;
     private Context m_context;
     private Home m_home;
+    private boolean m_flatten = false;
+
+    public void setFlatten( boolean flag )
+    {
+        m_flatten = flag;
+    }
 
     public void init()
     {
@@ -166,6 +172,7 @@
         final Copy copy = (Copy) getProject().createTask( "copy" );
         copy.setTaskName( getTaskName() );
         copy.setPreserveLastModified( true );
+        copy.setFlatten( m_flatten );
         copy.setTodir( destination );
         copy.addFileset( fileset );
         copy.init();

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 47041 - avalon/trunk/central/system/gump
2004-09-22T09:50:28Z

Author: niclas
Date: Wed Sep 22 02:50:27 2004
New Revision: 47041

Modified:
   avalon/trunk/central/system/gump/avalon-trunk.xml
Log:
Forgot to commit the gump descriptor.

Modified: avalon/trunk/central/system/gump/avalon-trunk.xml
==============================================================================
--- avalon/trunk/central/system/gump/avalon-trunk.xml	(original)
+++ avalon/trunk/central/system/gump/avalon-trunk.xml	Wed Sep 22 02:50:27 2004
@@ -2823,6 +2823,33 @@
        from="Magic Integration <dev@avalon.apache.org>"/>
   
 
+  
+    
+    
+      
+       
+      
+      
+      
+      
+      
+      
+      
+      
+        
+      
+      
+    
+     
+    
+    
+    
+    
+    
+    
+  
+
   
     
     

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 46988 - in avalon/trunk: central/site/src/xdocs/central/tools/magic/tasks/common tools
2004-09-21T16:40:33Z

Author: niclas
Date: Tue Sep 21 09:40:32 2004
New Revision: 46988

Modified:
   avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/common/property.xml
   avalon/trunk/tools/index.xml
Log:
Final fixes to XDoc in plugin.

Modified: avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/common/property.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/common/property.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/common/property.xml	Tue
Sep 21 09:40:32 2004
@@ -1,4 +1,4 @@
-���
+
 
 
   

Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml	(original)
+++ avalon/trunk/tools/index.xml	Tue Sep 21 09:40:32 2004
@@ -191,7 +191,7 @@
     
       avalon/tools
       magic-xdoc-plugin
-      plugin
+      jar
     
     
       

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org







svn commit: rev 46986 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model
2004-09-21T15:53:18Z

Author: niclas
Date: Tue Sep 21 08:53:17 2004
New Revision: 46986

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java
Log:
if() statement covers too many lines.

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java	Tue Sep
21 08:53:17 2004
@@ -170,8 +170,8 @@
                 {
                     final File file = resource.getArtifact( project, resolve );
                     path.createPathElement().setLocation( file );
-                    visited.add( ref );
                 }
+                visited.add( ref );
             }
         }
         

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org