[[joram-commits]] [3789] trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/ model/export: Adapt to new Host elements.

[guillaume.surrel@xxxxxxxxxxxxx]

Title: [3789] trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export: Adapt to new Host elements.

Revision

3789

Author

surrel

Date

2010-04-01 14:01:38 +0200 (Thu, 01 Apr 2010)

Log Message

Adapt to new Host elements. + Some minor changes.

Modified Paths

• trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportA3ConfAction.java
• trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportAdminScriptsAction.java

Diff

Modified: trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportA3ConfAction.java (3788 => 3789)

--- trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportA3ConfAction.java	2010-04-01 12:00:21 UTC (rev 3788)
+++ trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportA3ConfAction.java	2010-04-01 12:01:38 UTC (rev 3789)
@@ -62,18 +62,22 @@
 
 public class ExportA3ConfAction implements IObjectActionDelegate {
 
-  /**
-   * 
-   */
+  private static final String CONNECTION_MANAGER_CLASS = "org.objectweb.joram.mom.proxies.ConnectionManager";
+
+  private static final String ADMIN_PROXY_CLASS = "fr.dyade.aaa.agent.AdminProxy";
+
+  private static final String TCP_PROXY_CLASS = "org.objectweb.joram.mom.proxies.tcp.TcpProxyService";
+
+  private static final String JNDI_SERVER_CLASS = "fr.dyade.aaa.jndi2.server.JndiServer";
+
+  private static final String DISTRIBUTED_JNDI_SERVER_CLASS = "fr.dyade.aaa.jndi2.distributed.DistributedJndiServer";
+
   private ISelection selection;
 
-  /**
-   * 
-   */
   private Shell shell;
 
   /**
-   * Constructor for Action1.
+   * Constructor for ExportA3ConfAction.
    */
   public ExportA3ConfAction() {
     super();
@@ -132,26 +136,28 @@
             appendProperties(rootElement.getProperties().getProperties(), sb, null, "  ");
           }
 
-          EList<NetworkDomain> domains = rootElement.getDomains();
-          for (NetworkDomain domain : domains) {
+          for (NetworkDomain domain : rootElement.getDomains()) {
             sb.append('\n');
-            sb.append("  <domain name='" + domain.getName() + "' network='"
-                + domain.getNetwork().getLiteral() + "' />\n");
+            sb.append("  <domain name='" + domain.getName());
+            sb.append("' network='" + domain.getNetwork().getLiteral() + "' />\n");
             appendProperties(domain.getProperties(), sb, domain, "  ");
           }
 
-          EList<ScalAgentServer> servers = rootElement.getServers();
-          for (ScalAgentServer server : servers) {
+          for (ScalAgentServer server : rootElement.getServers()) {
+            if (server.getHost() == null) {
+              throw new Exception("Host not defined for server " + server.getSid());
+            }
             sb.append('\n');
-            sb.append("  <server id='" + server.getSid() + "' name='" + server.getName() + "' hostname='"
-                + server.getHostname() + "'>\n");
+            sb.append("  <server id='" + server.getSid());
+            sb.append("' name='" + server.getName());
+            sb.append("' hostname='" + server.getHost().getHostName() + "'>\n");
 
             appendServices(server.getServices(), sb);
 
             EList<NetworkPort> ports = server.getNetwork();
             for (NetworkPort port : ports) {
-              sb.append("    <network domain='" + port.getDomain().getName() + "' port='" + port.getPort()
-                  + "' />\n");
+              sb.append("    <network domain='" + port.getDomain().getName());
+              sb.append("' port='" + port.getPort() + "' />\n");
             }
 
             appendProperties(server.getProperties(), sb, null, "    ");
@@ -180,8 +186,6 @@
     String pre = (domain == null) ? (indent + "<property name='") : (indent + "<property name='" + domain.getName() + '.');
     String mid = "' value='";
     String suf = "' />\n";
-    if (indent.endsWith("    "))
-      System.out.println(properties.size());
     for (Property property : properties) {
       if (property instanceof PoolNetworkProperties) {
         PoolNetworkProperties props = (PoolNetworkProperties) property;
@@ -226,17 +230,17 @@
     for (JoramService service : services) {
       if (service instanceof ConnectionManager) {
         ConnectionManager cm = (ConnectionManager) service;
-        sb.append(pre + "org.objectweb.joram.mom.proxies.ConnectionManager" + mid + cm.getUser() + ' '
+        sb.append(pre + CONNECTION_MANAGER_CLASS + mid + cm.getUser() + ' '
             + cm.getPassword() + suf);
       } else if (service instanceof AdminProxy) {
         AdminProxy ap = (AdminProxy) service;
-        sb.append(pre + "fr.dyade.aaa.agent.AdminProxy" + mid + ap.getPort() + suf);
+        sb.append(pre + ADMIN_PROXY_CLASS + mid + ap.getPort() + suf);
       } else if (service instanceof TCPProxyService) {
         TCPProxyService tcpps = (TCPProxyService) service;
-        sb.append(pre + "org.objectweb.joram.mom.proxies.tcp.TcpProxyService" + mid + tcpps.getPort() + suf);
+        sb.append(pre + TCP_PROXY_CLASS + mid + tcpps.getPort() + suf);
       } else if (service instanceof JNDIServer) {
         JNDIServer jndi = (JNDIServer) service;
-        sb.append(pre + "fr.dyade.aaa.jndi2.server.JndiServer" + mid + jndi.getPort() + suf);
+        sb.append(pre + JNDI_SERVER_CLASS + mid + jndi.getPort() + suf);
       } else if (service instanceof CustomService) {
         CustomService cs = (CustomService) service;
         if (cs.getArgs() == null) {
@@ -246,7 +250,7 @@
         }
       } else if (service instanceof DistributedJNDIServer) {
         DistributedJNDIServer distjndi = (DistributedJNDIServer) service;
-        sb.append(pre + "fr.dyade.aaa.jndi2.distributed.DistributedJndiServer" + mid + distjndi.getPort());
+        sb.append(pre + DISTRIBUTED_JNDI_SERVER_CLASS + mid + distjndi.getPort());
         EList<ScalAgentServer> jndiServers = distjndi.getKnownServers();
         for (ScalAgentServer jndiServer : jndiServers) {
           sb.append(" " + jndiServer.getSid());

Modified: trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportAdminScriptsAction.java (3788 => 3789)

--- trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportAdminScriptsAction.java	2010-04-01 12:00:21 UTC (rev 3788)
+++ trunk/designer/org.ow2.joram.design/src-custom/org/ow2/joram/design/model/export/ExportAdminScriptsAction.java	2010-04-01 12:01:38 UTC (rev 3789)
@@ -95,7 +95,7 @@
       public String getText(Object element) {
         TCPProxyService entry = (TCPProxyService) element;
         ScalAgentServer server = (ScalAgentServer) entry.eContainer();
-        return "Server " + server.getSid() + " (" + server.getHostname() + ':' + entry.getPort() + ')';
+        return "Server " + server.getSid() + " (" + server.getHost().getHostName() + ':' + entry.getPort() + ')';
       }
     });
     dlg.setTitle("Select entry point");
@@ -129,11 +129,11 @@
         if (element instanceof JNDIServer) {
           JNDIServer jndi = (JNDIServer) element;
           ScalAgentServer server = (ScalAgentServer) jndi.eContainer();
-          return "JNDI on server " + server.getSid() + " (" + server.getHostname() + ':' + jndi.getPort() + ')';
+          return "JNDI on server " + server.getSid() + " (" + server.getHost().getHostName() + ':' + jndi.getPort() + ')';
         } else if (element instanceof DistributedJNDIServer) {
           DistributedJNDIServer jndi = (DistributedJNDIServer) element;
           ScalAgentServer server = (ScalAgentServer) jndi.eContainer();
-          return "Distributed JNDI on server " + server.getSid() + " (" + server.getHostname() + ':' + jndi.getPort() + ')';
+          return "Distributed JNDI on server " + server.getSid() + " (" + server.getHost().getHostName() + ':' + jndi.getPort() + ')';
         } else {
           return element.toString();
         }
@@ -241,6 +241,13 @@
           final Resource resource = resourceSet.getResource(URI.createFileURI(joramModelFile.getLocationURI().getPath()), true);
           final Config rootElement = (Config) resource.getContents().get(0);
 
+          // Verify each server has a host.
+          for (ScalAgentServer server : rootElement.getServers()) {
+            if (server.getHost() == null) {
+              throw new Exception("Host not defined for server " + server.getSid());
+            }
+          }
+
           TCPProxyService entrypoint = selectEntryPoint(shell, rootElement);
           if (entrypoint == null) {
             return;
@@ -291,7 +298,7 @@
     sb.append("<JoramAdmin>");
     sb.append("\n");
     sb.append("  <AdminModule>\n");
-    sb.append("    <connect host='" + entryServer.getHostname() + "'\n");
+    sb.append("    <connect host='" + entryServer.getHost().getHostName() + "'\n");
     sb.append("             port='" + entrypoint.getPort() + "'\n");
     sb.append("             name='" + cm.getUser() + "'\n");
     sb.append("             password='" + cm.getPassword() + "'/>\n");
@@ -308,7 +315,7 @@
       sb.append("  <InitialContext>\n");
       sb.append("    <property name='java.naming.factory.initial' value='fr.dyade.aaa.jndi2.client.NamingContextFactory'/>\n");
       sb.append("    <property name='java.naming.factory.host' value='"
-          + ((ScalAgentServer) jndi.eContainer()).getHostname() + "'/>\n");
+          + ((ScalAgentServer) jndi.eContainer()).getHost().getHostName() + "'/>\n");
       sb.append("    <property name='java.naming.factory.port' value='" + jndiport + "'/>\n");
       sb.append("  </InitialContext>\n");
       sb.append("\n");