geronimo-scm mailing list archives

Author: djencks
Date: Thu Mar  9 18:13:26 2006
New Revision: 384678

URL: http://svn.apache.org/viewcvs?rev=384678&view=rev
Log:
missed a couple of needed changes here

Modified:
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=384678&r1=384677&r2=384678&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
(original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
Thu Mar  9 18:13:26 2006
@@ -169,7 +169,7 @@
 
         AbstractName moduleName;
         try {
-            moduleName = NameFactory.buildModuleName(environment.getProperties(), configId,
NameFactory.J2EE_MODULE, null);
+            moduleName = NameFactory.buildModuleName(environment.getProperties(), configId,
ConfigurationModuleType.SERVICE, null);
         } catch (MalformedObjectNameException e) {
             throw new DeploymentException(e);
         }

Modified: geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java?rev=384678&r1=384677&r2=384678&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
(original)
+++ geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
Thu Mar  9 18:13:26 2006
@@ -34,8 +34,6 @@
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -64,7 +62,7 @@
 
             Environment environment = EnvironmentBuilder.buildEnvironment(plan.getEnvironment());
             DeploymentContext context = new DeploymentContext(outFile, environment, ConfigurationModuleType.SERVICE,
null);
-            AbstractName j2eeContext = NameFactory.buildModuleName(environment.getProperties(),
environment.getConfigId(), NameFactory.J2EE_MODULE, null);
+            AbstractName j2eeContext = NameFactory.buildModuleName(environment.getProperties(),
environment.getConfigId(), ConfigurationModuleType.SERVICE, null);
 //            new J2eeContextImpl("domain", "server", "null", "test", "configtest", "foo",
NameFactory.J2EE_MODULE);
             GbeanType[] gbeans = plan.getGbeanArray();
             ServiceConfigBuilder.addGBeans(gbeans, cl, j2eeContext, context);