Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 20332 invoked from network); 31 Jan 2005 06:05:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 31 Jan 2005 06:05:39 -0000 Received: (qmail 88562 invoked by uid 500); 31 Jan 2005 06:05:38 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 88316 invoked by uid 500); 31 Jan 2005 06:05:37 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 88301 invoked by uid 99); 31 Jan 2005 06:05:37 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 30 Jan 2005 22:05:37 -0800 Received: (qmail 20295 invoked by uid 65534); 31 Jan 2005 06:05:36 -0000 Message-ID: <20050131060536.20293.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Mon, 31 Jan 2005 06:05:35 -0000 Subject: svn commit: r149225 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/deployment/DeploymentConstants.java java/org/apache/axis/deployment/DeploymentParser.java java/org/apache/axis/deployment/server.xml java/org/apache/axis/description/AxisGlobal.java test-resources/deployment/server.xml To: axis-cvs@ws.apache.org From: deepal@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: deepal Date: Sun Jan 30 22:05:33 2005 New Revision: 149225 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149225 Log: added transports tag Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/DeploymentConstants.java webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/DeploymentParser.java webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/server.xml webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/description/AxisGlobal.java webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/d= eployment/server.xml Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/a= pache/axis/deployment/DeploymentConstants.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/= prototype2/src/java/org/apache/axis/deployment/DeploymentConstants.java?vie= w=3Ddiff&r1=3D149224&r2=3D149225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/DeploymentConstants.java (original) +++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/DeploymentConstants.java Sun Jan 30 22:05:33 2005 @@ -73,4 +73,7 @@ String JAVAST =3D "http://ws.apache.org/axis2/deployment/java"; String JAVAIMPL =3D "implementation"; =20 + String TRANSPORTSTAG =3D "transports"; + String TRANSPORTTAG =3D"transport"; + } Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/a= pache/axis/deployment/DeploymentParser.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/= prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java?view= =3Ddiff&r1=3D149224&r2=3D149225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/DeploymentParser.java (original) +++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/DeploymentParser.java Sun Jan 30 22:05:33 2005 @@ -127,8 +127,11 @@ if (PARAMETERST.equals(ST)) { Parameter parameter =3D processParameter(); serverMetaData.addParameter(parameter); + } else if (TRANSPORTSTAG.equals(ST)) { + ArrayList trnsportList =3D processTransport(); + serverMetaData.setTransportList(trnsportList); } else if (TYPEMAPPINGST.equals(ST)) { - throw new UnsupportedOperationException("Type Mappi= ngs are not allowed in server.xml"); + throw new UnsupportedOperationException("Type Mapp= ings are not allowed in server.xml"); } else if (MODULEST.equals(ST)) { int attribCount =3D pullparser.getAttributeCount()= ; if (attribCount > 0) { @@ -141,9 +144,9 @@ } } } else if (PHASE_ORDER.equals(ST)) { - ((EngineRegistryImpl)dpengine.getEngineRegistry()).s= etPhases(processPhaseOrder()); + ((EngineRegistryImpl)dpengine.getEngineRegistry())= .setPhases(processPhaseOrder()); } else if(SERVERST.equals(ST)){ - //TODO process attributes + //TODO process attributes } else { throw new UnsupportedOperationException(ST + " ele= ment is not allowed in the server.xml"); } @@ -156,6 +159,43 @@ } } =20 + + public ArrayList processTransport() throws DeploymentException { + boolean END_TRANSPORTS =3D false; + ArrayList transportList =3D new ArrayList(); + String text =3D ""; // to store the paramater elemnt + try { + while (!END_TRANSPORTS) { + int eventType =3D pullparser.next(); + if (eventType =3D=3D XMLStreamConstants.END_DOCUMENT) { + END_TRANSPORTS =3D true; + } else if (eventType =3D=3D XMLStreamConstants.START_ELEME= NT) { + String tagnae =3D pullparser.getLocalName(); + if (TRANSPORTTAG.equals(tagnae)) { + String attname =3D pullparser.getAttributeLocalNam= e(0); + String attvalue =3D pullparser.getAttributeValue(0= ); + if (ATTNAME.equals(attname)) { + transportList.add(attvalue); + } + } + } else if (eventType =3D=3D XMLStreamConstants.END_ELEMENT= ) { + String endtagname =3D pullparser.getLocalName(); + if (TRANSPORTSTAG.equals(endtagname)) { + END_TRANSPORTS =3D true; + break; + } + } else if (eventType =3D=3D XMLStreamConstants.CHARACTERS)= { + text =3D text + pullparser.getText(); + } + } + } catch (XMLStreamException e) { + throw new DeploymentException("parser Exception", e); + } catch (Exception e) { + throw new DeploymentException("Unknown process Exception", e); + } + return transportList; + } + /** * to process service.xml */ @@ -169,9 +209,9 @@ //TODO load the java clss for this //TODO somtimes Provider should be change dpengine.getCurrentFileItem().setProvideName(attvalue)= ; - // Provider provider =3D new SimpleJavaProvider(); - // provider. .setName(new QName(getValue(attvalue))); - // axisService.setProvider(provider); + // Provider provider =3D new SimpleJavaProvider(); + // provider. .setName(new QName(getValue(attvalue))); + // axisService.setProvider(provider); } else if (STYLENAME.equals(attname)) { // axisService.setStyle(); //TODO setStyle should be handle latter Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/a= pache/axis/deployment/server.xml URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/= prototype2/src/java/org/apache/axis/deployment/server.xml?view=3Ddiff&r1=3D= 149224&r2=3D149225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/server.xml (original) +++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/deployment/server.xml Sun Jan 30 22:05:33 2005 @@ -1,4 +1,8 @@ + + + + Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/a= pache/axis/description/AxisGlobal.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/= prototype2/src/java/org/apache/axis/description/AxisGlobal.java?view=3Ddiff= &r1=3D149224&r2=3D149225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/description/AxisGlobal.java (original) +++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/= axis/description/AxisGlobal.java Sun Jan 30 22:05:33 2005 @@ -40,6 +40,7 @@ protected ParameterInclude paramInclude; protected PhasesInclude phasesInclude; protected Vector modules; + protected ArrayList transportList; =20 //TODO provide a way to store name (name attribute value server.xml) public AxisGlobal(){ @@ -47,7 +48,15 @@ phasesInclude =3D new PhasesIncludeImpl(); modules =3D new Vector(); } - =20 + + public ArrayList getTransportList() { + return transportList; + } + + public void setTransportList(ArrayList transportList) { + this.transportList =3D transportList; + } + public void addModule(QName moduleref) { modules.add(moduleref); } Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resou= rces/deployment/server.xml URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/= prototype2/src/test-resources/deployment/server.xml?view=3Ddiff&r1=3D149224= &r2=3D149225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/d= eployment/server.xml (original) +++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test-resources/d= eployment/server.xml Sun Jan 30 22:05:33 2005 @@ -2,6 +2,10 @@ 10 Colombo + + + +