You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2006/07/25 12:37:06 UTC
svn commit: r425364 - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/template/
adb/src/org/apache/axis2/databinding/utils/
adb/test/org/apache/axis2/databinding/
codegen/src/org/apache/axis2/wsdl/codegen/emitter/ raha...
Author: ajith
Date: Tue Jul 25 03:37:05 2006
New Revision: 425364
URL: http://svn.apache.org/viewvc?rev=425364&view=rev
Log:
1.Changed the implementation of the ConverterUtil.java to have methods in correct camel case.
I. Now all the converter methods are in proper camel case
II. The templates are changed to use the camel cased version of the type name to generate the method signature
III. Refactored a few classes that used ConverterUtil.java directly
Note - this may break already generated classes. One would need to regenerate the stubs/message receivers to suit the change
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenResponseType.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenType.java
webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java
webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/client/EventingClient.java
webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java
webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Tue Jul 25 03:37:05 2006
@@ -281,7 +281,7 @@
if (prefix == null) {
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
+
xmlWriter.writeStartElement(prefix, parentQName.getLocalPart(), namespace);
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
@@ -342,27 +342,27 @@
<xsl:choose>
<xsl:when test="@nillable">
if (<xsl:value-of select="$varName"/>==null){
-
+
java.lang.String namespace = "<xsl:value-of select="$namespace"/>";
-
+
if (! namespace.equals("")) {
java.lang.String prefix = xmlWriter.getPrefix(namespace);
-
+
if (prefix == null) {
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
-
+
xmlWriter.writeStartElement(prefix,"<xsl:value-of select="$propertyName"/>", namespace);
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
-
+
} else {
xmlWriter.writeStartElement(namespace,"<xsl:value-of select="$propertyName"/>");
}
-
+
} else {
xmlWriter.writeStartElement("<xsl:value-of select="$propertyName"/>");
}
-
+
// write the nil attribute
writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","nil","true",xmlWriter);
@@ -976,7 +976,8 @@
<xsl:variable name="propertyName" select="@name"/>
<xsl:variable name="propertyType" select="@type"/>
<xsl:variable name="shortTypeNameUncapped" select="@shorttypename"/>
- <xsl:variable name="shortTypeName" select="@shorttypename"/>
+ <xsl:variable name="shortTypeName"
+ select="concat(translate(substring($shortTypeNameUncapped, 1, 1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ), substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
<xsl:variable name="javaName" select="@javaname"/>
<xsl:variable name="namespace" select="@nsuri"/>
<xsl:variable name="attribName">tempAttrib<xsl:value-of select="$propertyName"/></xsl:variable>
@@ -1024,7 +1025,9 @@
<xsl:for-each select="property[not(@attribute)]">
<xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
<xsl:variable name="propertyType"><xsl:value-of select="@type"/></xsl:variable>
- <xsl:variable name="shortTypeName"><xsl:value-of select="@shorttypename"/></xsl:variable>
+ <xsl:variable name="shortTypeNameUncapped" select="@shorttypename"/>
+ <xsl:variable name="shortTypeName"
+ select="concat(translate(substring($shortTypeNameUncapped, 1, 1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ), substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
<xsl:variable name="javaName"><xsl:value-of select="@javaname"></xsl:value-of></xsl:variable>
<xsl:variable name="listName">list<xsl:value-of select="position()"/></xsl:variable>
<xsl:variable name="loopBoolName">loopDone<xsl:value-of select="position()"/></xsl:variable>
@@ -1930,8 +1933,10 @@
<!-- populate attributes here!!!. The attributes are part of an element, not part of a type -->
<xsl:for-each select="property[@attribute]">
<xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
- <xsl:variable name="propertyType"><xsl:value-of select="@type"/></xsl:variable>
- <xsl:variable name="shortTypeName"><xsl:value-of select="@shorttypename"/></xsl:variable>
+ <xsl:variable name="propertyType" select="@type"/>
+ <xsl:variable name="shortTypeNameUncapped" select="@shorttypename"/>
+ <xsl:variable name="shortTypeName"
+ select="concat(translate( substring($shortTypeNameUncapped, 1, 1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ), substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
<xsl:variable name="javaName"><xsl:value-of select="@javaname"></xsl:value-of></xsl:variable>
<xsl:variable name="namespace"><xsl:value-of select="@nsuri"/></xsl:variable>
<xsl:variable name="attribName">tempAttrib<xsl:value-of select="$propertyName"/></xsl:variable>
@@ -1979,7 +1984,9 @@
<xsl:for-each select="property[not(@attribute)]">
<xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
<xsl:variable name="propertyType"><xsl:value-of select="@type"/></xsl:variable>
- <xsl:variable name="shortTypeName"><xsl:value-of select="@shorttypename"/></xsl:variable>
+ <xsl:variable name="shortTypeNameUncapped" select="@shorttypename"/>
+ <xsl:variable name="shortTypeName"
+ select="concat(translate( substring($shortTypeNameUncapped, 1, 1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ), substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
<xsl:variable name="javaName"><xsl:value-of select="@javaname"></xsl:value-of></xsl:variable>
<xsl:variable name="listName">list<xsl:value-of select="position()"/></xsl:variable>
<xsl:variable name="loopBoolName">loopDone<xsl:value-of select="position()"/></xsl:variable>
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Tue Jul 25 03:37:05 2006
@@ -238,11 +238,11 @@
*/
- public static int convertToint(String s) {
+ public static int convertToInt(String s) {
return Integer.parseInt(s);
}
- public static double convertTodouble(String s) {
+ public static double convertToDouble(String s) {
if (POSITIVE_INFINITY.equals(s)){
return Double.POSITIVE_INFINITY;
}else if (NEGATIVE_INFINITY.equals(s)){
@@ -251,11 +251,11 @@
return Double.parseDouble(s);
}
- public static BigDecimal convertTodecimal(String s) {
+ public static BigDecimal convertToDecimal(String s) {
return new BigDecimal(s);
}
- public static float convertTofloat(String s) {
+ public static float convertToFloat(String s) {
if (POSITIVE_INFINITY.equals(s)){
return Float.POSITIVE_INFINITY;
}else if (NEGATIVE_INFINITY.equals(s)){
@@ -264,27 +264,27 @@
return Float.parseFloat(s);
}
- public static String convertTostring(String s) {
+ public static String convertToString(String s) {
return s;
}
- public static long convertTolong(String s) {
+ public static long convertToLong(String s) {
return Long.parseLong(s);
}
- public static short convertToshort(String s) {
+ public static short convertToShort(String s) {
return Short.parseShort(s);
}
- public static boolean convertToboolean(String s) {
+ public static boolean convertToBoolean(String s) {
return Boolean.valueOf(s).booleanValue();
}
- public static String convertToanySimpleType(String s) {
+ public static String convertToAnySimpleType(String s) {
return s;
}
- public static OMElement convertToanyType(String s) {
+ public static OMElement convertToAnyType(String s) {
try {
XMLStreamReader r = StAXUtils.createXMLStreamReader(
new ByteArrayInputStream(s.getBytes()));
@@ -295,38 +295,36 @@
}
}
- public static YearMonth convertTogYearMonth(String s) {
+ public static YearMonth convertToGYearMonth(String s) {
return new YearMonth(s);
}
- public static MonthDay convertTogMonthDay(String s) {
+ public static MonthDay convertToGMonthDay(String s) {
return new MonthDay(s);
}
- public static Year convertTogYear(String s) {
+ public static Year convertToGYear(String s) {
return new Year(s);
}
- public static Month convertTogMonth(String s) {
+ public static Month convertToGMonth(String s) {
return new Month(s);
}
- public static Day convertTogDay(String s) {
+ public static Day convertToGDay(String s) {
return new Day(s);
}
- public static Duration convertToduration(String s) {
- return new Duration(s);
- }
-
public static Duration convertToDuration(String s) {
return new Duration(s);
}
- public static HexBinary convertTohexBinary(String s) {
+
+
+ public static HexBinary convertToHexBinary(String s) {
return new HexBinary(s);
}
- public static javax.activation.DataHandler convertTobase64Binary(String s)
+ public static javax.activation.DataHandler convertToBase64Binary(String s)
throws Exception{
// reusing the byteArrayDataSource from the Axiom classes
ByteArrayDataSource byteArrayDataSource = new ByteArrayDataSource(
@@ -342,7 +340,7 @@
* @param source
* @return Returns Date.
*/
- public static Date convertTodate(String source) {
+ public static Date convertToDate(String source) {
Calendar calendar = Calendar.getInstance();
SimpleDateFormat zulu = new SimpleDateFormat("yyyy-MM-dd");
@@ -388,51 +386,49 @@
return result;
}
- public static Time convertTotime(String s) {
+ public static Time convertToTime(String s) {
return new Time(s);
}
- public static Token convertTotoken(String s) {
- return new Token(s);
- }
-
public static Token convertToToken(String s) {
return new Token(s);
}
- public static NormalizedString convertTonormalizedString(String s) {
+
+
+ public static NormalizedString convertToNormalizedString(String s) {
return new NormalizedString(s);
}
- public static UnsignedLong convertTounsignedLong(String s) {
+ public static UnsignedLong convertToUnsignedLong(String s) {
return new UnsignedLong(s);
}
- public static UnsignedInt convertTounsignedInt(String s) {
+ public static UnsignedInt convertToUnsignedInt(String s) {
return new UnsignedInt(s);
}
- public static UnsignedShort convertTounsignedShort(String s) {
+ public static UnsignedShort convertToUnsignedShort(String s) {
return new UnsignedShort(s);
}
- public static UnsignedByte convertTounsignedByte(String s) {
+ public static UnsignedByte convertToUnsignedByte(String s) {
return new UnsignedByte(s);
}
- public static NonNegativeInteger convertTononNegativeInteger(String s) {
+ public static NonNegativeInteger convertToNonNegativeInteger(String s) {
return new NonNegativeInteger(s);
}
- public static NegativeInteger convertTonegativeInteger(String s) {
+ public static NegativeInteger convertToNegativeInteger(String s) {
return new NegativeInteger(s);
}
- public static PositiveInteger convertTopositiveInteger(String s) {
+ public static PositiveInteger convertToPositiveInteger(String s) {
return new PositiveInteger(s);
}
- public static NonPositiveInteger convertTononPositiveInteger(String s) {
+ public static NonPositiveInteger convertToNonPositiveInteger(String s) {
return new NonPositiveInteger(s);
}
@@ -448,7 +444,7 @@
return new Id(s);
}
- public static Language convertTolanguage(String s) {
+ public static Language convertToLanguage(String s) {
return new Language(s);
}
@@ -481,15 +477,15 @@
return new IDRefs(s);
}
- public static URI convertToanyURI(String s) throws Exception {
+ public static URI convertToAnyURI(String s) throws Exception {
return new URI(s);
}
- public static BigInteger convertTointeger(String s) throws Exception {
+ public static BigInteger convertToInteger(String s) throws Exception {
return new BigInteger(s);
}
- public static byte convertTobyte(String s) throws Exception {
+ public static byte convertToByte(String s) throws Exception {
return Byte.parseByte(s);
}
@@ -500,7 +496,7 @@
* @return Returns Calendar.
* @throws Exception
*/
- public static Calendar convertTodateTime(String source) throws Exception {
+ public static Calendar convertToDateTime(String source) throws Exception {
Calendar calendar = Calendar.getInstance();
SimpleDateFormat zulu =
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/ClientInfo.java Tue Jul 25 03:37:05 2006
@@ -1,19 +1,19 @@
-/*
-* Copyright 2004,2005 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.
-*/
-
+/*
+* Copyright 2004,2005 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.
+*/
+
/**
* ClientInfo.java
*
@@ -150,7 +150,7 @@
String content = reader.getElementText();
object.setName(
- org.apache.axis2.databinding.utils.ConverterUtil.convertTostring(content));
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
count++;
@@ -161,7 +161,7 @@
String content = reader.getElementText();
object.setSsn(
- org.apache.axis2.databinding.utils.ConverterUtil.convertTostring(content));
+ org.apache.axis2.databinding.utils.ConverterUtil.convertToString(content));
count++;
Modified: webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java (original)
+++ webservices/axis2/trunk/java/modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java Tue Jul 25 03:37:05 2006
@@ -1,19 +1,19 @@
-/*
-* Copyright 2004,2005 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.
-*/
-
+/*
+* Copyright 2004,2005 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.
+*/
+
/**
* CreateAccountRequest.java
*
@@ -146,7 +146,7 @@
String content = reader.getElementText();
object
.setPassword(org.apache.axis2.databinding.utils.ConverterUtil
- .convertTostring(content));
+ .convertToString(content));
count++;
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Tue Jul 25 03:37:05 2006
@@ -65,7 +65,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-//import com.ibm.wsdl.util.xml.DOM2Writer;
+import com.ibm.wsdl.util.xml.DOM2Writer;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -508,7 +508,7 @@
doc.appendChild(rootElement);
//////////////////////////////////////////////////////////
- //System.out.println(DOM2Writer.nodeToString(rootElement));
+ System.out.println(DOM2Writer.nodeToString(rootElement));
////////////////////////////////////////////////////////////
return doc;
}
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenResponseType.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenResponseType.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenResponseType.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenResponseType.java Tue Jul 25 03:37:05 2006
@@ -277,7 +277,7 @@
if (tempAttribContext != null) {
object
.setContext(org.apache.axis2.databinding.utils.ConverterUtil
- .convertToanyURI(tempAttribContext));
+ .convertToAnyURI(tempAttribContext));
}
org.apache.axis2.databinding.utils.SimpleElementReaderStateMachine stateMachine1 = new org.apache.axis2.databinding.utils.SimpleElementReaderStateMachine();
@@ -289,7 +289,7 @@
object.setTokenType(
org.apache.axis2.databinding.utils.ConverterUtil
- .convertToanyURI(stateMachine1.getText()));
+ .convertToAnyURI(stateMachine1.getText()));
object
.setRequestedSecurityToken(org.apache.rahas.types.RequestedSecurityTokenType.Factory
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenType.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenType.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenType.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/types/RequestSecurityTokenType.java Tue Jul 25 03:37:05 2006
@@ -275,7 +275,7 @@
if (tempAttribContext != null) {
object
.setContext(org.apache.axis2.databinding.utils.ConverterUtil
- .convertToanyURI(tempAttribContext));
+ .convertToAnyURI(tempAttribContext));
}
org.apache.axis2.databinding.utils.SimpleElementReaderStateMachine stateMachine1 = new org.apache.axis2.databinding.utils.SimpleElementReaderStateMachine();
@@ -287,7 +287,7 @@
object.setTokenType(
org.apache.axis2.databinding.utils.ConverterUtil
- .convertToanyURI(stateMachine1.getText()));
+ .convertToAnyURI(stateMachine1.getText()));
// Move to a start element
event = reader.getEventType();
@@ -304,7 +304,7 @@
object.setRequestType(
org.apache.axis2.databinding.utils.ConverterUtil
- .convertToanyURI(stateMachine2.getText()));
+ .convertToAnyURI(stateMachine2.getText()));
// Move to a start element
event = reader.getEventType();
Modified: webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java Tue Jul 25 03:37:05 2006
@@ -266,7 +266,7 @@
}
} else {
try {
- Calendar calendar = ConverterUtil.convertTodateTime(expiresStr);
+ Calendar calendar = ConverterUtil.convertToDateTime(expiresStr);
date = calendar.getTime();
bean.setDateValue(date);
} catch (Exception e) {
Modified: webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/client/EventingClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/client/EventingClient.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/client/EventingClient.java (original)
+++ webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/client/EventingClient.java Tue Jul 25 03:37:05 2006
@@ -202,7 +202,7 @@
expirationBean.setDurationValue(duration);
} else {
expirationBean.setDuration(false);
- Date date = ConverterUtil.convertTodateTime(text).getTime();
+ Date date = ConverterUtil.convertToDateTime(text).getTime();
expirationBean.setDateValue(date);
}
Modified: webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java (original)
+++ webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java Tue Jul 25 03:37:05 2006
@@ -24,7 +24,7 @@
ExpirationBean expirationBean = processor.getExpirationBean(renewMessage);
assertTrue(expirationBean.isDuration());
- Duration duration = ConverterUtil.convertToduration("P1Y2M3DT10H30M");
+ Duration duration = ConverterUtil.convertToDuration("P1Y2M3DT10H30M");
assertEquals(duration,expirationBean.getDurationValue());
assertEquals (expirationBean.getSubscriberID(),"UUID:DummySubscriberID");
}
@@ -35,7 +35,7 @@
ExpirationBean expirationBean = processor.getExpirationBean(renewMessage);
assertFalse(expirationBean.isDuration());
- Date date = ConverterUtil.convertTodateTime("2004-06-26T21:07:00.000-08:00").getTime();
+ Date date = ConverterUtil.convertToDateTime("2004-06-26T21:07:00.000-08:00").getTime();
assertEquals(expirationBean.getDateValue(),date);
assertEquals (expirationBean.getSubscriberID(),"UUID:DummySubscriberID");
}
Modified: webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java?rev=425364&r1=425363&r2=425364&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java (original)
+++ webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java Tue Jul 25 03:37:05 2006
@@ -63,7 +63,7 @@
assertEquals(eventingSubscriber.getDelivery().getDeliveryEPR().getAddress() ,"http://www.other.example.com/OnStormWarning");
assertEquals(eventingSubscriber.getEndToEPr().getAddress(),"http://www.example.com/MyEventSink");
- Date date = ConverterUtil.convertTodateTime("2004-06-26T21:07:00.000-08:00").getTime();
+ Date date = ConverterUtil.convertToDateTime("2004-06-26T21:07:00.000-08:00").getTime();
assertEquals(eventingSubscriber.getSubscriptionEndingTime(),date);
}
@@ -75,7 +75,7 @@
assertNotNull(expirationBean);
assertNotNull(expirationBean.getSubscriberID());
- Date date = ConverterUtil.convertTodateTime("2004-06-26T21:07:00.000-08:00").getTime();
+ Date date = ConverterUtil.convertToDateTime("2004-06-26T21:07:00.000-08:00").getTime();
assertEquals(expirationBean.getDateValue(),date);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org