looks good to me.
On 8/11/2010 11:41 PM, Joe Di Pol wrote:
>
> I'm looking for a couple of eyeballs to take a quick look at this
> since it is fairly wide-ranging. The fix is for:
>
> Rename "nodeagents" dir to "nodes"
> https://glassfish.dev.java.net/issues/show_bug.cgi?id=12640
>
> This changes the name of the "nodeagents" directory to "nodes".
> I've grep'd the source and changed all occurrences that seemed
> relevant. I've run quicklook and the admin dev tests and so
> far all is well (I did need to modify a couple dev tests -- those
> changes are not included here).
>
> The change is pretty boring -- what I'm really looking for
> is if there is anything obvious that I've missed.
>
> Thanks,
>
> Joe
>
>
> Webrev:
>
> http://javaweb.sfbay/~dipol/webrev/nodeagents/
>
> Raw diffs:
>
> Index:
> cluster/cli/src/test/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommandTest.java
>
> ===================================================================
> ---
> cluster/cli/src/test/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommandTest.java
> (revision 39561)
> +++
> cluster/cli/src/test/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommandTest.java
> (working copy)
> @@ -101,6 +101,6 @@
> static {
> String installDirPath =
> LocalInstanceCommandTest.class.getClassLoader().getResource("fake_gf_install_dir").getPath();
>
> installDir = SmartFile.sanitize(new File(installDirPath));
> - nodeAgentsDir = new File(installDir, "nodeagents");
> + nodeAgentsDir = new File(installDir, "nodes");
> }
> }
> Index:
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalStrings.properties
>
> ===================================================================
> ---
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalStrings.properties
> (revision 39561)
> +++
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalStrings.properties
> (working copy)
> @@ -15,7 +15,7 @@
> Instance.cantWriteProperties=Can't write {0}
> Instance.dasPropertyComment=Domain Administration Server Connection
> Properties
> Instance.nodeagentPropertiesComment=Node Agent Connection Properties
> -Instance.unknownHost=Could not determine host. Create hostname
> directory as nodeagents/localhost.
> +Instance.unknownHost=Could not determine host. Create hostname
> directory as nodes/localhost.
> Instance.nosync=Skipping synchronization with DAS.
> Instance.nodomainxml=CLI810 Synchronization with DAS failed and no
> local domain.xml,\ncan't start instance.
> Instance.syncFailed=Warning: Synchronization with DAS failed,
> continuing startup...
> Index:
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java
>
> ===================================================================
> ---
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java
> (revision 39561)
> +++
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java
> (working copy)
> @@ -55,7 +55,7 @@
> /**
> * This is a local command that creates a local instance.
> * Create the local directory structure
> - * nodeagents/<host-name>/
> + * nodes/<host-name>/
> * || ---- agent
> * || ---- config
> * | ---- das.properties
> Index:
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java
>
> ===================================================================
> ---
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java
> (revision 39561)
> +++
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java
> (working copy)
> @@ -90,7 +90,7 @@
> else
> agentsDir = new File(new File(getSystemProperty(
>
> SystemPropertyConstants.INSTALL_ROOT_PROPERTY)),
> - "nodeagents");
> + "nodes");
> }
>
> // XXX - validate lots more...
> Index:
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java
>
> ===================================================================
> ---
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java
> (revision 39561)
> +++
> cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/LocalInstanceCommand.java
> (working copy)
> @@ -63,7 +63,7 @@
> *
> * Default instance file structure.
> * ||---- <GlassFish Install Root>
> - * ||---- nodeagents (nodeDirRoot, --nodedir)
> + * ||---- nodes (nodeDirRoot, --nodedir)
> * ||---- <node-1> (nodeDirChild, --node)
> * || ---- agent
> * || ---- config
> @@ -133,7 +133,7 @@
> String nodeDirRootPath = null;
> if(ok(nodeDir))
> nodeDirRootPath = nodeDir;
> - else // node dir = <install-root>/nodeagents
> + else // node dir = <install-root>/nodes
> nodeDirRootPath = getNodeDirRootDefault();
>
> nodeDirRoot = new File(nodeDirRootPath);
> @@ -425,7 +425,7 @@
> /**
> * Return the default value for nodeDirRoot, first checking if
> com.sun.aas.agentRoot
> * was specified in asenv.conf and returning this value. If not
> specified,
> - * then the defaut value is the {GlassFish_Install_Root}/nodeagents.
> + * then the defaut value is the {GlassFish_Install_Root}/nodes.
> * nodeDirRoot is the parent directory of the node(s).
> *
> * @return String default nodeDirRoot - parent directory of node(s)
> @@ -439,7 +439,7 @@
> return nodeDirDefault;
>
> String installRootPath = getInstallRootPath();
> - return installRootPath + "/" + "nodeagents";
> + return installRootPath + "/" + "nodes";
> }
>
> }
> Index:
> core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilterForInstance.java
>
> ===================================================================
> ---
> core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilterForInstance.java
> (revision 39561)
> +++
> core/logging/src/main/java/com/sun/enterprise/server/logging/logviewer/backend/LogFilterForInstance.java
> (working copy)
> @@ -80,7 +80,7 @@
>
> instanceLogFile = new File(tempFile.getAbsolutePath() +
> File.separator + instanceName + ".log");
>
> - InputStream inputStream =
> sftpClient.read(node.getInstallDir() + File.separator + "nodeagents" +
> File.separator
> + InputStream inputStream =
> sftpClient.read(node.getInstallDir() + File.separator + "nodes" +
> File.separator
> + sNode + File.separator + instanceName +
> File.separator + "logs" + File.separator + "server.log");
>
> BufferedInputStream in = new
> BufferedInputStream(inputStream);
> Index: packager/nucleus-base/config/asenv.conf
> ===================================================================
> --- packager/nucleus-base/config/asenv.conf (revision 39561)
> +++ packager/nucleus-base/config/asenv.conf (working copy)
> @@ -11,5 +11,5 @@
> AS_CONFIG="../config"
> AS_INSTALL=".."
> AS_DEF_DOMAINS_PATH="../domains"
> -AS_DEF_NODEAGENTS_PATH="../nodeagents"
> +AS_DEF_NODEAGENTS_PATH="../nodes"
> AS_DERBY_INSTALL="../../javadb"
> Index: packager/nucleus-base/config/asenv.bat
> ===================================================================
> --- packager/nucleus-base/config/asenv.bat (revision 39561)
> +++ packager/nucleus-base/config/asenv.bat (working copy)
> @@ -10,5 +10,5 @@
> set AS_CONFIG=..\config
> set AS_INSTALL=..
> set AS_DEF_DOMAINS_PATH=..\domains
> -set AS_DEF_NODEAGENTS_PATH=..\nodeagents
> +set AS_DEF_NODEAGENTS_PATH=..\nodes
> set AS_DERBY_INSTALL=..\..\javadb
> Index: common/common-util/src/test/resources/config/asenv.conf
> ===================================================================
> --- common/common-util/src/test/resources/config/asenv.conf
> (revision 39561)
> +++ common/common-util/src/test/resources/config/asenv.conf
> (working copy)
> @@ -11,5 +11,5 @@
> AS_CONFIG="../config"
> AS_INSTALL=".."
> AS_DEF_DOMAINS_PATH="../domains"
> -AS_DEF_NODEAGENTS_PATH="../nodeagents"
> +AS_DEF_NODEAGENTS_PATH="../nodes"
> AS_DERBY_INSTALL="../../javadb"
> Index: common/common-util/src/test/resources/config/asenv.bat
> ===================================================================
> --- common/common-util/src/test/resources/config/asenv.bat
> (revision 39561)
> +++ common/common-util/src/test/resources/config/asenv.bat (working
> copy)
> @@ -10,5 +10,5 @@
> set AS_CONFIG=..\config
> set AS_INSTALL=..
> set AS_DEF_DOMAINS_PATH=..\domains
> -set AS_DEF_NODEAGENTS_PATH=..\nodeagents
> +set AS_DEF_NODEAGENTS_PATH=..\nodes
> set AS_DERBY_INSTALL=..\..\javadb
> Index:
> common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java
>
> ===================================================================
> ---
> common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java
> (revision 39561)
> +++
> common/common-util/src/main/java/com/sun/enterprise/util/io/InstanceDirs.java
> (working copy)
> @@ -47,11 +47,11 @@
> * when working with invalid directories...
> *
> * Example:
> - * new InstanceDirs(new
> File("/glassfishv3/glassfish/nodeagents/mymachine/instance1"));
> + * new InstanceDirs(new
> File("/glassfishv3/glassfish/nodes/mymachine/instance1"));
> *
> - * getInstanceDir() ==
> /glassfishv3/glassfish/nodeagents/mymachine/instance1
> - * getNodeAgentDir() == /glassfishv3/glassfish/nodeagents/mymachine
> - * getNodeAgentsDir() == /glassfishv3/glassfish/nodeagents
> + * getInstanceDir() ==
> /glassfishv3/glassfish/nodes/mymachine/instance1
> + * getNodeAgentDir() == /glassfishv3/glassfish/nodes/mymachine
> + * getNodeAgentsDir() == /glassfishv3/glassfish/nodes
> * getInstanceName() == instance1
> *
> *
> @@ -78,8 +78,8 @@
> /**
> * This constructor handles 0, 1, 2 or 3 null args.
> * It is smart enough to figure out many defaults.
> - * @param nodeDirParent E.g. install-dir/nodeagents
> - * @param nodeDir E.g. install-dir/nodeagents/localhost
> + * @param nodeDirParent E.g. install-dir/nodes
> + * @param nodeDir E.g. install-dir/nodes/localhost
> * @param instanceName E.g. i1
> */
> public InstanceDirs(String nodeDirParentPath, String nodeDirName,
> String instanceName) throws IOException {
> @@ -175,7 +175,7 @@
> /**
> * Return the default value for nodeDirRoot, first checking if
> com.sun.aas.agentRoot
> * was specified in asenv.conf and returning this value. If not
> specified,
> - * then the default value is the
> {GlassFish_Install_Root}/nodeagents.
> + * then the default value is the {GlassFish_Install_Root}/nodes.
> * nodeDirRoot is the parent directory of the node(s).
> *
> * @return String default nodeDirRoot - parent directory of node(s)
> @@ -189,7 +189,7 @@
> return nodeDirDefault;
>
> String installRootPath = getInstallRootPath();
> - return installRootPath + "/" + "nodeagents";
> + return installRootPath + "/" + "nodes";
> }
>
> /**
> Index:
> common/common-util/src/main/java/com/sun/enterprise/util/io/ServerDirs.java
>
> ===================================================================
> ---
> common/common-util/src/main/java/com/sun/enterprise/util/io/ServerDirs.java
> (revision 39561)
> +++
> common/common-util/src/main/java/com/sun/enterprise/util/io/ServerDirs.java
> (working copy)
> @@ -56,9 +56,9 @@
> * grandparent-dir is meaningless
> *
> * Instance
> - * instanceDir = getServerDir() ==
> C:/glassfishv3/glassfish/nodeagents/mymachine/instance1
> - * agentDir = getServerParentDir() ==
> C:/glassfishv3/glassfish/nodeagents/mymachine
> - * agentsDir = getServerGrandParentDir() ==
> C:/glassfishv3/glassfish/nodeagents
> + * instanceDir = getServerDir() ==
> C:/glassfishv3/glassfish/nodes/mymachine/instance1
> + * agentDir = getServerParentDir() ==
> C:/glassfishv3/glassfish/nodes/mymachine
> + * agentsDir = getServerGrandParentDir() ==
> C:/glassfishv3/glassfish/nodes
> *
> * Currently in all cases the name of the serverDir is the name of
> the server --
> * by our definition.
> Index: admin/launcher/src/test/resources/config/asenv.conf
> ===================================================================
> --- admin/launcher/src/test/resources/config/asenv.conf (revision
> 39561)
> +++ admin/launcher/src/test/resources/config/asenv.conf (working copy)
> @@ -11,5 +11,5 @@
> AS_CONFIG="../config"
> AS_INSTALL=".."
> AS_DEF_DOMAINS_PATH="../domains"
> -AS_DEF_NODEAGENTS_PATH="../nodeagents"
> +AS_DEF_NODEAGENTS_PATH="../nodes"
> AS_DERBY_INSTALL="../../javadb"
> Index: admin/launcher/src/test/resources/config/asenv.bat
> ===================================================================
> --- admin/launcher/src/test/resources/config/asenv.bat (revision
> 39561)
> +++ admin/launcher/src/test/resources/config/asenv.bat (working copy)
> @@ -10,5 +10,5 @@
> set AS_CONFIG=..\config
> set AS_INSTALL=..
> set AS_DEF_DOMAINS_PATH=..\domains
> -set AS_DEF_NODEAGENTS_PATH=..\nodeagents
> +set AS_DEF_NODEAGENTS_PATH=..\nodes
> set AS_DERBY_INSTALL=..\..\javadb
> Index:
> jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java
>
> ===================================================================
> ---
> jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java
> (revision 39561)
> +++
> jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java
> (working copy)
> @@ -200,7 +200,7 @@
> if(!StringUtils.ok(installRootPath))
> installRootPath = System.getProperty(
> SystemPropertyConstants.INSTALL_ROOT_PROPERTY);
> - agentsDirPath = installRootPath + File.separator +
> "nodeagents";
> + agentsDirPath = installRootPath + File.separator + "nodes";
> }
> // if(!StringUtils.ok(installRootPath))
> // throw new CommandException("Agent.noInstallDirPath");
> Index:
> installer/src/main/java/org/openinstaller/provider/conf/InstallationConfigurator.java
>
> ===================================================================
> ---
> installer/src/main/java/org/openinstaller/provider/conf/InstallationConfigurator.java
> (revision 39561)
> +++
> installer/src/main/java/org/openinstaller/provider/conf/InstallationConfigurator.java
> (working copy)
> @@ -467,7 +467,7 @@
> String dirList[] = {
> installDir + File.separator + "glassfish" +
> File.separator + "domains",
> installDir + File.separator + "glassfish" +
> File.separator + "modules",
> - installDir + File.separator + "glassfish" +
> File.separator + "nodeagents",
> + installDir + File.separator + "glassfish" +
> File.separator + "nodes",
> installDir + File.separator + "glassfish" +
> File.separator + "lib"
> };
> for (int i = 0; i < dirList.length; i++) {
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: admin-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: admin-help_at_glassfish.dev.java.net
>