You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/09/14 12:19:38 UTC
svn commit: r280812 - in /webservices/axis2/trunk/java/modules/core:
src/org/apache/axis2/deployment/
src/org/apache/axis2/deployment/repository/util/
src/org/apache/axis2/description/ src/org/apache/axis2/engine/
test/org/apache/axis2/context/
Author: deepal
Date: Wed Sep 14 03:19:09 2005
New Revision: 280812
URL: http://svn.apache.org/viewcvs?rev=280812&view=rev
Log:
fixing test cases
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Wed Sep 14 03:19:09 2005
@@ -438,6 +438,7 @@
}
serviceMetaData.addService(serviceDescription);
}
+ axisConfig.addServiceGroup(serviceMetaData);
// System.out.println("Adding service = " + serviceMetaData.getName().getLocalPart());
}
@@ -597,9 +598,9 @@
de.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" +
errorWriter.toString();
-// de.printStackTrace();
+ de.printStackTrace();
} catch (AxisFault axisFault) {
-// axisFault.printStackTrace();
+ axisFault.printStackTrace();
log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE,
currentArchiveFile.getName()));
// log.info("AxisFault " + axisFault);
@@ -608,7 +609,7 @@
serviceStatus = "Error:\n" +
errorWriter.toString();
} catch (Exception e) {
-// e.printStackTrace();
+ e.printStackTrace();
log.info(Messages.getMessage(DeploymentErrorMsgs.IN_VALID_SERVICE,
currentArchiveFile.getName()));
// log.info("Exception " + e);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Wed Sep 14 03:19:09 2005
@@ -338,7 +338,7 @@
* @param fileName
* @return String
*/
- public String getShortFileName(String fileName) {
+ public static String getShortFileName(String fileName) {
char seperator = '.';
String value;
int index = fileName.lastIndexOf(seperator);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Wed Sep 14 03:19:09 2005
@@ -195,10 +195,12 @@
if (entry.getName().equals(SERVICEXML)) {
foundServiceXML = true;
buildServiceGroup(zin, engine, serviceGroupDesc);
- serviceGroupDesc.setServiceGroupName(engine.getCurrentFileItem().getName());
+ serviceGroupDesc.setServiceGroupName(DescriptionBuilder.getShortFileName(
+ engine.getCurrentFileItem().getName()));
+ break;
}
}
- zin.close();
+ // zin.close();
if (!foundServiceXML) {
throw new DeploymentException(
Messages.getMessage(DeploymentErrorMsgs.SERVICE_XML_NOT_FOUND));
@@ -218,14 +220,6 @@
throw new DeploymentException("FileNotFound : " + e);
} catch (XMLStreamException e) {
throw new DeploymentException("XMLStreamException : " + e);
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- } catch (IOException e) {
- throw new DeploymentException("IOException : " + e);
- }
}
} else {
throw new DeploymentException(
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ServiceGroupDescription.java Wed Sep 14 03:19:09 2005
@@ -52,7 +52,7 @@
// to store service Group modules name
private ArrayList modules;
- //to store module ref at deploy time parsing
+ //to store module ref at deploy time parsing
private ArrayList mdoulesList = new ArrayList();
@@ -63,6 +63,11 @@
modules = new ArrayList();
}
+ public ServiceGroupDescription(AxisConfiguration axisDescription) {
+ this();
+ this.parent = axisDescription;
+ }
+
public void addParameter(Parameter param) throws AxisFault {
paramInclude.addParameter(param);
}
@@ -162,11 +167,6 @@
public Iterator getServices(){
return services.values().iterator();
- }
-
-
- public ServiceGroupDescription(AxisConfiguration axisDescription) {
- this.parent = axisDescription;
}
public synchronized void addService(ServiceDescription service) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Wed Sep 14 03:19:09 2005
@@ -272,7 +272,8 @@
if(sg == null){
throw new AxisFault("Service Not Found : " + name);
} else {
- ServiceDescription service = sg.getService(new QName(nameParts[1]));
+ String servicName = nameParts[1];
+ ServiceDescription service = sg.getService(new QName(servicName));
if(service == null){
throw new AxisFault("Service Not Found : " + name);
} else {
@@ -561,7 +562,7 @@
namePart[1] = serviceName.substring(index +1 ,serviceName.length());
} else {
namePart[0] = serviceName;
- namePart[0] = serviceName;
+ namePart[1] = serviceName;
}
return namePart;
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Wed Sep 14 03:19:09 2005
@@ -51,8 +51,9 @@
public void testCompleteHiracy() throws AxisFault {
ConfigurationContext configurationContext =
new ConfigurationContext(axisConfiguration);
+ ServiceGroupContext serviceGroupContext = serviceDescription.getParent().getServiceGroupContext(configurationContext);
ServiceContext serviceCOntext =
- serviceDescription.getParent().getServiceGroupContext(configurationContext).getServiceContext(serviceDescription.getName().getLocalPart());
+ serviceGroupContext.getServiceContext(serviceDescription.getName().getLocalPart());
MessageContext msgctx =
new MessageContext(configurationContext);
OperationContext opContext =
@@ -63,7 +64,7 @@
//test the complte Hisracy built
assertEquals(msgctx.getParent(), opContext);
assertEquals(opContext.getParent(), serviceCOntext);
- assertEquals(serviceCOntext.getParent(), configurationContext);
+ assertEquals(serviceCOntext.getParent(), serviceGroupContext);
String key1 = "key1";
String value1 = "Val1";
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=280812&r1=280811&r2=280812&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Wed Sep 14 03:19:09 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.description.ServiceDescription;
import javax.xml.namespace.QName;