You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/03/17 09:35:16 UTC
svn commit: r386568 - in /geronimo/branches/1.1/modules/client-builder/src:
java/org/apache/geronimo/client/builder/ test-resources/plans/
test/org/apache/geronimo/client/builder/
Author: djencks
Date: Fri Mar 17 00:35:13 2006
New Revision: 386568
URL: http://svn.apache.org/viewcvs?rev=386568&view=rev
Log:
fix client-builder module. Remove rather useless test.
Removed:
geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/AppClientBuilderTest.java
Modified:
geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml
geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml
geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
Modified: geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=386568&r1=386567&r2=386568&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri Mar 17 00:35:13 2006
@@ -66,7 +66,6 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import java.io.File;
import java.io.IOException;
@@ -170,8 +169,8 @@
AbstractName moduleName;
if (earName == null) {
- earName = Naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
- moduleName = Naming.createChildName(earName, NameFactory.APP_CLIENT_MODULE, environment.getConfigId().toString());
+ earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
+ moduleName = naming.createChildName(earName, NameFactory.APP_CLIENT_MODULE, environment.getConfigId().toString());
} else {
moduleName = naming.createChildName(earName, targetPath, NameFactory.APP_CLIENT_MODULE);
}
@@ -265,7 +264,7 @@
clientEnvironment.setConfigId(configId);
}
- AbstractName clientBaseName = Naming.createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.APP_CLIENT_MODULE);
+ AbstractName clientBaseName = earContext.getNaming().createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.APP_CLIENT_MODULE);
File appClientDir;
try {
appClientDir = configurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
@@ -599,9 +598,9 @@
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AppClientModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("defaultClientEnvironment", Environment.class, true, true);
infoBuilder.addAttribute("defaultServerEnvironment", Environment.class, true, true);
- infoBuilder.addAttribute("transactionContextManagerObjectName", ObjectName.class, true);
- infoBuilder.addAttribute("connectionTrackerObjectName", ObjectName.class, true);
- infoBuilder.addAttribute("corbaGBeanObjectName", ObjectName.class, true);
+ infoBuilder.addAttribute("transactionContextManagerObjectName", AbstractNameQuery.class, true);
+ infoBuilder.addAttribute("connectionTrackerObjectName", AbstractNameQuery.class, true);
+ infoBuilder.addAttribute("corbaGBeanObjectName", AbstractNameQuery.class, true);
infoBuilder.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("ConnectorModuleBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("ResourceReferenceBuilder", ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
Modified: geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml?rev=386568&r1=386567&r2=386568&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan1.xml Fri Mar 17 00:35:13 2006
@@ -21,7 +21,7 @@
</dep:server-environment>
<nam:resource-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">
<nam:ref-name>jdbc/DB1</nam:ref-name>
- <nam:target-name>DefaultDatabase</nam:target-name>
+ <nam:resource-link>DefaultDatabase</nam:resource-link>
</nam:resource-ref>
<realm-name>default</realm-name>
<callback-handler>org.apache.geronimo.client.DefaultCallbackHandler</callback-handler>
Modified: geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml?rev=386568&r1=386567&r2=386568&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/branches/1.1/modules/client-builder/src/test-resources/plans/plan2.xml Fri Mar 17 00:35:13 2006
@@ -21,7 +21,7 @@
</dep:server-environment>
<nam:resource-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1">
<nam:ref-name>jdbc/DB1</nam:ref-name>
- <nam:target-name>DefaultDatabase</nam:target-name>
+ <nam:resource-link>DefaultDatabase</nam:resource-link>
</nam:resource-ref>
<resource>
<external-rar>tranql/rars/tranql-connector-1.0-SNAPSHOT</external-rar>
Modified: geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=386568&r1=386567&r2=386568&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/test/org/apache/geronimo/client/builder/PlanParsingTest.java Fri Mar 17 00:35:13 2006
@@ -39,12 +39,9 @@
EnvironmentType serverEnvironmentType = appClient.addNewServerEnvironment();
serverEnvironmentType.setConfigId(clientId);
-// appClient.setClientConfigId("clientConfigId");
-// appClient.setConfigId("configId");
-// appClient.setParentId("parentId");
GerResourceRefType ref = appClient.addNewResourceRef();
ref.setRefName("ref");
- ref.setTargetName("target");
+ ref.setResourceLink("target");
SchemaConversionUtils.validateDD(appClient);
// System.out.println(appClient.toString());