Return-Path: 
 <scm-return-5577-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 64844 invoked from network); 8 Nov 2004 21:01:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 8 Nov 2004 21:01:03 -0000
Received: (qmail 32140 invoked by uid 500); 8 Nov 2004 21:01:01 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 32106 invoked by uid 500); 8 Nov 2004 21:01:01 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
list-post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 32090 invoked by uid 99); 8 Nov 2004 21:01:01 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 08 Nov 2004 13:01:00 -0800
Received: (qmail 64728 invoked by uid 65534); 8 Nov 2004 21:00:59 -0000
Date: 8 Nov 2004 21:00:59 -0000
Message-ID: <20041108210059.64725.qmail@minotaur.apache.org>
From: djencks@apache.org
To: scm@geronimo.apache.org
Subject: svn commit: rev 56972 - in geronimo/trunk/modules: assembly/src/plan
 deployment/src/java/org/apache/geronimo/deployment/service
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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;
     }