Author: mmerz
Date: Mon Jan 24 15:37:29 2005
New Revision: 126326

URL: http://svn.apache.org/viewcvs?view=rev&rev=126326
Log:
Big fix in object serialization: temporarily assign dummy serial number to 
ensure object consistency.


Modified:
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
   
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
      (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/InitParamInfo.java
      Mon Jan 24 15:37:29 2005
@@ -22,6 +22,8 @@
 
 public class InitParamInfo implements java.io.Serializable {
 
+    private static final long serialVersionUID = 1L;
+    
     String name;
 
     String value;

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java
   (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181MethodMetadataImpl.java
   Mon Jan 24 15:37:29 2005
@@ -33,6 +33,7 @@
 
 public class Jsr181MethodMetadataImpl implements Jsr181MethodMetadata, 
java.io.Serializable {
 
+    private static final long serialVersionUID = 1L;
     private static final String DEFAULT_WRNAME = "result";
     
     private String wmOperationName;

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java
        (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181ParameterMetadataImpl.java
        Mon Jan 24 15:37:29 2005
@@ -25,6 +25,9 @@
 import javax.xml.namespace.QName;
 
 public class Jsr181ParameterMetadataImpl  implements Jsr181ParameterMetadata, 
java.io.Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
     private String wpName;
     private String wpTargetNamespace;
     private WebParam.Mode wpMode;

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
     (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/Jsr181TypeMetadataImpl.java
     Mon Jan 24 15:37:29 2005
@@ -59,6 +59,9 @@
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 
 public class Jsr181TypeMetadataImpl implements Jsr181TypeMetadata, 
java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
     private String wsName;
     private String wsServiceName;
     private String wsWsdlLocation;
@@ -832,14 +835,16 @@
      * @return
      */
     public static File getLocation(String className) {
-        return new File("models", className + ".ser");
+        return new File(className + ".ser");
     }
 
     /**
      * @param clazz
      */
-    public static Jsr181TypeMetadata load(Class clazz) throws IOException, 
ClassNotFoundException{
-        return 
load(clazz.getClassLoader().getResourceAsStream(getLocation(clazz.getName()).toString()));
+    public static Jsr181TypeMetadata load(Class clazz) throws IOException, 
ClassNotFoundException {
+        String resourceName = getLocation(clazz.getName()).toString();
+        URL url = clazz.getClassLoader().getResource(resourceName);
+        return load(url.openStream());
     }
     
     /**

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
    (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPBindingInfo.java
    Mon Jan 24 15:37:29 2005
@@ -21,6 +21,9 @@
  */
 
 public class SOAPBindingInfo implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
     SOAPBinding.Style style = SOAPBinding.Style.DOCUMENT;
     SOAPBinding.Use use = SOAPBinding.Use.LITERAL;
     SOAPBinding.ParameterStyle parameterStyle = SOAPBinding

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
     (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
     Mon Jan 24 15:37:29 2005
@@ -29,6 +29,9 @@
 import javax.jws.soap.SOAPMessageHandler;
 
 public class SOAPMessageHandlerInfo implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
     String name;
     String className;
     HashMap<String, String> parameterMap = new HashMap<String, String>();

Modified: 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java?view=diff&rev=126326&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java&r1=126325&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java&r2=126326
==============================================================================
--- 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
  (original)
+++ 
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
  Mon Jan 24 15:37:29 2005
@@ -27,6 +27,8 @@
 
 public class SecurityRolesInfo implements java.io.Serializable {
 
+    private static final long serialVersionUID = 1L;
+    
     Collection<String> rolesAllowed = null;
 
     Collection<String> rolesReferenced = null;

Reply via email to