Index: ossp-pkg/as/as-gui/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/ChangeLog,v
rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/ChangeLog,v' 2>/dev/null
--- ChangeLog	2002/12/20 18:19:53	1.7
+++ ChangeLog	2003/01/22 23:57:01	1.8
@@ -1,5 +1,11 @@
 Geschichte des OSSP titraq in Vorwaerts Cronordnung
 
+030122 Added IIOP and SOAP connection operations
+       Added menu items for remote reporting over IIOP or SOAP
+       Fixed inconvenient edit control update bug
+       Added UUID class, able to generate DCE standard UUIDs
+       Added UUID generation ability to add entry operations
+
 021220 Added missing task tooltip and whatsthis info
        Fixed loadData problem actually in updEdit()
        Fixed sorting, and added sort direction handling
Index: ossp-pkg/as/as-gui/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/Makefile.in,v
rcsdiff -q -kk '-r1.32' '-r1.33' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/Makefile.in,v' 2>/dev/null
--- Makefile.in	2003/01/22 18:57:57	1.32
+++ Makefile.in	2003/01/22 23:57:01	1.33
@@ -101,17 +101,24 @@
 
 all: Makefile $(TARGET_PROGS) $(TARGET_MANS)
 
+ifdef CORBABASE
 $(PROG_NAME): $(OBJS) $(IDL_OBJ) $(MOC_OBJ)
 	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
+else
+$(PROG_NAME): $(OBJS) $(MOC_OBJ)
+	$(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
+endif
 
 moc_%.cpp: %.h
 	$(MOC) $< -o $@
 
 # Run the IDL compiler over IDL source
 # but avoid a make deps spaghetti nest
+ifdef CORBABASE
 $(SRCS):$(IDL_OUT)
 $(IDL_OUT): $(IDL_SRC)
 	$(IDL) --c++-suffix=cpp $<
+endif
 
 as-gui.1: as_gui.pod
 	VS=`$(SHTOOL) version -lc -dshort as_version.cpp`; \
@@ -152,13 +159,18 @@
 
 clean:
 	$(RM) $(TARGET_PROGS) $(OBJS) $(IDL_OBJ) $(MOC_OBJ)
+ifdef CORBABASE
+	$(RM) $(IDL_OBJ)
+endif
 	$(RM) as-gui.conf.5 as-gui.1
 	$(RM) as_gui_pcre.tab *.core
 
 distclean: clean
 	$(RM) config.log config.status config.cache # Generated by ./configure
 	$(RM) Makefile ac_config.h                  # Generated by ./configure
+ifdef CORBABASE
 	$(RM) $(IDL_OUT)                       # Generated by $(IDL)
+endif
 	$(RM) $(MOC_OUT)       # Generated by $(MOC)
 
 realclean: distclean
Index: ossp-pkg/as/as-gui/aclocal.m4
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/aclocal.m4,v
rcsdiff -q -kk '-r1.11' '-r1.12' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/aclocal.m4,v' 2>/dev/null
--- aclocal.m4	2003/01/22 22:14:52	1.11
+++ aclocal.m4	2003/01/22 23:57:01	1.12
@@ -218,8 +218,9 @@
 dnl ##
 
 AC_DEFUN(AC_TEST_MICO,[dnl
-AC_ARG_WITH(micodir,dnl
-[  --with-micodir=[DIR]    prefix where MICO is installed], micodir=$withval,)
+AC_ARG_WITH(mico,dnl
+[  --with-mico=[DIR]    prefix where MICO is installed], micodir=$withval,)
+if test $micodir; then
 AC_MSG_CHECKING(the MICO installation path)
 
 dnl ## Ensure that we have a basic path to start searching
@@ -243,6 +244,7 @@
 CXXCPP="$CXXCPP -I${CORBABASE}/include"
 CXXFLAGS="$CXXFLAGS"
 AC_DEFINE(HAVE_MICO, 1, [Define to 1 if building with the MICO ORB.])
+fi
 ])
 
 
@@ -254,8 +256,9 @@
 dnl ##
 
 AC_DEFUN(AC_TEST_ESOAP,[dnl
-AC_ARG_WITH(esoapdir,dnl
-[  --with-easysoapdir=[DIR]    prefix where EasySOAP is installed], esoapdir=$withval,)
+AC_ARG_WITH(esoap,dnl
+[  --with-easysoap=[DIR]    prefix where EasySOAP is installed], esoapdir=$withval,)
+if test $esoapdir; then
 AC_MSG_CHECKING(the EasySOAP installation path)
 
 dnl ## Ensure that we have a basic path to start searching
@@ -279,6 +282,7 @@
 CXXCPP="$CXXCPP -I${SOAPBASE}/include"
 CXXFLAGS="$CXXFLAGS"
 AC_DEFINE(HAVE_ESOAP, 1, [Define to 1 if building with EasySOAP.])
+fi
 ])
 
 
Index: ossp-pkg/as/as-gui/as_assist.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_assist.cpp,v
rcsdiff -q -kk '-r1.81' '-r1.82' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_assist.cpp,v' 2>/dev/null
--- as_assist.cpp	2003/01/22 11:36:53	1.81
+++ as_assist.cpp	2003/01/22 23:57:01	1.82
@@ -334,6 +334,7 @@
                                  "from the <b>View</b> menu.</p>";
     m_pRefreshact->setWhatsThis(kszRefreshtext);
 
+#ifdef HAVE_MICO
     // Syncronize data with remote server over IIOP action
     m_pSynciiopact = new QAction(trUtf8("Synchronize over IIOP"), Synciset, trUtf8("&Synchronize IIOP"), CTRL+Key_E, this, "Synchronizeiiop");
     if (m_pSynciiopact == NULL) // Sanity check
@@ -345,7 +346,9 @@
                                   "You can also select the <b>Synchronize</b> command "
                                   "from the <b>Report</b> menu.</p>";
     m_pSynciiopact->setWhatsThis(kszSynciioptext);
+#endif // HAVE_MICO
 
+#ifdef HAVE_ESOAP
     // Syncronize data with remote server over SOAP action
     m_pSyncsoapact = new QAction(trUtf8("Synchronize over SOAP"), Synciset, trUtf8("&Synchronize SOAP"), CTRL+Key_E, this, "Synchronizesoap");
     if (m_pSyncsoapact == NULL) // Sanity check
@@ -357,6 +360,7 @@
                                   "You can also select the <b>Synchronize</b> command "
                                   "from the <b>Report</b> menu.</p>";
     m_pSyncsoapact->setWhatsThis(kszSyncsoaptext);
+#endif // HAVE_ESOAP
 }
 
 //
