summaryrefslogtreecommitdiff
path: root/TAO/utils
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/utils')
-rw-r--r--TAO/utils/NamingViewer/BindDialog.h2
-rw-r--r--TAO/utils/NamingViewer/BindNewContext.h2
-rw-r--r--TAO/utils/NamingViewer/NamingObject.h2
-rw-r--r--TAO/utils/NamingViewer/NamingTreeCtrl.h2
-rw-r--r--TAO/utils/NamingViewer/NamingViewer.mpc1
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.cpp2
-rw-r--r--TAO/utils/NamingViewer/NamingViewerDlg.h2
-rw-r--r--TAO/utils/catior/catior.mpc2
-rw-r--r--TAO/utils/nslist/nsadd.cpp12
-rw-r--r--TAO/utils/nslist/nsdel.cpp26
-rw-r--r--TAO/utils/nslist/nslist.cpp11
-rw-r--r--TAO/utils/nslist/nslist.mpc9
-rwxr-xr-xTAO/utils/nslist/run_test.pl8
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp2
14 files changed, 29 insertions, 54 deletions
diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h
index afb39a5739f..a32ec385597 100644
--- a/TAO/utils/NamingViewer/BindDialog.h
+++ b/TAO/utils/NamingViewer/BindDialog.h
@@ -8,7 +8,7 @@
// BindDialog.h : header file
//
#include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
/////////////////////////////////////////////////////////////////////////////
// CBindDialog dialog
diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h
index ac243f51b91..48f4c7073f3 100644
--- a/TAO/utils/NamingViewer/BindNewContext.h
+++ b/TAO/utils/NamingViewer/BindNewContext.h
@@ -7,7 +7,7 @@
#endif // _MSC_VER > 1000
// BindNewContext.h : header file
//
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
/////////////////////////////////////////////////////////////////////////////
// CBindNewContext dialog
diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h
index 5dd5a1fed27..ce257320641 100644
--- a/TAO/utils/NamingViewer/NamingObject.h
+++ b/TAO/utils/NamingViewer/NamingObject.h
@@ -10,7 +10,7 @@
#pragma once
#endif // _MSC_VER > 1000
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
class CNamingObject
{
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.h b/TAO/utils/NamingViewer/NamingTreeCtrl.h
index 8c871ad3792..dcfe3b12a9c 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.h
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.h
@@ -7,7 +7,7 @@
#endif // _MSC_VER > 1000
// NamingTreeCtrl.h : header file
//
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
class CNamingObject;
/////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/utils/NamingViewer/NamingViewer.mpc b/TAO/utils/NamingViewer/NamingViewer.mpc
index 372bff084c8..c0dfce20c2b 100644
--- a/TAO/utils/NamingViewer/NamingViewer.mpc
+++ b/TAO/utils/NamingViewer/NamingViewer.mpc
@@ -3,7 +3,6 @@
project : namingexe, ace_mfc {
exename = NamingViewer
- install = $(ACE_ROOT)/bin
pch_header = StdAfx.h
pch_source = StdAfx.cpp
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index fc741184c38..356f90237bd 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -4,7 +4,7 @@
#include "NamingViewer.h"
#include "NamingViewerDlg.h"
#include "ViewIORDialog.h"
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#include "SelectNSDialog.h"
#ifdef _DEBUG
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.h b/TAO/utils/NamingViewer/NamingViewerDlg.h
index fbda6676e4d..4ddbe2e6e36 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.h
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.h
@@ -9,7 +9,7 @@
#pragma once
#endif // _MSC_VER > 1000
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "NamingTreeCtrl.h"
/////////////////////////////////////////////////////////////////////////////
// CNamingViewerDlg dialog
diff --git a/TAO/utils/catior/catior.mpc b/TAO/utils/catior/catior.mpc
index 6bb4ff143fc..6c5ed2405a2 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,4 +1,4 @@
// $Id$
-project : taoexe, rtcorba, core {
+project : taoexe, rtcorba {
install = $(ACE_ROOT)/bin
}
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index a177230a856..591998b48cd 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -17,7 +17,7 @@
//
// ================================================================
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_string.h"
@@ -96,11 +96,11 @@ main (int argc, char *argv[])
}
CORBA::Object_var obj;
- if (ior)
- {
- obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
+ if(ior)
+ {
+ obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+ }
CORBA::Object_var nc_obj =
orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 9905c6b40f7..0d913af8c7f 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -17,7 +17,7 @@
//
// ================================================================
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
@@ -26,14 +26,12 @@ CORBA::ORB_var orb;
int showIOR = 0;
int showNSonly = 0;
-const char* USAGE = "Usage: %s [ --name <name> ] [--destroy]\n";
int
main (int argc, char *argv[])
{
ACE_DECLARE_NEW_CORBA_ENV;
int i;
- int destroy_after_unbind = 0;
ACE_TRY
{
CORBA::ORB_var orb =
@@ -57,13 +55,10 @@ main (int argc, char *argv[])
argv++;
name = *argv;
}
- else if (ACE_OS::strcmp (*argv, "--destroy") == 0)
- {
- destroy_after_unbind = 1;
- }
else if (ACE_OS::strncmp(*argv, "--", 2) == 0)
{
- ACE_DEBUG ((LM_DEBUG, USAGE, pname));
+ ACE_DEBUG ((LM_DEBUG,
+ "Usage: %s [ --name <name> ]\n", pname));
return 1;
}
argc--;
@@ -72,7 +67,8 @@ main (int argc, char *argv[])
if (name == 0)
{
- ACE_DEBUG ((LM_DEBUG, USAGE, pname));
+ ACE_DEBUG ((LM_DEBUG,
+ "Usage: %s [ --name <name> ]\n", pname));
return 1;
}
// make a copy
@@ -139,19 +135,7 @@ main (int argc, char *argv[])
the_name[ntoks - 1].id = CORBA::string_dup (lastname);
if (kind != 0)
the_name[ntoks - 1].kind = CORBA::string_dup (kind);
-
- // This needs to be bounded by a try/catch
- CORBA::Object_var the_context = root_nc->resolve (the_name ACE_ENV_ARG_PARAMETER);
root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER );
-
- if (destroy_after_unbind)
- {
- CosNaming::NamingContext_var nc =
- CosNaming::NamingContext::_narrow (the_context.in () ACE_ENV_ARG_PARAMETER);
- if (! CORBA::is_nil(nc.in()))
- nc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- }
-
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 46acd2d6b4a..5f082199fee 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -15,7 +15,7 @@
#include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "tao/Endpoint.h"
#include "tao/Profile.h"
#include "tao/Stub.h"
@@ -37,7 +37,7 @@ get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
{
if (tag == IOP::TAG_INTERNET_IOP)
tag_string = "IIOP";
- else if (tag == TAO_TAG_UIOP_PROFILE)
+ else if (tag == TAO_TAG_UIOP_PROFILE)
tag_string = "UIOP";
else if (tag == TAO_TAG_SHMEM_PROFILE)
tag_string = "SHMEM";
@@ -53,11 +53,6 @@ get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
static void
display_endpoint_info (CORBA::Object_ptr obj)
{
- if (CORBA::is_nil (obj))
- {
- ACE_DEBUG ((LM_DEBUG, "Nil\n"));
- return;
- }
TAO_Stub *stub = obj->_stubobj ();
if (!stub)
@@ -254,7 +249,7 @@ main (int argc, char *argv[])
else if (ACE_OS::strcmp (*argv, "--ctxior") == 0)
{
showCtxIOR = 1;
- }
+ }
else if (ACE_OS::strncmp (*argv, "--", 2) == 0)
{
ACE_DEBUG ((LM_DEBUG, "Usage: %s [[ --ior ][ --ctxior ] | --nsior ]\n", pname));
diff --git a/TAO/utils/nslist/nslist.mpc b/TAO/utils/nslist/nslist.mpc
index 4b8ee5c03d7..e58be6bfc62 100644
--- a/TAO/utils/nslist/nslist.mpc
+++ b/TAO/utils/nslist/nslist.mpc
@@ -1,22 +1,19 @@
// -*- MPC -*-
// $Id$
-project(nsadd): namingexe, core {
- install = $(ACE_ROOT)/bin
+project(nsadd): namingexe {
Source_Files {
nsadd.cpp
}
}
-project(nsdel): namingexe, core {
- install = $(ACE_ROOT)/bin
+project(nsdel): namingexe {
Source_Files {
nsdel.cpp
}
}
-project(nslist): namingexe, core {
- install = $(ACE_ROOT)/bin
+project(nslist): namingexe {
Source_Files {
nslist.cpp
}
diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl
index 6d9b1032d1f..b2d30bbade3 100755
--- a/TAO/utils/nslist/run_test.pl
+++ b/TAO/utils/nslist/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
# $Id$
# -*- perl -*-
-# This is a Perl script that runs some Naming Service tests.
+# This is a Perl script that runs some Naming Service tests.
# It runs all the tests that will run with min CORBA.
# It starts all the servers and clients as necessary.
@@ -19,8 +19,8 @@ use PerlACE::Run_Test;
my $iorfile = PerlACE::LocalFile ("ns.ior");
my $NS = new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service");
my $CL = new PerlACE::Process ("../../orbsvcs/tests/Simple_Naming/client");
-my $LS = new PerlACE::Process ("../../../bin/nslist");
-my $AD = new PerlACE::Process ("../../../bin/nsadd");
+my $LS = new PerlACE::Process ("nslist");
+my $AD = new PerlACE::Process ("nsadd");
my $status = 0;
@@ -37,7 +37,7 @@ sub name_server
if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
- $NS->Kill ();
+ $NS->Kill ();
exit 1;
}
}
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index f8e11f06a4e..3cf4f449e3f 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -8,7 +8,7 @@
#include "wxNamingViewerFrame.h"
#include "wx/clipbrd.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
#include "wxNamingViewer.h"
#include "wxSelectNSDialog.h"
#include "ace/SString.h"
View Lorry Controller Status