[Omc-commit] SF.net SVN: omc: [425] contrib/xml-service-provider/trunk

[<jc...@us...>]

Revision: 425
          http://svn.sourceforge.net/omc/?rev=425&view=rev
Author:   jcarey
Date:     2007-01-11 16:35:28 -0800 (Thu, 11 Jan 2007)

Log Message:
-----------
Changed location where the xml service provider looks for xml service description documents to %{prefix}/share/omc/svcinfo.d

Modified Paths:
--------------
    contrib/xml-service-provider/trunk/configure.ac
    contrib/xml-service-provider/trunk/example-services/apache/Apache.xml
    contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec
    contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp
    contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd

Modified: contrib/xml-service-provider/trunk/configure.ac
===================================================================
--- contrib/xml-service-provider/trunk/configure.ac	2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/configure.ac	2007-01-12 00:35:28 UTC (rev 425)
@@ -32,17 +32,19 @@
 ##       It now uses compile (primarily) but still uses pre-processor for interim transition / backward compatibility
 ##       pre-processor needs the CPPFLAGS
 
+if test "x$prefix" != "xNONE"; then
+	prefixDir=${prefix}
+else
+	prefixDir=${ac_default_prefix}
+fi
+AC_DEFINE_UNQUOTED(XMLSVC_PREFIX_DIR, "${prefixDir}", "Default prefix dir")
 
 #######################################################################
 # set the location of the sysconf dir
 if test "x$sysconfdir" != "x\${prefix}/etc"; then
 	tempDir=$sysconfdir
 else
-	if test "x$prefix" != "xNONE"; then
-		tempDir=${prefix}/etc
-	else
-		tempDir=${ac_default_prefix}/etc
-	fi
+	tempDir=${prefixDir}/etc
 fi
 
 AC_DEFINE_UNQUOTED(XMLSVC_SYSCONF_DIR, "${tempDir}", "Default sysconfig dir")

Modified: contrib/xml-service-provider/trunk/example-services/apache/Apache.xml
===================================================================
--- contrib/xml-service-provider/trunk/example-services/apache/Apache.xml	2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/example-services/apache/Apache.xml	2007-01-12 00:35:28 UTC (rev 425)
@@ -2,7 +2,7 @@
 <!--
 Sample Service Description XML Document.
 	
-This file should be placed in /etc/omc/svcinfo.d
+This file should be placed in /usr/share/omc/svcinfo.d
 It should be named <service name>.xml. The reason for the naming scheme,
 is that other services can refer to this service in their dependency list using
 the file name minus the '.xml' extension.
@@ -53,7 +53,8 @@
 	<!--
 		Define the services that this service has a dependency on.
 		There must be a corresponding Service Description XML file
-		for the antecedent service in the /etc/omc/svcinfo.d directory.
+		for the antecedent service in the /usr/share/omc/svcinfo.d
+		directory.
 	-->
 	<dependsOn>
 		<serviceName>Service1-That-Apache-Depends-On</serviceName>

Modified: contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec
===================================================================
--- contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec	2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec	2007-01-12 00:35:28 UTC (rev 425)
@@ -57,7 +57,8 @@
 %{__mkdir} -p $RPM_BUILD_ROOT
 # Tell 'make install' to install into the BuildRoot
 make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{xmlsvcsysconfdir}/omc/svcinfo.d
+mkdir -p $RPM_BUILD_ROOT/%{xmlsvcprefix}/share/omc/svcinfo.d
+
 MOFDIR=$RPM_BUILD_ROOT/%{xmlsvcprefix}/share/mof/%{name}
 install -d $MOFDIR
 install mof/*.mof $MOFDIR/
@@ -102,8 +103,9 @@
 %{xmlsvcprefix}/%_lib/lib*.so*
 %dir %{xmlsvcprefix}/share/mof/%{name}
 %{xmlsvcprefix}/share/mof/%{name}/*
-%dir %{xmlsvcsysconfdir}/omc
-%dir %{xmlsvcsysconfdir}/omc/svcinfo.d
+%dir %{xmlsvcprefix}/share/omc
+%dir %{xmlsvcprefix}/share/omc/svcinfo.d
 
+
 %changelog -n openwbem-xmlservice-providers
 

Modified: contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp
===================================================================
--- contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp	2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp	2007-01-12 00:35:28 UTC (rev 425)
@@ -41,10 +41,8 @@
 	return env->getLogger(COMPONENT);
 }
 
+#define SVCINFO_DIR	XMLSVC_PREFIX_DIR"/share/omc/svcinfo.d"
 
-//#define SVCINFO_DIR	"/etc/omc/svcinfo.d"
-#define SVCINFO_DIR	XMLSVC_SYSCONF_DIR"/omc/svcinfo.d"
-
 // XML Tags
 #define SERVICE_DESC_TAG 		"serviceDescription"
 #define NAME_TAG 				"name"

Modified: contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd
===================================================================
--- contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd	2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd	2007-01-12 00:35:28 UTC (rev 425)
@@ -60,10 +60,10 @@
 		<xs:documentation xml:lang="en-US">
 			Define the services that this service has a dependency on.
 			There must be a corresponding Service Description XML file
-			for the antecedent service in the /etc/omc/svcinfo.d directory.
+			for the antecedent service in the /usr/share/omc/svcinfo.d directory.
 			If serviceName is specified as "Foo", then it is assumed the
 			the Service Description XML document for "Foo" is contained in
-			the file /etc/omc/svcinfo.d/Foo.xml.
+			the file /usr/share/omc/svcinfo.d/Foo.xml.
 		</xs:documentation>
 	</xs:annotation>
 	<xs:sequence>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.