geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r384667 [2/2] - in /geronimo/branches/1.1/modules: client-builder/src/java/org/apache/geronimo/client/builder/ connector-builder/src/java/org/apache/geronimo/connector/deployment/ j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ j...
Date Fri, 10 Mar 2006 01:25:16 GMT
Modified: geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd?rev=384667&r1=384666&r2=384667&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-config-1.1.xsd Thu Mar
 9 17:25:07 2006
@@ -274,7 +274,7 @@
 
     <xs:group name="gbean-nameGroup">
         <xs:annotation>
-            <xs:documentation>This group contains the components of a jsr-77 object
name</xs:documentation>
+            <xs:documentation>This group contains the components of an abstract name</xs:documentation>
         </xs:annotation>
         <xs:choice>
             <xs:sequence>

Modified: geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml?rev=384667&r1=384666&r2=384667&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml (original)
+++ geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml Thu
Mar  9 17:25:07 2006
@@ -30,8 +30,8 @@
         </configId>
         <properties>
             <property>
-                <name>domain</name>
-                <value>geronimo.server</value>
+                <name>org.apache.geronimo.name.javax.management.j2ee.BaseName</name>
+                <value>domain:J2EEServer=test</value>
             </property>
         </properties>
         <dependencies>
@@ -62,7 +62,7 @@
 
         </dependencies>
     </environment>
-    <gbean gbeanName="geronimo.test:name=MyMockGMBean" class="org.apache.geronimo.deployment.MockGBean">
+    <gbean name="MyMockGMBean" class="org.apache.geronimo.deployment.MockGBean">
         <attribute name="value">1234</attribute>
         <attribute name="intValue">1234</attribute>
         <xml-attribute name="fooBarBean">

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=384667&r1=384666&r2=384667&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 17:25:07 2006
@@ -18,23 +18,24 @@
 
 import junit.framework.TestCase;
 import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.FooBarBean;
 import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
 import org.apache.geronimo.deployment.xbeans.ConfigurationType;
 import org.apache.geronimo.deployment.xbeans.GbeanType;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionListener;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.repository.Environment;
 
 import javax.management.ObjectName;
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -63,17 +64,8 @@
 
             Environment environment = EnvironmentBuilder.buildEnvironment(plan.getEnvironment());
             DeploymentContext context = new DeploymentContext(outFile, environment, ConfigurationModuleType.SERVICE,
null);
-            J2eeContext j2eeContext = new J2eeContextImpl("domain", "server", "null", "test",
"configtest", "foo", NameFactory.J2EE_MODULE);
-//            ServiceConfigBuilder.addDependencies(context, plan.getDependencyArray(), new
Repository() {
-//
-//                public boolean hasURI(URI uri) {
-//                    return true;
-//                }
-//
-//                public URL getURL(URI uri) throws MalformedURLException {
-//                    return plan1;
-//                }
-//            });
+            AbstractName j2eeContext = NameFactory.buildModuleName(environment.getProperties(),
environment.getConfigId(), NameFactory.J2EE_MODULE, null);
+//            new J2eeContextImpl("domain", "server", "null", "test", "configtest", "foo",
NameFactory.J2EE_MODULE);
             GbeanType[] gbeans = plan.getGbeanArray();
             ServiceConfigBuilder.addGBeans(gbeans, cl, j2eeContext, context);
             Set beanDatas = context.listGBeans(new ObjectName("*:*"));

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=384667&r1=384666&r2=384667&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Thu Mar  9 17:25:07 2006
@@ -270,7 +270,7 @@
             knownParent = earContext.getConfiguration(repository, null);
         }
         ClassLoader moduleClassLoader = moduleContext.getClassLoader(repository, knownParent);
-        J2eeContext earJ2eeContext = moduleContext.getJ2eeContext();
+        J2eeContext earJ2eeContext = moduleContext.getModuleName();
         J2eeContext moduleJ2eeContext = J2eeContextImpl.newModuleContextFromApplication(earJ2eeContext,
NameFactory.WEB_MODULE, module.getName());
         WebModule webModule = (WebModule) module;
 
@@ -296,7 +296,7 @@
         try {
             webModuleData.setReferencePattern("J2EEServer", moduleContext.getServerObjectName());
             if (!moduleContext.getJ2EEApplicationName().equals("null")) {
-                webModuleData.setReferencePattern("J2EEApplication", moduleContext.getApplicationObjectName());
+                webModuleData.setReferencePattern("J2EEApplication", moduleContext.getApplicationName());
             }
 
             webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());



Mime
View raw message