Revert files modified when replacing cm interface with am interface.

configure

@@ -1495,8 +1495,6 @@ done
 
 
 
-
-
 
 
 
@@ -1582,7 +1580,6 @@ REMOTEWIKIDOCS=1
 PROTOGENI_SUPPORT=0
 PROTOGENI_CLEARINGHOUSE=0
 PROTOGENI_DOMAIN="unknown"
-GENI_AM_SUPPORT=0
 STANDALONE_CLEARINGHOUSE=0
 NODE_USAGE_SUPPORT=0
 NOSTACKMIB=0
@@ -2195,17 +2192,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2199: checking for $ac_hdr" >&5
+echo "configure:2195: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2204 "configure"
+#line 2200 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2244,17 +2241,17 @@ for ac_hdr in linux/videodev.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2248: checking for $ac_hdr" >&5
+echo "configure:2244: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2249 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2287,7 +2284,7 @@ done
 # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2291: checking for $ac_word" >&5
+echo "configure:2287: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2344,7 +2341,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2348: checking how to run the C++ preprocessor" >&5
+echo "configure:2344: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2357,12 +2354,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 2361 "configure"
+#line 2357 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2388,17 +2385,17 @@ echo "$ac_t""$CXXCPP" 1>&6
 
 ac_safe=`echo "xercesc/dom/DOM.hpp" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for xercesc/dom/DOM.hpp""... $ac_c" 1>&6
-echo "configure:2392: checking for xercesc/dom/DOM.hpp" >&5
+echo "configure:2388: checking for xercesc/dom/DOM.hpp" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2397 "configure"
+#line 2393 "configure"
 #include "confdefs.h"
 #include <xercesc/dom/DOM.hpp>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2462,7 +2459,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2466: checking for a BSD compatible install" >&5
+echo "configure:2462: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2523,7 +2520,7 @@ esac
 # Extract the first word of "rsync", so it can be a program name with args.
 set dummy rsync; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2527: checking for $ac_word" >&5
+echo "configure:2523: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3056,7 +3053,6 @@ s%@REMOTEWIKIDOCS@%$REMOTEWIKIDOCS%g
 s%@PROTOGENI_SUPPORT@%$PROTOGENI_SUPPORT%g
 s%@PROTOGENI_CLEARINGHOUSE@%$PROTOGENI_CLEARINGHOUSE%g
 s%@PROTOGENI_DOMAIN@%$PROTOGENI_DOMAIN%g
-s%@GENI_AM_SUPPORT@%$GENI_AM_SUPPORT%g
 s%@STANDALONE_CLEARINGHOUSE@%$STANDALONE_CLEARINGHOUSE%g
 s%@GMAP_API_KEY@%$GMAP_API_KEY%g
 s%@NODE_USAGE_SUPPORT@%$NODE_USAGE_SUPPORT%g

configure.in

@@ -213,7 +213,6 @@ AC_SUBST(REMOTEWIKIDOCS)
 AC_SUBST(PROTOGENI_SUPPORT)
 AC_SUBST(PROTOGENI_CLEARINGHOUSE)
 AC_SUBST(PROTOGENI_DOMAIN)
-AC_SUBST(GENI_AM_SUPPORT)
 AC_SUBST(STANDALONE_CLEARINGHOUSE)
 AC_SUBST(GMAP_API_KEY)
 AC_SUBST(NODE_USAGE_SUPPORT)
@@ -301,7 +300,6 @@ REMOTEWIKIDOCS=1
 PROTOGENI_SUPPORT=0
 PROTOGENI_CLEARINGHOUSE=0
 PROTOGENI_DOMAIN="unknown"
-GENI_AM_SUPPORT=0
 STANDALONE_CLEARINGHOUSE=0
 NODE_USAGE_SUPPORT=0
 NOSTACKMIB=0

protogeni/xmlrpc/protogeni-cm.pl.in

@@ -33,14 +33,12 @@ BEGIN { $GENI_DBNAME = "geni-cm"; }
 # Configure variables
 my $EMULAB_PEMFILE = "@prefix@/etc/genicm.pem";
 my $MAINSITE 	   = @TBMAINSITE@;
-my $GENI_AM_SUPPORT = "@GENI_AM_SUPPORT@";
 my $VERSION	   = "2.0";
 
 # Testbed libraries.
 use lib '@prefix@/lib';
 use GeniCM;
 use GeniCMV2;
-use GeniAM;
 use Genixmlrpc;
 use GeniResponse;
 use libaudit;
@@ -145,18 +143,7 @@ if (exists($ENV{'PATH_INFO'}) && $ENV{'PATH_INFO'} ne "") {
 #
 Genixmlrpc->SetContext(Genixmlrpc->Context($certificate));
 
-if ($GENI_AM_SUPPORT) {
-    $responder = Frontier::Responder->new( "methods" => {
-	"GetVersion"    => \&GeniAM::GetVersion,
-	"ListResources" => \&GeniAM::ListResources,
-	"CreateSliver"  => \&GeniAM::CreateSliver,
-        "DeleteSliver"  => \&GeniAM::DeleteSliver,
-        "SliverStatus"  => \&GeniAM::SliverStatus,
-        "RenewSliver"   => \&GeniAM::RenewSliver,
-        "Shutdown"      => \&GeniAM::Shutdown,
-    },);
-}
-elsif ($VERSION eq "1.0") {
+if ($VERSION eq "1.0") {
     $responder = Frontier::Responder->new( "methods" => {
 	"GetVersion"        => \&GeniCM::GetVersion,
 	"Resolve"	    => \&GeniCM::Resolve,