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/02/28 15:37:45 UTC
svn commit: r155684 - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/impl/
java/org/apache/ws/resource/properties/impl/
java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/
java/org/apache/ws/util/ test/org/apache/ws/resource/properties/impl/
Author: scamp
Date: Mon Feb 28 06:37:20 2005
New Revision: 155684
URL: http://svn.apache.org/viewcvs?view=rev&rev=155684
Log: (empty)
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java?view=diff&r1=155683&r2=155684
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java Mon Feb 28 06:37:20 2005
@@ -18,14 +18,7 @@
import org.apache.axis.message.addressing.AddressingHeaders;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.NoResourceHomeException;
-import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.ResourceContextException;
-import org.apache.ws.resource.ResourceException;
-import org.apache.ws.resource.ResourceHome;
-import org.apache.ws.resource.ResourceKey;
+import org.apache.ws.resource.*;
import org.apache.ws.resource.faults.ResoureKeyHeaderNotFoundFaultException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
@@ -37,12 +30,7 @@
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.*;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URL;
@@ -165,8 +153,16 @@
{
throw new ResourceException(e);
}
- ResourceKey key = getResourceKey( QName.valueOf(home.getResourceKeyName()), resourceKeyClass);
- LOG.debug( MSG.getMessage( Keys.LOOKUP_RESOURCE_FOR_KEY, key.getValue()));
+
+ String resourceKeyName = home.getResourceKeyName();
+ QName keyName = null;
+ if(resourceKeyName != null)
+ {
+ keyName = QName.valueOf(resourceKeyName);
+ }
+
+ ResourceKey key = getResourceKey( keyName, resourceKeyClass);
+ LOG.debug( MSG.getMessage( Keys.LOOKUP_RESOURCE_FOR_KEY, String.valueOf(key)));
Resource resource = home.find( key );
LOG.debug( MSG.getMessage( Keys.FOUND_RESOURCE, resource ));
return resource;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java?view=diff&r1=155683&r2=155684
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java Mon Feb 28 06:37:20 2005
@@ -191,14 +191,14 @@
XmlObject propXBeanToRemove;
try
{
- propXBeanToRemove = XmlBeanUtils.toXmlObject( propElem );
+ propXBeanToRemove = XmlBeanUtils.getRootElement(XmlBeanUtils.toXmlObject( propElem ));
}
catch ( Exception e )
{
throw new IllegalArgumentException( MSG.getMessage( Keys.UNABLE_TO_CONVERT_TO_XMLOBJECT ) );
}
- if ( propXBeanToRemove.schemaType().getName().equals( m_metaData.getName() ) )
+ if ( !XmlBeanUtils.getName(propXBeanToRemove).equals( m_metaData.getName() ) )
{
throw new IllegalArgumentException( MSG.getMessage( Keys.PROP_ELEM_TO_REMOVE_MST_B_NAMED,
m_metaData.getName() ) );
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java?view=diff&r1=155683&r2=155684
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/InsertResourcePropertiesPortTypeImpl.java Mon Feb 28 06:37:20 2005
@@ -41,7 +41,7 @@
InsertResourcePropertiesResponseDocument responseDoc = createResponseDocument();
InsertResourcePropertiesDocument.InsertResourceProperties requestElem = requestDoc.getInsertResourceProperties();
XmlObject[] propElemsToBeInserted = XmlBeanUtils.getChildElements( requestElem.getInsert() );
- updateResourceProperty( propElemsToBeInserted );
+ insertResourceProperty( propElemsToBeInserted );
return responseDoc;
}
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=155683&r2=155684
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Mon Feb 28 06:37:20 2005
@@ -269,7 +269,7 @@
for ( boolean hasNext = xCursor.toFirstChild(); hasNext; hasNext = xCursor.toNextSibling() )
{
XmlObject siblingXmlObject = xCursor.getObject();
- QName siblingXmlObjectQname = siblingXmlObject.schemaType().getName();
+ QName siblingXmlObjectQname = getName(siblingXmlObject);
// TODO: should this be tested against the original bean
//if it contains the ElementProperty, then it is not an Any
@@ -350,6 +350,7 @@
{
XmlCursor xCursor = xBean.newCursor();
xCursor.removeXml();
+
xCursor.dispose();
}
Modified: incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java?view=diff&r1=155683&r2=155684
==============================================================================
--- incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java (original)
+++ incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java Mon Feb 28 06:37:20 2005
@@ -150,7 +150,7 @@
public void testRemove()
throws Exception
{
- ResourceProperty prop = m_resourcePropSet.get( SushiPropertyQNames.IKA );
+ ResourceProperty prop = m_resourcePropSet.get( SushiPropertyQNames.HAMACHI );
prop.remove( prop.get( 0 ) );
assertTrue( prop.isEmpty() );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org