svn commit: rev 56972 - in geronimo/trunk/modules: assembly/src/plan deployment/src/java/org/apache/geronimo/deployment/service

[djencks]

Author: djencks
Date: Mon Nov  8 13:00:58 2004
New Revision: 56972

Modified:
   geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
   
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Log:
un-break app client deployment

Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml     
(original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml     Mon Nov 
 8 13:00:58 2004
@@ -28,6 +28,7 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment";
+    parentId=""
     configId="org/apache/geronimo/ClientSystem"
     >
 

Modified: 
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
==============================================================================
--- 
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
 (original)
+++ 
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
 Mon Nov  8 13:00:58 2004
@@ -58,11 +58,7 @@
     }
 
     public ServiceConfigBuilder(URI defaultParentId, Repository repository, 
Kernel kernel) {
-        if (defaultParentId == null) {
-            this.defaultParentId = null;
-        } else {
-            this.defaultParentId = defaultParentId;
-        }
+        this.defaultParentId = defaultParentId;
         this.repository = repository;
         this.kernel = kernel;
     }