Updated build instructions, changed E_ERRORs to E_WARNINGs

6 files changed, 47 insertions, 20 deletions

diff --git a/ext/satellite/README b/ext/satellite/README
index a9fccb21b8..2446c8b549 100644
--- a/ext/satellite/README
+++ b/ext/satellite/README
@@ -36,10 +36,12 @@ Before linking Apache you must do either of these things:
 
 What version of ORBit is required?
 ----------------------------------
-You need the CVS version of ORBit to use Satellite!
+You need a CVS version of ORBit to use Satellite!
 
 This does NOT work with ORBit 0.5.3 or earlier.
 
+The latest version of ORBit in CVS requires glib-2.0 and has not been tested.
+Because of this we checkout a CVS version from a know safe date.
 
 How to install ORBit from CVS
 -----------------------------
@@ -48,12 +50,37 @@ How to install ORBit from CVS
 
     CVS root:   :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome
     Password:   Empty string
-    Directory:	ORBit
+    Directory:  ORBit
+    Safe date:  2000-09-02 (yyyy-mm-dd)
 
     More about GNOME:s CVS on http://www.gnome.org/start/source.html
 
+    Sample session at command line to checkout:
+
+    $ export CVSROOT=":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome"
+    
+    $ cvs login
+    (Logging in to anonymous@anoncvs.gnome.org)
+    CVS password:
+    
+    $ cvs checkout -D "2000-09-02" ORBit
+    cvs server: Updating ORBit
+    .
+    .
+    .
+
 (2) Set the environment variable CERTIFIED_GNOMIE to whatever you like.
 
 (3) Run ./autogen.sh, gmake och gmake install
 
 
+How to install ORBit from snapshot
+----------------------------------
+
+(1) Download snapshot from one of these addresses:
+
+    http://download.2good.nu/satellite/ORBit-20000902.tgz
+    http://www.2good.com/satellite/ORBit-20000902.tgz
+
+(2) Run ./configure, gmake and gmake install
+
diff --git a/ext/satellite/class.c b/ext/satellite/class.c
index f50d124b6e..42fa699fb0 100644
--- a/ext/satellite/class.c
+++ b/ext/satellite/class.c
@@ -68,7 +68,7 @@ void orbit_class_function_call(
 		}
 		else
 		{
-			zend_error(E_ERROR, "(Satellite) This class has no constructor");\
+			zend_error(E_WARNING, "(Satellite) This class has no constructor");\
 		}
 	}
 	else
@@ -84,7 +84,7 @@ void orbit_class_function_call(
 				 * this means that the constructor has failed earlier! 
 				 * -- or should NULL be allowed here? 
 				 */
-				php_error(E_ERROR, "(Satellite) Class has no data!");
+				php_error(E_WARNING, "(Satellite) Class has no data!");
 				RETVAL_NULL();
 				goto orbit_class_function_call_exit;
 			}
@@ -95,7 +95,7 @@ void orbit_class_function_call(
 		}
 		else
 		{
-			zend_error(E_ERROR, "(Satellite) Can't call functions in this class");\
+			zend_error(E_WARNING, "(Satellite) Can't call functions in this class");\
 		}
 	}
 
diff --git a/ext/satellite/class.h b/ext/satellite/class.h
index 8d0840f388..0e77679c75 100644
--- a/ext/satellite/class.h
+++ b/ext/satellite/class.h
@@ -120,7 +120,7 @@ static int  _##name##_PutProperty(zend_property_reference * pPropertyReference,
 	}\
 	else\
 	{\
-		zend_error(E_ERROR, "(Satellite) Can't set members in class");\
+		zend_error(E_WARNING, "(Satellite) Can't set members in class");\
 	}\
 	return result;\
 }
@@ -146,7 +146,7 @@ static zval _##name##_GetProperty(zend_property_reference * pPropertyReference)\
 	}\
 	else\
 	{\
-		zend_error(E_ERROR, "(Satellite) Can't get members in class");\
+		zend_error(E_WARNING, "(Satellite) Can't get members in class");\
 	}\
 	return value;\
 }
