Fixed instantiations with child context instead of parent context.

Author: thboileau

build/build.xml

@@ -478,6 +478,7 @@
 		<path refid="mod-ri-path" />
 		<pathelement path="${classes}/${mod-ri-id}" />
 		<fileset dir="${lib}/${lib-logging-id}" includes="*.jar" />
+		<fileset dir="${lib}/${lib-cglib-id}" includes="*.jar" />
 		<fileset dir="${lib}/${lib-spring-id}" includes="*.jar" />
 	</path>
 

build/libraries.properties

@@ -194,3 +194,7 @@ lib-wrapper-id: ${lib-wrapper-package}_${lib-wrapper-version}
 lib-xdb-package: oracle.xdb
 lib-xdb-version: 11.1
 lib-xdb-id: ${lib-xdb-package}_${lib-xdb-version}
+
+lib-cglib-package: net.sf.cglib
+lib-cglib-version: 2.1
+lib-cglib-id: ${lib-cglib-package}_${lib-cglib-version}

modules/com.noelios.restlet.ext.servlet_2.5/src/com/noelios/restlet/ext/servlet/ServletWarClient.java

@@ -58,12 +58,12 @@ public class ServletWarClient extends Client {
     /**
      * Constructor.
      * 
-     * @param context
-     *            The context.
+     * @param parentContext
+     *            The parent context.
      */
-    public ServletWarClient(Context context,
+    public ServletWarClient(Context parentContext,
             javax.servlet.ServletContext servletContext) {
-        super(context.createChildContext(), (List<Protocol>) null);
+        super(parentContext.createChildContext(), (List<Protocol>) null);
         getProtocols().add(Protocol.WAR);
         this.helper = new ServletWarClientHelper(this, servletContext);
     }

modules/com.noelios.restlet.ext.xdb_11.1/src/com/noelios/restlet/ext/xdb/XdbServerServlet.java

@@ -226,9 +226,9 @@ protected HttpServerHelper createServer(HttpServletRequest request) {
 
         if ((component != null) && (application != null)) {
             // First, let's create a pseudo server
-            final Server server = new Server(component.getContext(),
-                    new ArrayList<Protocol>(), this.localAddress,
-                    this.localPort, component);
+            final Server server = new Server(component.getContext()
+                    .createChildContext(), new ArrayList<Protocol>(),
+                    this.localAddress, this.localPort, component);
             server.getProtocols().add(Protocol.HTTP);
             result = new HttpServerHelper(server);
 

modules/org.restlet.example/src/org/restlet/example/jaxrs/ExampleServer.java

@@ -55,7 +55,7 @@ public static void main(String[] args) throws Exception {
 
         // create JAX-RS runtime environment
         final JaxRsApplication application = new JaxRsApplication(comp
-                .getContext());
+                .getContext().createChildContext());
 
         // attach ApplicationConfig
         application.add(new ExampleAppConfig());

modules/org.restlet.example/src/org/restlet/example/jaxrs/GuardedExample.java

@@ -94,7 +94,7 @@ public static void main(String[] args) throws Exception {
 
         // create JAX-RS runtime environment
         final JaxRsApplication application = new JaxRsApplication(comp
-                .getContext());
+                .getContext().createChildContext());
 
         // create a Guard
         final Guard guard = new Guard(application.getContext(),

modules/org.restlet.example/src/org/restlet/example/misc/SimpleServer.java

@@ -55,7 +55,8 @@ public static void main(String[] args) {
             component.getServers().add(Protocol.HTTP, 9876);
 
             // Prepare and attach a test Handler
-            final Restlet handler = new Restlet(component.getContext()) {
+            final Restlet handler = new Restlet(component.getContext()
+                    .createChildContext()) {
                 @Override
                 public void handle(Request request, Response response) {
                     if (request.getMethod().equals(Method.PUT)) {

modules/org.restlet.ext.spring_2.5/src/org/restlet/ext/spring/SpringComponent.java

@@ -152,9 +152,7 @@ public void setServersList(List<Object> serversInfo) {
             } else if (serverInfo instanceof Protocol) {
                 getServers().add((Protocol) serverInfo);
             } else if (serverInfo instanceof Server) {
-                final Server server = (Server) serverInfo;
-                server.setContext(getContext());
-                getServers().add(server);
+                getServers().add((Server) serverInfo);
             } else {
                 getLogger()
                         .warning(

modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/WadlApplication.java

@@ -636,7 +636,7 @@ private VirtualHost getVirtualHost(Component component) {
 
         if (host == null) {
             // A new virtual host needs to be created
-            host = new VirtualHost(getContext());
+            host = new VirtualHost(component.getContext().createChildContext());
             host.setHostDomain(hostDomain);
             host.setHostPort(hostPort);
             host.setHostScheme(hostScheme);

modules/org.restlet.ext.wadl_1.0/src/org/restlet/ext/wadl/WadlComponent.java

@@ -154,7 +154,8 @@ public WadlApplication attach(Reference wadlRef) {
      * @return The created WADL application.
      */
     public WadlApplication attach(Representation wadl) {
-        final WadlApplication result = new WadlApplication(getContext(), wadl);
+        final WadlApplication result = new WadlApplication(getContext()
+                .createChildContext(), wadl);
         result.attachToComponent(this);
         return result;
     }