Author: dims
Date: Mon Apr 16 08:51:51 2007
New Revision: 529296
URL: http://svn.apache.org/viewvc?view=rev&rev=529296
Log:
merge from branch
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/boolean.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONMessageFormatter.java
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java
webservices/axis2/trunk/java/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp
webservices/axis2/trunk/java/modules/webapp/listService.jsp
webservices/axis2/trunk/java/modules/webapp/listServices.jsp
webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/boolean.xsd
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/boolean.xsd?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/boolean.xsd
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/boolean.xsd
Mon Apr 16 08:51:51 2007
@@ -1,7 +1,7 @@
<xs:schema elementFormDefault="qualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:tns="http://tempuri.org/attribute";
- targetNamespace="http://tempuri.org/attribute";>
+ xmlns:tns="http://tempuri.org/boolean1";
+ targetNamespace="http://tempuri.org/boolean1";>
<xs:element name="TestBoolean1" type="xs:boolean"/>
<xs:element name="TestBoolean2" >
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/BooleanTest.java
Mon Apr 16 08:51:51 2007
@@ -19,8 +19,8 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.util.StAXUtils;
-import org.tempuri.attribute.TestBoolean1;
-import org.tempuri.attribute.TestBoolean2;
+import org.tempuri.boolean1.TestBoolean1;
+import org.tempuri.boolean1.TestBoolean2;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
(original)
+++
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
Mon Apr 16 08:51:51 2007
@@ -55,6 +55,20 @@
private static final String FLOAT = "float";
private static final String CHAR = "char";
+ /*
+ * To support deserialize BigDecimal, BigInteger
+ * Day, Duration, Month, MonthDay, Time, Year, YearMonth
+ */
+ private static final String BIG_DECIMAL = "java.math.BigDecimal";
+ private static final String BIG_INTEGER = "java.math.BigInteger";
+ private static final String DAY = "org.apache.axis2.databinding.types.Day";
+ private static final String DURATION =
"org.apache.axis2.databinding.types.Duration";
+ private static final String MONTH =
"org.apache.axis2.databinding.types.Month";
+ private static final String MONTH_DAY =
"org.apache.axis2.databinding.types.MonthDay";
+ private static final String TIME =
"org.apache.axis2.databinding.types.Time";
+ private static final String YEAR =
"org.apache.axis2.databinding.types.Year";
+ private static final String YEAR_MONTH =
"org.apache.axis2.databinding.types.YearMonth";
+
public static Object getSimpleTypeObject(Class parameter, OMElement value)
{
String name = parameter.getName();
String text = value.getText();
@@ -99,7 +113,37 @@
return makeCalendar(text, false);
} else if (name.equals(W_DATE)) {
return makeCalendar(text, true);
- } else {
+ }/*
+ * return the correpsonding object for adding data type
+ */
+ else if(name.equals(BIG_DECIMAL)) {
+ return new java.math.BigDecimal(text);
+ }
+ else if(name.equals(BIG_INTEGER)) {
+ return new java.math.BigInteger(text);
+ }
+ else if(name.equals(DAY)) {
+ return new org.apache.axis2.databinding.types.Day(text);
+ }
+ else if(name.equals(DURATION)) {
+ return new org.apache.axis2.databinding.types.Duration(text);
+ }
+ else if(name.equals(MONTH)) {
+ return new org.apache.axis2.databinding.types.Month(text);
+ }
+ else if(name.equals(MONTH_DAY)) {
+ return new org.apache.axis2.databinding.types.MonthDay(text);
+ }
+ else if(name.equals(TIME)) {
+ return new org.apache.axis2.databinding.types.Time(text);
+ }
+ else if(name.equals(YEAR)) {
+ return new org.apache.axis2.databinding.types.Year(text);
+ }
+ else if(name.equals(YEAR_MONTH)) {
+ return new org.apache.axis2.databinding.types.YearMonth(text);
+ }
+ else {
return null;
}
}
@@ -199,7 +243,23 @@
return true;
} else if (objClassName.equals(W_DATE)) {
return true;
- } else {
+ } /*
+ * consider BigDecimal, BigInteger, Day, Duration, Month
+ * MonthDay, Time, Year, YearMonth as simple type
+ */
+ else if(objClassName.equals(BIG_DECIMAL)
+ || objClassName.equals(BIG_INTEGER)
+ || objClassName.equals(DAY)
+ || objClassName.equals(DURATION)
+ || objClassName.equals(MONTH)
+ || objClassName.equals(MONTH_DAY)
+ || objClassName.equals(TIME)
+ || objClassName.equals(YEAR)
+ || objClassName.equals(YEAR_MONTH))
+ {
+ return true;
+ }
+ else {
return objClassName.equals(W_CHAR);
}
}
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?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
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
Mon Apr 16 08:51:51 2007
@@ -2154,6 +2154,9 @@
org.apache.axis2.transport.http.HTTPConstants
.MEDIA_TYPE_X_WWW_FORM +
"\""));
+ methodElement.appendChild(generateOptionParamComponent(doc,
+
"org.apache.axis2.Constants.Configuration.SOAP_RESPONSE_MEP",
+ "true"));
} else if (bindingType != null &&
bindingType.equals(WSDL2Constants.URI_WSDL2_HTTP)) {
methodElement.appendChild(generateOptionParamComponent(doc,
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/WSDL11Writer.java
Mon Apr 16 08:51:51 2007
@@ -16,7 +16,11 @@
import javax.wsdl.xml.WSDLWriter;
import java.io.File;
import java.io.FileOutputStream;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import java.util.ArrayList;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -104,6 +108,11 @@
null, serviceName,
".wsdl");
FileOutputStream out = new FileOutputStream(outputFile);
+ // we have a catch here
+ // if there are multimple services in the definition object
+ // we have to write only the relavent service.
+
+
if (definition.getServices().size() > 1){
List removedServices = new ArrayList();
List servicesList = new ArrayList();
@@ -134,7 +143,6 @@
// no problem proceed normaly
wsdlWriter.writeWSDL(definition, out);
}
-
out.flush();
out.close();
}
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
Mon Apr 16 08:51:51 2007
@@ -288,6 +288,9 @@
null);
message = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
+ OMNamespace namespace = message.declareNamespace(WSAD_NS,
+ "wsaw");
+ message.addAttribute("Action", "urn:" + jmethod.getSimpleName(),
namespace);
message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ COLON_SEPARATOR + jmethod.getSimpleName()
+ MESSAGE_SUFFIX, null);
@@ -298,6 +301,9 @@
message.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ COLON_SEPARATOR + jmethod.getSimpleName()
+ RESPONSE_MESSAGE, null);
+ namespace = message.declareNamespace(WSAD_NS,
+ "wsaw");
+ message.addAttribute("Action", "urn:" +
jmethod.getSimpleName(), namespace);
operation.addChild(message);
}
if (jmethod.getExceptionTypes().length > 0) {
@@ -307,6 +313,9 @@
+ "Fault", null);
message.addAttribute(ATTRIBUTE_NAME, jmethod.getSimpleName()
+ "Fault", null);
+ namespace = message.declareNamespace(WSAD_NS,
+ "wsaw");
+ message.addAttribute("Action", "urn:" +
jmethod.getSimpleName(), namespace);
operation.addChild(message);
}
}
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
Mon Apr 16 08:51:51 2007
@@ -36,6 +36,8 @@
String URI_WSDL11_SOAP = "http://schemas.xmlsoap.org/wsdl/soap/";;
String TRANSPORT_URI = "http://schemas.xmlsoap.org/soap/http";;
String DEFAULT_LOCATION_URL = "http://localhost:8080/axis2/services/";;
+ String WSAD_NS = "http://www.w3.org/2006/05/addressing/wsdl";;
+
String HTTP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/http/";;
String MIME_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/mime/";;
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Mon Apr 16 08:51:51 2007
@@ -316,7 +316,11 @@
}
}
- /** @param javaType */
+ /**
+ * Generate schema construct for given type
+ *
+ * @param javaType
+ */
private QName generateSchema(JClass javaType) throws Exception {
String name = getQualifiedName(javaType);
QName schemaTypeName = typeTable.getComplexSchemaType(name);
@@ -368,9 +372,9 @@
complexType.setContentModel(contentModel);
- } else
+ } else {
complexType.setParticle(sequence);
-
+ }
complexType.setName(simpleName);
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
Mon Apr 16 08:51:51 2007
@@ -79,6 +79,27 @@
simpleTypetoxsd.put("java.util.Calendar",
new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "dateTime",
"xs"));
+ //consider BigDecimal, BigInteger, Day, Duration, Month, MonthDay,
+ //Time, Year, YearMonth as SimpleType as well
+ simpleTypetoxsd.put("java.math.BigDecimal",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "decimal",
"xs"));
+ simpleTypetoxsd.put("java.math.BigInteger",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "integer",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.Day",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "gDay",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.Duration",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "duration",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.Month",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "gMonth",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.MonthDay",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "gMonthDay",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.Time",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "time",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.Year",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "gYear",
"xs"));
+ simpleTypetoxsd.put("org.apache.axis2.databinding.types.YearMonth",
+ new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD,
"gYearMonth", "xs"));
+
simpleTypetoxsd.put("java.lang.Object",
ANY_TYPE);
@@ -124,12 +145,12 @@
return false;
}
- public void addComplexSchema(String name, QName schemaType) {
- complexTypeMap.put(name, schemaType);
- }
-
public Map getComplexSchemaMap() {
return complexTypeMap;
+ }
+
+ public void addComplexSchema(String name, QName schemaType) {
+ complexTypeMap.put(name, schemaType);
}
public QName getComplexSchemaType(String name) {
Modified:
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONMessageFormatter.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONMessageFormatter.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONMessageFormatter.java
(original)
+++
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONMessageFormatter.java
Mon Apr 16 08:51:51 2007
@@ -37,6 +37,8 @@
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
/**
* This JSONMessageFormatter is the formatter for "Mapped" formatted JSON in
Axis2. This type of
Modified:
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/json/src/org/apache/axis2/json/JSONOMBuilder.java
Mon Apr 16 08:51:51 2007
@@ -26,10 +26,14 @@
import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.transport.http.util.URIEncoderDecoder;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
+
+import java.io.IOException;
+import java.io.InputStream;
/** Makes the OMSourcedElementImpl object with the JSONDataSource inside. */
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
Mon Apr 16 08:51:51 2007
@@ -245,6 +245,8 @@
public static final String ENABLE_REST = "enableREST";
public static final String ENABLE_REST_THROUGH_GET = "restThroughGet";
+ public static final String ARTIFACTS_TEMP_DIR = "artifactsDIR";
+
//Attachment configurations
public static final String ENABLE_MTOM = "enableMTOM";
public static final String CACHE_ATTACHMENTS = "cacheAttachments";
@@ -320,6 +322,11 @@
*/
public static final String MESSAGE_TYPE = "messageType";
+ public static final String SOAP_RESPONSE_MEP = "soapResponseMEP";
+
+ /**
+ * This will be used as a key for storing transport information.
+ */
public static final String TRANSPORT_INFO_MAP = "TransportInfoMap";
}
Modified:
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
(original)
+++
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
Mon Apr 16 08:51:51 2007
@@ -106,7 +106,7 @@
assertFalse(response.getAttachments().hasNext());
assertEquals(0, response.countAttachments());
- printSOAPMessage(request);
+ String requestStr = printSOAPMessage(request);
String responseStr = printSOAPMessage(response);
assertTrue(responseStr.indexOf("echo") != -1);
sCon.close();
Modified:
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java
(original)
+++
webservices/axis2/trunk/java/modules/samples/userguide/src/userguide/clients/RESTClient.java
Mon Apr 16 08:51:51 2007
@@ -37,7 +37,7 @@
*/
public class RESTClient {
- private static String toEpr = "http://localhost:8080/axis2/rest/MyService";;
+ private static String toEpr =
"http://localhost:8080/axis2/services/MyService";;
public static void main(String[] args) throws AxisFault {
Modified:
webservices/axis2/trunk/java/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
---
webservices/axis2/trunk/java/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
(original)
+++
webservices/axis2/trunk/java/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
Mon Apr 16 08:51:51 2007
@@ -47,7 +47,7 @@
public String searchYahoo(String query, String format) {
try {
snippet = beginHTML;
- String epr =
"http://api.search.yahoo.com/WebSearchService/V1/webSearch";;
+ String epr =
"http://search.yahooapis.com/WebSearchService/V1/webSearch";;
ServiceClient client = new ServiceClient();
Options options = new Options();
Modified: webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listFaultyService.jsp Mon Apr
16 08:51:51 2007
@@ -35,7 +35,6 @@
<jsp:include page="include/link-footer.jsp"></jsp:include>
<%
String prifix = request.getAttribute("frontendHostUrl") +
(String)request.getSession().getAttribute(Constants.SERVICE_PATH) +"services/";
- String restprefix = request.getAttribute("frontendHostUrl") + "rest/";
%>
<%
String isFault =
(String)request.getSession().getAttribute(Constants.IS_FAULTY);
@@ -57,7 +56,6 @@
String serviceName = axisService.getName();
%><h2><font color="blue"><a href="<%=prifix +
axisService.getName()%>?wsdl"><%=serviceName%></a></font></h2>
<font color="blue">Service EPR : </font><font
color="black"><%=prifix + axisService.getName()%></font><br>
- <font color="blue">Service REST epr :</font><font
color="black"><%=restprefix + axisService.getName()%></font>
<h4>Service Description : <font
color="black"><%=axisService.getServiceDescription()%></h4>
<i><font color="blue">Service Status :
<%=axisService.isActive()?"Active":"InActive"%></font></i><br>
<%
Modified: webservices/axis2/trunk/java/modules/webapp/listService.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listService.jsp?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listService.jsp Mon Apr 16
08:51:51 2007
@@ -30,7 +30,6 @@
<h1>Available Services</h1>
<% String prefix = request.getAttribute("frontendHostUrl") +
(String)request.getSession().getAttribute(Constants.SERVICE_PATH) + "/";
- String restPrefix = request.getAttribute("frontendHostUrl") + "rest/";
%>
<%
HashMap serviceMap = (HashMap)
request.getSession().getAttribute(Constants.SERVICE_MAP);
@@ -62,8 +61,6 @@
if (!disableREST) {
%>
-<br/>
-<font color="blue">Service REST epr : </font><font color="black"><%=restPrefix
+ axisService.getName()%></font>
<%
%>
<%
Modified: webservices/axis2/trunk/java/modules/webapp/listServices.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listServices.jsp?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listServices.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listServices.jsp Mon Apr 16
08:51:51 2007
@@ -34,7 +34,6 @@
<jsp:include page="include/link-footer.jsp" />
<h1>Available services</h1>
<% String prefix = request.getAttribute("frontendHostUrl") +
(String)request.getSession().getAttribute(Constants.SERVICE_PATH) + "/";
- String restPrefix = request.getAttribute("frontendHostUrl") + "rest/";
%>
<%
HashMap serviceMap = (HashMap)
request.getSession().getAttribute(Constants.SERVICE_MAP);
@@ -69,8 +68,6 @@
if (!disableREST ) {
%>
-<br />
-<font color="blue">Service REST epr : </font><font color="black"><%=restPrefix
+ axisService.getName()%></font>
<%
}
Modified: webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp?view=diff&rev=529296&r1=529295&r2=529296
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/listSingleService.jsp Mon Apr
16 08:51:51 2007
@@ -31,7 +31,6 @@
<h1>List Single Service</h1>
<%
String prefix = request.getAttribute("frontendHostUrl") +
(String)request.getSession().getAttribute(Constants.SERVICE_PATH) + "/";
- String restPrefix = request.getAttribute("frontendHostUrl") + "rest/";
%>
<%
String isFault = (String)
request.getSession().getAttribute(Constants.IS_FAULTY);
@@ -66,8 +65,6 @@
}
if (!disableREST ) {
%>
-<br/>
-<font color="blue">Service REST epr : </font><font color="black"><%=restPrefix
+ axisService.getName()%></font>
<%
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