@@ -469,9 +473,18 @@
     if (pReportpopup == NULL) // Sanity check
         throw Genexcept("Main window report popup creation failed.");
     m_pMenubar->insertItem(trUtf8("&Report"), pReportpopup);
+#ifdef HAVE_MICO
+#define HAS_RPC
     m_pSynciiopact->addTo(pReportpopup);
+#endif // HAVE_MICO
+#ifdef HAVE_ESOAP
+#define HAS_RPC
     m_pSyncsoapact->addTo(pReportpopup);
+#endif // HAVE_ESOAP
+#ifdef HAS_RPC
+    // We only want to add a separator if its needed
     pReportpopup->insertSeparator();
+#endif // HAS_RPC
     nMenuid = pReportpopup->insertItem(trUtf8("&Local Report"), this, SLOT(genReport()));
     pReportpopup->setItemEnabled(nMenuid, false);
 
@@ -990,8 +1003,12 @@
     m_pCutact->setEnabled(bTurned);
     m_pCopyact->setEnabled(bTurned);
     m_pPasteact->setEnabled(bTurned);
+#ifdef HAVE_MICO
     m_pSynciiopact->setEnabled(bTurned);
+#endif // HAVE_MICO
+#ifdef HAVE_ESOAP
     m_pSyncsoapact->setEnabled(bTurned);
+#endif // HAVE_ESOAP
 
     // Unconditional settings
     this->updEdit(m_pMaintable->currentRow());      // Update edit controls
Index: ossp-pkg/as/as-gui/as_gui.h
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_gui.h,v
rcsdiff -q -kk '-r1.60' '-r1.61' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_gui.h,v' 2>/dev/null
--- as_gui.h	2003/01/21 12:38:01	1.60
+++ as_gui.h	2003/01/22 23:57:01	1.61
@@ -48,6 +48,10 @@
 #include <qlayout.h>
 #include <qfile.h>
 
+#ifdef HAVE_CONFIG_H
+#include "ac_config.h"
+#endif
+
 #include "as_except.h"  // Exception classes
 #include "as_const.h"   // For general constants
 #include "as_pref.h"    // For class Preferences
Index: ossp-pkg/as/as-gui/as_slot.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v
rcsdiff -q -kk '-r1.81' '-r1.82' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v' 2>/dev/null
--- as_slot.cpp	2003/01/22 19:20:30	1.81
+++ as_slot.cpp	2003/01/22 23:57:01	1.82
@@ -36,11 +36,6 @@
 #include <qmenudata.h>
 //#include <qregexp.h>
 
-// RPC headers
-#include <easysoap/SOAP.h>
-#include <coss/CosNaming.h>
-#include "asdb.h"               // CORBA stubs and skeletons
-
 // User interface
 #include "as_gui.h"             // Main classes
 #include "as_except.h"          // Exception classes
@@ -48,6 +43,15 @@
 #include "as_generic.h"         // Generic classes
 #include "as_uuid.h"            // UUID classes
 
+// RPC headers
+#ifdef HAVE_ESOAP
+#include <easysoap/SOAP.h>
+#endif // HAVE_ESOAP
+#ifdef HAVE_MICO
+#include <coss/CosNaming.h>
+#include "asdb.h"               // CORBA stubs and skeletons
+#endif // HAVE_MICO
+
 // Icon pixel maps
 #include "as_gfx/cwlogo.xpm"    // static const char *s_kpcCwlogo_xpm[]
 #include "as_gfx/ossplogo.xpm"  // static const char *s_kpcOssplogo_xpm[]
@@ -117,7 +121,7 @@
     QTableSelection Select; // Highlighted text
     int nTotal = 0;         // Total row select
     int nCurrent = 0;       // Current row
-    auto_ptr<AS::Uuid> pGuid(new AS::Uuid); // For GUID production
+    std::auto_ptr<AS::Uuid> pGuid(new AS::Uuid); // For GUID production
 
     // Decide how many rows to add
     Select = m_pMaintable->selection(0);
@@ -1156,6 +1160,7 @@
 //
 void Titraqform::syncIiop(void)
 {
+#ifdef HAVE_MICO
     int nNada = 0;          // Some false parameters
     char **ppcNada = NULL;  // to fake out the ORB
     CORBA::ORB_var Orb;     // The ORB
@@ -1236,6 +1241,7 @@
     catch (...) {
         qWarning("Caught unknown exception\n");
     }
+#endif // HAVE_MICO
 }
 
 //
@@ -1243,6 +1249,7 @@
 //
 void Titraqform::syncSoap(void)
 {
+#ifdef HAVE_ESOAP
     USING_EASYSOAP_NAMESPACE
 
     try {
@@ -1273,6 +1280,7 @@
     catch (...) {
         qDebug("Caught unknown exception\n");
     }
+#endif // HAVE_ESOAP
 }
 
 //