ws-muse-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r426561 - in /webservices/muse/trunk/modules: muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/ muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/ muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/i...
Date Fri, 28 Jul 2006 15:21:22 GMT
Author: danj
Date: Fri Jul 28 08:21:21 2006
New Revision: 426561

URL: http://svn.apache.org/viewvc?rev=426561&view=rev
Log:
Changed names of WSRF ext faults to be inline with other WSRF fault names.

Added:
    webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/MetadataValidationFault.java
    webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/SchemaValidationFault.java
Removed:
    webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/MetadataValidationErrorFault.java
    webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/SchemaValidationErrorFault.java
Modified:
    webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java

Added: webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/MetadataValidationFault.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/MetadataValidationFault.java?rev=426561&view=auto
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/MetadataValidationFault.java
(added)
+++ webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/metadata/faults/MetadataValidationFault.java
Fri Jul 28 08:21:21 2006
@@ -0,0 +1,47 @@
+/*=============================================================================*
+ *  Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
+
+package org.apache.muse.ws.resource.metadata.faults;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.ws.resource.basefaults.BaseFault;
+import org.apache.muse.ws.resource.ext.WsrfExtConstants;
+
+public class MetadataValidationFault extends BaseFault
+{
+    private static final long serialVersionUID = 8481165393605262914L;
+
+    public MetadataValidationFault(Element xml)
+    {
+        super(xml);
+    }
+
+    public MetadataValidationFault(String message)
+    {
+        super(WsrfExtConstants.METADATA_VALIDATION_ERROR_QNAME, message);
+    }
+
+    public MetadataValidationFault(String message, Throwable cause)
+    {
+        super(WsrfExtConstants.METADATA_VALIDATION_ERROR_QNAME, message, cause);
+    }
+
+    public MetadataValidationFault(Throwable cause)
+    {
+        super(WsrfExtConstants.METADATA_VALIDATION_ERROR_QNAME, cause);
+    }
+}

Added: webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/SchemaValidationFault.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/SchemaValidationFault.java?rev=426561&view=auto
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/SchemaValidationFault.java
(added)
+++ webservices/muse/trunk/modules/muse-wsrf-api/src/org/apache/muse/ws/resource/properties/schema/faults/SchemaValidationFault.java
Fri Jul 28 08:21:21 2006
@@ -0,0 +1,47 @@
+/*=============================================================================*
+ *  Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
+
+package org.apache.muse.ws.resource.properties.schema.faults;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.ws.resource.basefaults.BaseFault;
+import org.apache.muse.ws.resource.ext.WsrfExtConstants;
+
+public class SchemaValidationFault extends BaseFault
+{
+    private static final long serialVersionUID = -6023235939977117785L;
+
+    public SchemaValidationFault(Element xml)
+    {
+        super(xml);
+    }
+
+    public SchemaValidationFault(String message)
+    {
+        super(WsrfExtConstants.SCHEMA_VALIDATION_ERROR_QNAME, message);
+    }
+
+    public SchemaValidationFault(String message, Throwable cause)
+    {
+        super(WsrfExtConstants.SCHEMA_VALIDATION_ERROR_QNAME, message, cause);
+    }
+
+    public SchemaValidationFault(Throwable cause)
+    {
+        super(WsrfExtConstants.SCHEMA_VALIDATION_ERROR_QNAME, cause);
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java?rev=426561&r1=426560&r2=426561&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
(original)
+++ webservices/muse/trunk/modules/muse-wsrf-impl/src/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java
Fri Jul 28 08:21:21 2006
@@ -33,7 +33,7 @@
 import org.apache.muse.ws.resource.WsResourceCapability;
 import org.apache.muse.ws.resource.basefaults.BaseFault;
 import org.apache.muse.ws.resource.metadata.MetadataDescriptor;
-import org.apache.muse.ws.resource.metadata.faults.MetadataValidationErrorFault;
+import org.apache.muse.ws.resource.metadata.faults.MetadataValidationFault;
 import org.apache.muse.ws.resource.metadata.impl.ExternalChangeApprover;
 import org.apache.muse.ws.resource.metadata.impl.InsertOnlyApprover;
 import org.apache.muse.ws.resource.metadata.impl.ReadOnlyApprover;
@@ -45,7 +45,7 @@
 import org.apache.muse.ws.resource.properties.listeners.PropertyChangeListener;
 import org.apache.muse.ws.resource.properties.listeners.PropertyReadListener;
 import org.apache.muse.ws.resource.properties.schema.ResourcePropertiesSchema;
-import org.apache.muse.ws.resource.properties.schema.faults.SchemaValidationErrorFault;
+import org.apache.muse.ws.resource.properties.schema.faults.SchemaValidationFault;
 import org.apache.muse.ws.resource.properties.set.SetRequest;
 import org.apache.muse.ws.resource.properties.set.SetRequestComponent;
 import org.apache.muse.ws.resource.properties.set.faults.UnableToModifyResourcePropertyFault;
@@ -977,7 +977,7 @@
             Object[] filler = { 
                 qname, new Integer(min), new Integer(currentSize - toDelete) 
             };
-            throw new SchemaValidationErrorFault(_MESSAGES.get("BelowMinimumPotential", filler));
+            throw new SchemaValidationFault(_MESSAGES.get("BelowMinimumPotential", filler));
         }
     }
     
@@ -1020,7 +1020,7 @@
         if (!_schema.isMaxUnbounded(qname) && total > max)
         {
             Object[] filler = { qname, new Integer(max), new Integer(total) };
-            throw new SchemaValidationErrorFault(_MESSAGES.get("AboveMaximumPotential", filler));
+            throw new SchemaValidationFault(_MESSAGES.get("AboveMaximumPotential", filler));
         }
         
         //
@@ -1033,7 +1033,7 @@
             if (!isNillable && !values[n].hasChildNodes())
             {
                 Object[] filler = { qname };
-                throw new SchemaValidationErrorFault(_MESSAGES.get("NotNillable", filler));
+                throw new SchemaValidationFault(_MESSAGES.get("NotNillable", filler));
             }
         }
     }
@@ -1069,7 +1069,7 @@
                 if (!_metadata.isValidValue(qname, current[n]))
                 {
                     Object[] filler = { qname, XmlUtils.toString(current[n], false) };
-                    throw new MetadataValidationErrorFault(_MESSAGES.get("InvalidValue",
filler));
+                    throw new MetadataValidationFault(_MESSAGES.get("InvalidValue", filler));
                 }
             }
         }
@@ -1114,7 +1114,7 @@
                 Object[] filler = {
                     qname, new Integer(min), new Integer(instances.length)
                 };
-                throw new SchemaValidationErrorFault(_MESSAGES.get("BelowMinimum", filler));
+                throw new SchemaValidationFault(_MESSAGES.get("BelowMinimum", filler));
             }
             
             //
@@ -1125,7 +1125,7 @@
                 Object[] filler = {
                     qname, new Integer(min), new Integer(instances.length)
                 };
-                throw new SchemaValidationErrorFault(_MESSAGES.get("AboveMaximum", filler));
+                throw new SchemaValidationFault(_MESSAGES.get("AboveMaximum", filler));
             }
             
             //
@@ -1136,7 +1136,7 @@
             if (!isNillable)
                 for (int n = 0; n < instances.length; ++n)
                     if (!instances[n].hasChildNodes())
-                        throw new SchemaValidationErrorFault(message);
+                        throw new SchemaValidationFault(message);
         }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org


Mime
View raw message