diff --git a/ext/satellite/enum.c b/ext/satellite/enum.c
index 90f2940674..d58749c7e9 100644
--- a/ext/satellite/enum.c
+++ b/ext/satellite/enum.c
@@ -103,7 +103,7 @@ zend_bool OrbitEnum_Constructor(OrbitEnum ** ppEnum, int parameterCount,
 	p_enum->mpEnumType = TypeManager_FindEnum(ppParameters[0]->value.str.val);
 	if (p_enum->mpEnumType == NULL)
 	{
-		zend_error(E_ERROR, "(Satellite) unknown enum '%s'", ppParameters[0]->value.str.val);
+		zend_error(E_WARNING, "(Satellite) unknown enum '%s'", ppParameters[0]->value.str.val);
 		goto error;
 	}
 
@@ -157,7 +157,7 @@ zend_bool OrbitEnum_GetProperty(OrbitEnum * pEnum,
 
 	if (p_value == NULL)
 	{
-		zend_error(E_ERROR, "(Satellite) unknown member '%s' in enum '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown member '%s' in enum '%s'",
 				pPropertyName, EnumType_GetRepositoryId(pEnum->mpEnumType));
 
 		ZVAL_NULL(pReturnValue);
diff --git a/ext/satellite/object.c b/ext/satellite/object.c
index 8e920c499a..6167915f04 100644
--- a/ext/satellite/object.c
+++ b/ext/satellite/object.c
@@ -139,7 +139,7 @@ static zend_bool OrbitObject_InitializeData(OrbitObject * pObject, const char *
 
 	if (pObject->mCorbaObject == NULL || orbit_caught_exception())
 	{
-		zend_error(E_ERROR, "(Satellite) Unable to resolve IOR");
+		zend_error(E_WARNING, "(Satellite) Unable to resolve IOR");
 		goto error;
 	}
 
@@ -149,7 +149,7 @@ static zend_bool OrbitObject_InitializeData(OrbitObject * pObject, const char *
 
 	if (pObject->mpInterface == NULL)
 	{
-		zend_error(E_ERROR, "(Satellite) unknown interface '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown interface '%s'",
 				pObject->mCorbaObject->type_id);
 		/* TODO: set exception */
 		goto error;
@@ -205,7 +205,7 @@ static void OrbitObject_Wakeup(INTERNAL_FUNCTION_PARAMETERS)
 	return;
 
 error:
-	zend_error(E_ERROR, "(Satellite) Invalid serialized object");
+	zend_error(E_WARNING, "(Satellite) Invalid serialized object");
 	OrbitObject_Destructor(p_object);
 }
 
@@ -234,7 +234,7 @@ zend_bool OrbitObject_Create(CORBA_Object source, zval * pDestination)
 
 	if (p_object->mpInterface == NULL)
 	{
-		zend_error(E_ERROR, "(Satellite) unknown interface '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown interface '%s'",
 				p_object->mCorbaObject->type_id);
 		goto error;
 	}
@@ -289,7 +289,7 @@ zend_bool  OrbitObject_Constructor(OrbitObject  ** ppObject,
 	/* validate parameter types */
 	if (ppParameters[0]->type != IS_STRING)
 	{
-		zend_error(E_ERROR, "(Satellite) IOR is not a string");
+		zend_error(E_WARNING, "(Satellite) IOR is not a string");
 		goto error;
 	}
 
@@ -506,7 +506,7 @@ zend_bool  OrbitObject_CallFunction(OrbitObject  * pObject,
 	if (p_operation == NULL)
 	{
 		/* no such operation */
-		zend_error(E_ERROR, "(Satellite) unknown operation name '%s' in interface '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown operation name '%s' in interface '%s'",
 				pFunctionName, pObject->mCorbaObject->type_id);
 		goto error;
 	}
@@ -655,7 +655,7 @@ zend_bool  OrbitObject_PutProperty(OrbitObject  * pObject,
 	{
 		/*printf("InterfaceType_FindAttribute failed for property %s\n", pPropertyName);*/
 		/* no such atttribute */
-		zend_error(E_ERROR, "(Satellite) unknown attribute name '%s' in interface '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown attribute name '%s' in interface '%s'",
 				pPropertyName, pObject->mCorbaObject->type_id);
 		goto OrbitObject_PutProperty_error;
 	}
@@ -771,7 +771,7 @@ zend_bool  OrbitObject_GetProperty(OrbitObject  * pObject,
 	{
 		/*printf("InterfaceType_FindAttribute failed for property %s\n", pPropertyName);*/
 		/* no such atttribute */
-		zend_error(E_ERROR, "(Satellite) unknown attribute name '%s' in interface '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown attribute name '%s' in interface '%s'",
 				pPropertyName, pObject->mCorbaObject->type_id);
 		goto OrbitObject_GetProperty_error;
 	}
diff --git a/ext/satellite/struct.c b/ext/satellite/struct.c
index bd79c622c1..6720da94b7 100644
--- a/ext/satellite/struct.c
+++ b/ext/satellite/struct.c
@@ -179,7 +179,7 @@ static zend_bool OrbitStruct_Initialize(const char * pId, OrbitStruct * pStruct)
 		pStruct->u.mpExceptionType = TypeManager_FindException(pId);
 		if (pStruct->u.mpExceptionType == NULL)
 		{
-			zend_error(E_ERROR, "(Satellite) unknown struct or exception '%s'", pId);
+			zend_error(E_WARNING, "(Satellite) unknown struct or exception '%s'", pId);
 		
 			goto error;	
 		}
@@ -299,7 +299,7 @@ zend_bool  OrbitStruct_PutProperty(OrbitStruct  * pStruct,
 
 	if (!result)
 	{
-		zend_error(E_ERROR, "(Satellite) unknown member '%s' in struct '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown member '%s' in struct '%s'",
 				pPropertyName, OrbitStruct_GetRepositoryId(pStruct));
 	}
 
@@ -313,7 +313,7 @@ zend_bool  OrbitStruct_GetProperty(OrbitStruct  * pStruct,
 
 	if (p_value == NULL)
 	{
-		zend_error(E_ERROR, "(Satellite) unknown member '%s' in struct '%s'",
+		zend_error(E_WARNING, "(Satellite) unknown member '%s' in struct '%s'",
 				pPropertyName, OrbitStruct_GetRepositoryId(pStruct));
 
 		ZVAL_NULL(pReturnValue);