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 ip...@apache.org on 2005/03/29 00:56:04 UTC
svn commit: r159327 - in incubator/apollo/trunk: ./
src/java/org/apache/ws/resource/handler/
src/java/org/apache/ws/resource/impl/
src/java/org/apache/ws/resource/properties/impl/
src/java/org/apache/ws/util/ src/webapp/WEB-INF/
Author: ips
Date: Mon Mar 28 14:56:02 2005
New Revision: 159327
URL: http://svn.apache.org/viewcvs?view=rev&rev=159327
Log:
...
Modified:
incubator/apollo/trunk/maven.xml
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd
incubator/apollo/trunk/src/webapp/WEB-INF/web.xml
Modified: incubator/apollo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/maven.xml?view=diff&r1=159326&r2=159327
==============================================================================
--- incubator/apollo/trunk/maven.xml (original)
+++ incubator/apollo/trunk/maven.xml Mon Mar 28 14:56:02 2005
@@ -108,13 +108,6 @@
</goal>
- <postGoal name="jar:jar">
- <mkdir dir="${env.CATALINA_HOME}/webapps/wsrf/WEB-INF/lib" />
- <copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${env.CATALINA_HOME}/webapps/wsrf/WEB-INF/lib" />
- <mkdir dir="${maven.war.webapp.dir}/WEB-INF/lib" />
- <copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${maven.war.webapp.dir}/WEB-INF/lib" />
- </postGoal>
-
<!-- ================================================================== -->
<!-- W A R : W E B A P P -->
<!-- P O S T - G O A L -->
@@ -142,6 +135,11 @@
<attainGoal name="dep-license-files" />
</postGoal>
+
+ <goal name="deploy">
+ <mkdir dir="${env.CATALINA_HOME}/webapps/${webapp.name}/WEB-INF/lib" />
+ <copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${env.CATALINA_HOME}/webapps/${webapp.name}/WEB-INF/lib" overwrite="true" verbose="true" />
+ </goal>
<!-- ================================================================== -->
<!-- D I S T : P R E P A R E - B I N - F I L E S Y S T E M -->
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java?view=diff&r1=159326&r2=159327
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/ResourceHandler.java Mon Mar 28 14:56:02 2005
@@ -17,6 +17,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.i18n.Keys;
@@ -109,6 +110,11 @@
return new QName[0];
}
+ static
+ {
+ ExceptionUtils.addCauseMethodName( "getLinkedCause" ); // for JAXRPCException
+ }
+
/**
* DOCUMENT_ME
*
@@ -166,7 +172,7 @@
serviceMethod.getName(),
serviceClass.getName(),
ite.getCause() ) );
- throw ite.getCause();
+ throw ExceptionUtils.getRootCause( ite );
}
if ( responseXBean != null )
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?view=diff&r1=159326&r2=159327
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Mon Mar 28 14:56:02 2005
@@ -471,7 +471,7 @@
}
catch ( RuntimeException re )
{
- throw new ResourceException( MSG.getMessage( Keys.FAILED_TO_INIT_RESOURCE, resource, re ));
+ throw new ResourceException( MSG.getMessage( Keys.FAILED_TO_INIT_RESOURCE, resource, re ), re);
}
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=159326&r2=159327
==============================================================================
--- 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 Mar 28 14:56:02 2005
@@ -122,6 +122,10 @@
public void add( Object propElem )
{
XmlObject propXBean = toPropXBean( propElem );
+ if ( propXBean == null )
+ {
+ throw new IllegalArgumentException( "A" );
+ }
trimValue( propXBean );
propXBean = XmlBeanUtils.addChildElement( m_propSet.toXmlObject(),
propXBean );
@@ -333,28 +337,37 @@
private XmlObject toPropXBean( Object propElem )
{
+ if ( propElem == null )
+ {
+ throw new IllegalArgumentException( "Property element is null." );
+ }
XmlObject propXBean;
try
{
propXBean = XmlBeanUtils.getRootElement( XmlBeanUtils.toXmlObject( propElem ) );
+ if ( propXBean == null )
+ {
+ throw new IllegalArgumentException( "Property element is an empty document XmlObject." );
+ }
}
catch ( Exception e )
{
throw new IllegalArgumentException( MSG.getMessage( Keys.UNABLE_TO_CONVERT_TO_XMLOBJECT ) + " " + e);
}
-
return propXBean;
}
private void trimValue( XmlObject propXBean )
{
- // TODO: make this a configurable option
+ // TODO: get rid of this or make it a configurable option
if ( propXBean instanceof XmlAnySimpleType )
{
XmlAnySimpleType simplePropXBean = (XmlAnySimpleType) propXBean;
- String untrimmedValue = simplePropXBean.getStringValue();
- String trimmedValue = untrimmedValue != null ? untrimmedValue.trim() : null;
- simplePropXBean.setStringValue( trimmedValue );
+ String value = simplePropXBean.getStringValue();
+ if ( value != null && ! value.equals( "" ) )
+ {
+ simplePropXBean.setStringValue( value.trim() );
+ }
}
}
}
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=159326&r2=159327
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Mon Mar 28 14:56:02 2005
@@ -471,7 +471,7 @@
*
* @param obj an object
*
- * @return an XMLBean , or null if the obj param is null.
+ * @return an XMLBean, or null if the parameter is null
*
* @throws Exception if the object cannot be converted to an XMLBean
*/
@@ -480,7 +480,10 @@
{
XmlObject xBean;
- if ( obj == null) return null;
+ if ( obj == null)
+ {
+ return null;
+ }
if ( obj instanceof XmlObject )
{
Modified: incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd?view=diff&r1=159326&r2=159327
==============================================================================
--- incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd (original)
+++ incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd Mon Mar 28 14:56:02 2005
@@ -7,17 +7,7 @@
<parameter name="disablePrettyXML" value="false"/>
<parameter name="sendXsiTypes" value="false"/>
<parameter name="sendMultiRefs" value="false"/>
- <parameter name="sendXMLDeclaration" value="true"/>
-
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="wsbf:>BaseFaultType>Description" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.ws.resource.faults.axis.v2004_06._BaseFaultType_Description" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="wsbf:>BaseFaultType>ErrorCode" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.ws.resource.faults.axis.v2004_06._BaseFaultType_ErrorCode" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"/>
-
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="wsbf:>BaseFaultType>Description" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.ws.resource.faults.axis.v1_2_draft03._BaseFaultType_Description" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-BaseFaults-1.2-draft-03.xsd"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="wsbf:>BaseFaultType>ErrorCode" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.ws.resource.faults.axis.v1_2_draft03._BaseFaultType_ErrorCode" xmlns:wsbf="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-BaseFaults-1.2-draft-03.xsd"/>
-
-
-
-
+ <parameter name="sendXMLDeclaration" value="true"/>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
@@ -41,8 +31,7 @@
<handler type="URLMapper"/>
<handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
</requestFlow>
- <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
-
+ <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
<parameter name="useDefaultQueryStrings" value="true"/>
<parameter name="qs.list" value="org.apache.axis.transport.http.QSListHandler"/>
<parameter name="qs.method" value="org.apache.axis.transport.http.QSMethodHandler"/>
@@ -54,6 +43,5 @@
<handler type="LocalResponder"/>
</responseFlow>
</transport>
-
</deployment>
Modified: incubator/apollo/trunk/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/WEB-INF/web.xml?view=diff&r1=159326&r2=159327
==============================================================================
--- incubator/apollo/trunk/src/webapp/WEB-INF/web.xml (original)
+++ incubator/apollo/trunk/src/webapp/WEB-INF/web.xml Mon Mar 28 14:56:02 2005
@@ -91,7 +91,6 @@
<mime-type>text/xml</mime-type>
</mime-mapping>
-
<mime-mapping>
<extension>xsd</extension>
<mime-type>text/xml</mime-type>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org