You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by sc...@apache.org on 2005/03/31 20:57:08 UTC
svn commit: r159625 - in incubator/apollo/trunk: ./
src/java/org/apache/ws/resource/properties/impl/
src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/
src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/
src/java/org/apache/ws/util/
Author: scamp
Date: Thu Mar 31 10:57:06 2005
New Revision: 159625
URL: http://svn.apache.org/viewcvs?view=rev&rev=159625
Log: (empty)
Modified:
incubator/apollo/trunk/project.properties
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
Modified: incubator/apollo/trunk/project.properties
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.properties?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/project.properties (original)
+++ incubator/apollo/trunk/project.properties Thu Mar 31 10:57:06 2005
@@ -20,6 +20,7 @@
log4j.configuration = test-log4j.properties
maven.junit.fork = on
+
# WAR PLUGIN
##############
# Target dir for our webapp
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/AbstractSetResourcePropertiesPortType.java Thu Mar 31 10:57:06 2005
@@ -222,11 +222,12 @@
private Object[] getValue( ResourceProperty prop )
{
Object[] value = new Object[prop.size()];
+
Iterator propElemIter = prop.iterator();
int i = 0;
while ( propElemIter.hasNext() )
{
- value[i++] = propElemIter.next();
+ value[i++] = XmlBeanUtils.copyXmlBean((XmlObject) propElemIter.next());
}
return value;
}
@@ -352,8 +353,9 @@
for ( int i = 0; i < prop.getChangeListeners().length; i++ )
{
ResourcePropertyValueChangeListener listener = prop.getChangeListeners()[i];
- listener.propertyChanged( new XmlBeansResourcePropertyValueChangeEvent( oldValue, newValue ) );
+ listener.propertyChanged( getResourcePropertyValueChangeEvent( oldValue, newValue ) );
}
}
+ protected abstract AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent( Object[] oldValue, Object[] newValue );
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesPortTypeImpl.java Thu Mar 31 10:57:06 2005
@@ -21,6 +21,7 @@
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.properties.v2004_06.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.faults.InsertResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.SetResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;
@@ -29,6 +30,7 @@
import org.apache.ws.resource.properties.faults.UpdateResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.v2004_06.porttype.SetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.i18n.Messages;
@@ -151,4 +153,8 @@
return NAMESPACE_SET;
}
+ protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ return new XmlBeansResourcePropertyValueChangeEvent(oldValue,newValue);
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/DeleteResourcePropertiesPortTypeImpl.java Thu Mar 31 10:57:06 2005
@@ -4,8 +4,10 @@
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.v2004_11.porttype.DeleteResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.DeleteResourcePropertiesResponseDocument;
@@ -28,6 +30,11 @@
public DeleteResourcePropertiesPortTypeImpl( ResourceContext resourceContext )
{
super( resourceContext );
+ }
+
+ protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ return new XmlBeansResourcePropertyValueChangeEvent(oldValue,newValue);
}
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java Thu Mar 31 10:57:06 2005
@@ -3,8 +3,10 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.v2004_11.porttype.InsertResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.InsertResourcePropertiesDocument;
@@ -57,5 +59,9 @@
{
return NAMESPACE_SET;
}
-
+
+ protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ return new XmlBeansResourcePropertyValueChangeEvent(oldValue,newValue);
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java Thu Mar 31 10:57:06 2005
@@ -30,8 +30,10 @@
import org.apache.ws.resource.properties.faults.UpdateResourcePropertyRequestFailedFaultException;
import org.apache.ws.resource.properties.faults.InvalidUpdateResourcePropertiesRequestContentFaultException;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.v2004_11.porttype.SetResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlObject;
@@ -151,4 +153,8 @@
return NAMESPACE_SET;
}
+ protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ return new XmlBeansResourcePropertyValueChangeEvent(oldValue,newValue);
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java Thu Mar 31 10:57:06 2005
@@ -3,8 +3,10 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.properties.NamespaceVersionHolder;
import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.resource.properties.v2004_11.porttype.UpdateResourcePropertiesPortType;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v2004_11.impl.XmlBeansResourcePropertyValueChangeEvent;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.UpdateResourcePropertiesDocument;
@@ -55,4 +57,8 @@
return NAMESPACE_SET;
}
+ protected AbstractXmlBeansResourcePropertyValueChangeEvent getResourcePropertyValueChangeEvent(Object[] oldValue, Object[] newValue)
+ {
+ return new XmlBeansResourcePropertyValueChangeEvent(oldValue,newValue);
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java?view=diff&r1=159624&r2=159625
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Thu Mar 31 10:57:06 2005
@@ -577,5 +577,59 @@
String localName = value.substring( colonIndex + 1 );
return new QName( nsURI, localName );
}
-
+ /**
+ * Makes and returns a copy of the specified XMLBean.
+ *
+ * @param srcXBean the XMLBean to be copied
+ *
+ * @return a copy of the specified XMLBean
+ */
+ public static XmlObject copyXmlBean( XmlObject srcXBean )
+ {
+ XmlCursor srcCursor = srcXBean.newCursor( );
+
+ // create an object to copy to
+ XmlObject destXBean = XmlObject.Factory.newInstance( );
+
+ // setup a cursor to copy into
+ XmlCursor destCursor = destXBean.newCursor( );
+
+ // move into the document
+ destCursor.toStartDoc( ); // don't think this line is necessary
+ destCursor.toNextToken( );
+
+ // copy the xml into the new document
+ srcCursor.copyXml( destCursor );
+
+ // clean up our cursors
+ destCursor.dispose( );
+ srcCursor.dispose( );
+
+ return destXBean;
+ }
+
+ /**
+ * Makes and returns a copy of the specified XMLBean array.
+ *
+ * @param srcXBeans the array of XMLBeans to be copied
+ *
+ * @return a copy of the specified XMLBean array
+ */
+ public static XmlObject[] copyXmlBeans( XmlObject[] srcXBeans )
+ {
+ if ( srcXBeans == null )
+ {
+ return null;
+ }
+
+ XmlObject[] destXBeans = new XmlObject[srcXBeans.length];
+
+ for ( int i = 0; i < srcXBeans.length; i++ )
+ {
+ destXBeans[i] = copyXmlBean( srcXBeans[i] );
+ }
+
+ return destXBeans;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org