JBossWS SVN: r5894 - in legacy/branches/jbossws-1.0.4.GA_JBWS-2036: src/main/java/org/jboss/ws/tools and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-03-08 06:27:17 -0500 (Sat, 08 Mar 2008)
New Revision: 5894
Added:
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml
Removed:
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml
Modified:
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/version.properties
Log:
[JBWS-2036] WSDL To Java - Array Unwrapping uses incorect case to reference array type.
Modified: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-03-07 20:34:46 UTC (rev 5893)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -63,6 +63,7 @@
protected LiteralTypeMapping typeMapping = null;
protected WSDLUtils utils = WSDLUtils.getInstance();
protected SchemaUtils schemautils = SchemaUtils.getInstance();
+ protected WSDLUtils wsdlUtils = WSDLUtils.getInstance();
protected JavaWriter jwriter = new JavaWriter();
@@ -586,6 +587,7 @@
}
else
{
+ String temp = this.fname;
// Unwrap any array wrappers
if (SchemaUtils.isWrapperArrayType(xstypedef))
{
@@ -607,8 +609,6 @@
qn = new QName(xstypedef.getNamespace(), xstypename);
}
- String temp = this.fname;
-
if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition)
{
this.fname = utils.firstLetterUpperCase(xstypename);
@@ -634,15 +634,15 @@
if (tempqn != null)
qn = tempqn;
}
- String clname = "";
+ String qualifiedClassName = "";
Class cls = typeMapping.getJavaType(qn);
VAR v = null;
if (cls != null)
{
- clname = JavaUtils.getSourceName(cls);
- String primitive = utils.getPrimitive(clname);
+ qualifiedClassName = JavaUtils.getSourceName(cls);
+ String primitive = utils.getPrimitive(qualifiedClassName);
if ((!elem.getNillable()) && primitive != null)
- clname = primitive;
+ qualifiedClassName = primitive;
}
else
{
@@ -655,14 +655,15 @@
{
String nsuri = typename.getNamespaceURI();
if (!nsuri.equals(Constants.NS_SCHEMA_XSD))
- clname = pkgname + ".";
- clname += typename.getLocalPart();
+ qualifiedClassName = pkgname + ".";
+ String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart());
+ qualifiedClassName += className;
}
else if (qn != null)
- clname = qn.getLocalPart();
+ qualifiedClassName = qn.getLocalPart();
}
- v = new VAR(Introspector.decapitalize(varstr), clname, arrayType);
+ v = new VAR(Introspector.decapitalize(varstr), qualifiedClassName, arrayType);
return v;
}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627 (from rev 2986, trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627)
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1627;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
- *
- * WSDL to Java, Unwrapping arrays the wrong case is used to
- * reference the generated class.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 26 Apr 2007
- */
-public class JBWS1627TestCase extends JBossWSTest
-{
-
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1627";
- String toolsDir = "tools/jbws1627";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (from rev 2986, trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1627;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1627
+ *
+ * WSDL to Java, Unwrapping arrays the wrong case is used to
+ * reference the generated class.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 26 Apr 2007
+ */
+public class JBWS1627TestCase extends JBossWSTest
+{
+
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1627";
+ String toolsDir = "tools/jbws1627";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1627/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBook_Service.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627 (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627)
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1627;
-
-
-public class NickName
-{
-
-protected java.lang.String name;
-public NickName(){}
-
-public NickName(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/NickName.java)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/NickName.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1627;
+
+
+public class NickName
+{
+
+protected java.lang.String name;
+public NickName(){}
+
+public NickName(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1627;
-
-
-public class Person
-{
-
-protected java.lang.String surname;
-
-protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
-public Person(){}
-
-public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
-this.surname=surname;
-this.nickNames=nickNames;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
-
-public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
-
-}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/Person.java)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/Person.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1627;
+
+
+public class Person
+{
+
+protected java.lang.String surname;
+
+protected org.jboss.test.ws.jbws1627.NickName[] nickNames;
+public Person(){}
+
+public Person(java.lang.String surname, org.jboss.test.ws.jbws1627.NickName[] nickNames){
+this.surname=surname;
+this.nickNames=nickNames;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+public org.jboss.test.ws.jbws1627.NickName[] getNickNames() { return nickNames ;}
+
+public void setNickNames(org.jboss.test.ws.jbws1627.NickName[] nickNames){ this.nickNames=nickNames; }
+
+}
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='surname' nillable='true' type='string'/>
- <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
- </sequence>
- </complexType>
-
- <complexType name='ArrayOf_nickNames'>
- <sequence>
- <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
- </sequence>
- </complexType>
-
- <complexType name='nickName'>
- <sequence>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook.wsdl)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook.wsdl 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1627'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1627/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1627/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='nickNames' nillable='true' type='tns:ArrayOf_nickNames'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='ArrayOf_nickNames'>
+ <sequence>
+ <element name='names' maxOccurs='unbounded' nillable='true' type='tns:nickName'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='nickName'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1627;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
-}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/PhoneBook_PortType.java)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/PhoneBook_PortType.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1627;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1627.TelephoneNumber lookup(org.jboss.test.ws.jbws1627.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Sun May 06 14:14:38 CEST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1627;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String number){
-this.number=number;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/TelephoneNumber.java)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/TelephoneNumber.java 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Sun May 06 14:14:38 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1627;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String number){
+this.number=number;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,72 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1627</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1627</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>nickNames</java-variable-name>
- <xml-element-name>nickNames</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/jaxrpc-mapping.xml)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/jaxrpc-mapping.xml 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1627</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1627</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>nickNames</java-variable-name>
+ <xml-element-name>nickNames</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.ArrayOf_nickNames</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:ArrayOf_nickNames</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>names</java-variable-name>
+ <xml-element-name>names</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.NickName</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:nickName</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1627.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1627/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1627.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1627'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1627.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1627'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1627'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1627.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1627.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1627'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml 2007-05-06 22:32:28 UTC (rev 2986)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml 2008-03-08 11:27:17 UTC (rev 5894)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml (from rev 2986, trunk/jbossws-tests/src/resources/tools/jbws1627/wstools-config.xml)
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/src/test/resources/tools/jbws1627/wstools-config.xml 2008-03-08 11:27:17 UTC (rev 5894)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1627/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Modified: legacy/branches/jbossws-1.0.4.GA_JBWS-2036/version.properties
===================================================================
--- legacy/branches/jbossws-1.0.4.GA_JBWS-2036/version.properties 2008-03-07 20:34:46 UTC (rev 5893)
+++ legacy/branches/jbossws-1.0.4.GA_JBWS-2036/version.properties 2008-03-08 11:27:17 UTC (rev 5894)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.com)
specification.version=jbossws-1.0
-version.id=1.0.4.GA
-repository.id=1.0.4.GA
+version.id=1.0.4.GA_JBWS-2036
+repository.id=1.0.4.GA_JBWS-1036
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://labs.jboss.com/portal/jbossws
16 years, 3 months
- 1
- 0
JBossWS SVN: r5893 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-03-07 15:34:46 -0500 (Fri, 07 Mar 2008)
New Revision: 5893
Added:
legacy/branches/jbossws-1.0.4.GA_JBWS-2036/
Log:
[JBWS-2036] Branch for support patch.
Copied: legacy/branches/jbossws-1.0.4.GA_JBWS-2036 (from rev 5892, legacy/branches/jbossws-1.0.4.GA_JBWS-1454)
16 years, 3 months
- 1
- 0
JBossWS SVN: r5892 - in framework/branches/hbraun: src/main/java/org/jboss/wsf/framework and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-07 15:31:54 -0500 (Fri, 07 Mar 2008)
New Revision: 5892
Added:
framework/branches/hbraun/framework-3.0.iml
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TestSampleServlet.java
Modified:
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java
Log:
HttpTransportManager prototype
Added: framework/branches/hbraun/framework-3.0.iml
===================================================================
--- framework/branches/hbraun/framework-3.0.iml (rev 0)
+++ framework/branches/hbraun/framework-3.0.iml 2008-03-07 20:31:54 UTC (rev 5892)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/output/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/output/test/classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="spi-3.0" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jetty-util.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jetty.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -108,7 +108,11 @@
else if (ServiceRefMetaDataParserFactory.class.equals(spiType))
{
returnType = (T)loadService(spiType, DefaultServiceRefMetaDataParserFactory.class.getName());
- }
+ }
+ else if (TransportManagerFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultTransportManagerFactory.class.getName());
+ }
// SPI provided by either container or stack integration
@@ -139,11 +143,7 @@
else if (WebServiceContextFactory.class.equals(spiType))
{
returnType = (T)loadService(spiType, null);
- }
- else if (TransportManagerFactory.class.equals(spiType))
- {
- returnType = (T)loadService(spiType, null);
- }
+ }
if (returnType == null)
throw new WSFException("Failed to provide SPI '" + spiType + "'");
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -26,6 +26,7 @@
import java.util.Vector;
import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -62,6 +63,9 @@
DefaultEndpoint(String targetBean)
{
+ if(null==targetBean)
+ throw new IllegalArgumentException("targetBean name cannot be null");
+
this.targetBean = targetBean;
this.state = EndpointState.UNDEFINED;
}
@@ -128,6 +132,21 @@
public ObjectName getName()
{
+ if(null==name)
+ {
+ // build implicit name
+ try
+ {
+ String domain = "org.jboss.ws";
+ String nameAtt = getShortName()!=null ? getShortName() : targetBean;
+
+ name = new ObjectName(domain, "name", nameAtt);
+ } catch (MalformedObjectNameException e)
+ {
+ //
+ }
+ }
+
return name;
}
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -93,16 +93,16 @@
/**
* Add a servlet for a contextand url pattern.
*
- * @param name
+ * @param contextPath
* @param urlPattern
* @param servletClass
*/
- public void addServletContext(String name, String urlPattern, Servlet servletClass)
+ public void addServletContext(String contextPath, String urlPattern, Servlet servletClass)
{
try
{
Context context = new Context();
- context.setContextPath(name);
+ context.setContextPath(contextPath);
ServletHolder holder = new ServletHolder(servletClass);
context.addServlet(holder, urlPattern);
context.start();
@@ -110,7 +110,7 @@
} catch (Exception e)
{
- throw new RuntimeException("Failed to start webcontext: " +name, e );
+ throw new RuntimeException("Failed to start webcontext: " +contextPath, e );
}
}
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -33,6 +33,15 @@
private String webContext;
private String urlPattern;
+ public HttpSpec(String webContext, String urlPattern)
+ {
+ if(!webContext.startsWith("/"))
+ throw new IllegalArgumentException("webContext needs to start with '/'");
+
+ this.webContext = webContext;
+ this.urlPattern = urlPattern;
+ }
+
public Protocol getProtocol()
{
return Protocol.HTTP;
@@ -43,18 +52,8 @@
return webContext;
}
- public void setWebContext(String webContext)
- {
- this.webContext = webContext;
- }
-
public String getUrlPattern()
{
return urlPattern;
}
-
- public void setUrlPattern(String urlPattern)
- {
- this.urlPattern = urlPattern;
- }
}
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -25,8 +25,13 @@
import org.jboss.wsf.spi.transport.ListenerRef;
import org.jboss.wsf.spi.transport.TransportManager;
-import java.util.HashMap;
-import java.util.Map;
+import javax.management.ObjectName;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -35,22 +40,49 @@
*/
public class HttpTransportManager implements TransportManager<HttpSpec>
{
- private Map<String, Object> contexts = new HashMap<String, Object>();
-
- public ListenerRef createListener(Endpoint endpoint, HttpSpec transportProperties)
+ private HttpDeamon httpDeamon;
+
+ private static final int DEFAULT_PORT = 20000;
+ private static final String DEFAULT_HOST = "localhost";
+
+ private int port;
+ private String host;
+
+ public HttpTransportManager(String host, int port)
{
- contexts.put(transportProperties.getWebContext(), new Object());
- System.out.println( "Created webcontext: /" + transportProperties.getWebContext());
+ this.host = host;
+ this.port = port;
+ this.httpDeamon = HttpDeamon.getInstance(DEFAULT_PORT);
+ this.httpDeamon.start();
+ }
+
+ public HttpTransportManager()
+ {
+ this(DEFAULT_HOST, DEFAULT_PORT);
+ }
+
+ public ListenerRef createListener(Endpoint endpoint, HttpSpec transportProperties)
+ {
+ Servlet listener = new EndpointServlet(endpoint);
+ this.httpDeamon.addServletContext(
+ transportProperties.getWebContext(),
+ transportProperties.getUrlPattern(),
+ listener
+ );
+
return createListenerRef(transportProperties);
}
private ListenerRef createListenerRef(HttpSpec transportProperties)
{
+
+ assert transportProperties.getWebContext().startsWith("/");
+
try
{
String ctx = transportProperties.getWebContext();
- URI address = new URI("http://localhost/" + ctx);
+ URI address = new URI("http://"+host+":"+port + ctx);
return new HttpListenerRef(ctx, address);
} catch (URISyntaxException e)
{
@@ -60,14 +92,34 @@
public void destroyListener(ListenerRef ref)
{
- Object result = contexts.remove(ref.getUUID());
- if(result==null)
+
+ }
+
+ public class EndpointServlet extends HttpServlet
+ {
+ ObjectName endpointName;
+
+ public EndpointServlet(Endpoint endpoint)
{
- throw new IllegalArgumentException("No such webcontext: " + ref.getUUID());
+ if(null==endpoint.getName())
+ throw new IllegalArgumentException("Endpoint objectName is null");
+
+ this.endpointName = endpoint.getName();
}
- System.out.println("Removed webcontext: /" + ref.getUUID());
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException
+ {
+ response.setContentType("text/plain");
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.getWriter().println(endpointName);
+ }
+
+
+ protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)
+ throws ServletException, IOException
+ {
+ throw new ServletException("POST not yet implemented");
+ }
}
-
-
}
Modified: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java
===================================================================
--- framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -24,10 +24,6 @@
import junit.framework.TestCase;
import org.jboss.wsf.framework.transport.HttpDeamon;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -49,13 +45,16 @@
public void testContextCreation() throws Exception
{
- SERVER.addServletContext("/endpoint", "/*", new EndpointServlet());
+ SERVER.addServletContext("/endpoint", "/*", new TestSampleServlet());
assertEquals("I'm a web service endpoint", GETRequest("endpoint"));
}
- private static String GETRequest(String context)
+ public static String GETRequest(String context)
throws IOException
{
+ if(context.startsWith("/"))
+ context = context.substring(1);
+
URLConnection con = new URL("http://localhost:20000/"+context).openConnection();
con.connect();
@@ -71,17 +70,6 @@
sb.append(inputLine);
in.close();
return sb.toString();
- }
-
- private class EndpointServlet extends HttpServlet
- {
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException
- {
- response.setContentType("text/html");
- response.setStatus(HttpServletResponse.SC_OK);
- response.getWriter().println("I'm a web service endpoint");
- }
- }
+ }
}
Added: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TestSampleServlet.java
===================================================================
--- framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TestSampleServlet.java (rev 0)
+++ framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TestSampleServlet.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.framework.transport;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class TestSampleServlet extends HttpServlet
+{
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException
+ {
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.getWriter().println("I'm a web service endpoint");
+ }
+}
\ No newline at end of file
Property changes on: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TestSampleServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java
===================================================================
--- framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java 2008-03-07 19:17:00 UTC (rev 5891)
+++ framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java 2008-03-07 20:31:54 UTC (rev 5892)
@@ -32,33 +32,41 @@
import org.jboss.wsf.spi.transport.TransportManager;
import org.jboss.wsf.spi.transport.TransportManagerFactory;
+import javax.management.ObjectName;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class TransportManagerTestCase extends TestCase
{
- private Endpoint EP;
- private TransportManagerFactory TM_FACTORY;
+ private TransportManagerFactory transportManagerFactory;
+ private DeploymentModelFactory deploymentModelFactory;
protected void setUp() throws Exception
{
SPIProvider framework = DefaultSPIProviderResolver.getInstance().getProvider();
- DeploymentModelFactory fac = framework.getSPI(DeploymentModelFactory.class);
- EP = fac.newEndpoint("MyEndpointBean.class");
- TM_FACTORY = framework.getSPI(TransportManagerFactory.class);
+ deploymentModelFactory = framework.getSPI(DeploymentModelFactory.class);
+ transportManagerFactory= framework.getSPI(TransportManagerFactory.class);
}
public void testHttpTransportManager() throws Exception
{
- TransportManager transportManager = TM_FACTORY.createTransportManager(Protocol.HTTP);
- HttpSpec spec = new HttpSpec();
- spec.setWebContext("myWebContext");
- ListenerRef ref = transportManager.createListener(EP, spec);
+ // Create a Endpoint
+ Endpoint endpoint = deploymentModelFactory.newEndpoint("foo.bar.EndpointImpl.class");
+
+ // Create a listener
+ TransportManager transportManager = transportManagerFactory.createTransportManager(Protocol.HTTP);
+ HttpSpec spec = new HttpSpec("/myWebContext", "/*");
+ ListenerRef ref = transportManager.createListener(endpoint, spec);
assertEquals(spec.getProtocol(), ref.getProtocol());
- System.out.println(ref.getProtocol() +": "+ref.getAddress());
- transportManager.destroyListener(ref);
+ System.out.println(ref.getProtocol() +": "+ref.getAddress());
+ // Invoke the sample endpoint
+ String response = HttpDeamonTestCase.GETRequest("/myWebContext");
+ System.out.println(response);
+ // Destroy the Listener
+ transportManager.destroyListener(ref);
}
}
16 years, 3 months
- 1
- 0
JBossWS SVN: r5891 - in spi/branches/hbraun: src/main/java/org/jboss/wsf/spi and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-07 14:17:00 -0500 (Fri, 07 Mar 2008)
New Revision: 5891
Added:
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/ListenerRef.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/Protocol.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManager.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManagerFactory.java
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportSpec.java
Modified:
spi/branches/hbraun/version.properties
Log:
transport spi, first cut
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/ListenerRef.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/ListenerRef.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/ListenerRef.java 2008-03-07 19:17:00 UTC (rev 5891)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.transport;
+
+import java.net.URI;
+
+/**
+ * A reference to an endpoint listener that can be
+ * used to drive subsequent {@link org.jboss.wsf.spi.transport.TransportManager} operations
+ * after the listener has been created.<br/>
+ * I.e. the most simple usecase is to tear down the listener when the endpoint is undeployed.
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface ListenerRef
+{
+ /**
+ * UUID that distinct across protocols
+ * @return
+ */
+ String getUUID();
+
+ /**
+ * The protocol itself
+ * @return
+ */
+ Protocol getProtocol();
+
+ /**
+ * Address that can be published in WSDL
+ * @return
+ */
+ URI getAddress();
+
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/ListenerRef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/Protocol.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/Protocol.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/Protocol.java 2008-03-07 19:17:00 UTC (rev 5891)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.transport;
+
+/**
+ * A simple protocol identifier.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public enum Protocol
+{
+ HTTP, JMS;
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/Protocol.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManager.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManager.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManager.java 2008-03-07 19:17:00 UTC (rev 5891)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.transport;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * A transport abstraction that knows how to create and destroy
+ * endpoint listener for
+ * <ul>
+ * <li>a particular protocol
+ * <li>using transport specific properties
+ * </ul>
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface TransportManager<T extends TransportSpec>
+{
+ ListenerRef createListener(Endpoint endpoint, T transportSpec);
+ void destroyListener(ListenerRef ref);
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManager.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManagerFactory.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManagerFactory.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManagerFactory.java 2008-03-07 19:17:00 UTC (rev 5891)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.transport;
+
+import org.jboss.wsf.spi.SPIView;
+
+/**
+ * Factory for creating {@link TransportManager}'s for a particular {@link org.jboss.wsf.spi.transport.Protocol}.
+ * Will be retrieved through a {@link org.jboss.wsf.spi.SPIProvider}
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface TransportManagerFactory extends SPIView
+{
+ TransportManager createTransportManager(Protocol protocol);
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportManagerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportSpec.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportSpec.java (rev 0)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportSpec.java 2008-03-07 19:17:00 UTC (rev 5891)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.transport;
+
+/**
+ * Transport specific properties for a particular {@link Protocol}
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface TransportSpec
+{
+ Protocol getProtocol();
+}
Property changes on: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/TransportSpec.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: spi/branches/hbraun/version.properties
===================================================================
--- spi/branches/hbraun/version.properties 2008-03-07 19:16:33 UTC (rev 5890)
+++ spi/branches/hbraun/version.properties 2008-03-07 19:17:00 UTC (rev 5891)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.2.DEV
-repository.id=1.0.2.DEV
+version.id=1.1.0.DEV
+repository.id=1.1.0.DEV
implementation.title=JBoss Web Services - SPI
implementation.url=http://www.jboss.org/products/jbossws
16 years, 3 months
- 1
- 0
JBossWS SVN: r5890 - spi/branches/hbraun/src/test/java/org/jboss/test/wsf/spi/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-07 14:16:33 -0500 (Fri, 07 Mar 2008)
New Revision: 5890
Modified:
spi/branches/hbraun/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java
Log:
Fix borken Consumer test case
Modified: spi/branches/hbraun/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java
===================================================================
--- spi/branches/hbraun/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2008-03-07 19:15:46 UTC (rev 5889)
+++ spi/branches/hbraun/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2008-03-07 19:16:33 UTC (rev 5890)
@@ -90,4 +90,10 @@
{
LAST_EVENT += "consume";
}
+
+
+ public void setExtension(boolean extension)
+ {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
}
16 years, 3 months
- 1
- 0
JBossWS SVN: r5889 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-07 14:15:46 -0500 (Fri, 07 Mar 2008)
New Revision: 5889
Added:
spi/branches/hbraun/
Log:
Create user branch
Copied: spi/branches/hbraun (from rev 5888, spi/trunk)
16 years, 3 months
- 1
- 0
JBossWS SVN: r5888 - in framework/branches/hbraun: ant-import and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-07 14:12:05 -0500 (Fri, 07 Mar 2008)
New Revision: 5888
Added:
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/DefaultTransportManagerFactory.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java
framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java
Modified:
framework/branches/hbraun/ant-import/build-thirdparty.xml
framework/branches/hbraun/framework.iml
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
framework/branches/hbraun/version.properties
Log:
Transport impl, first cut. Added HttpDeamon
Modified: framework/branches/hbraun/ant-import/build-thirdparty.xml
===================================================================
--- framework/branches/hbraun/ant-import/build-thirdparty.xml 2008-03-07 19:10:52 UTC (rev 5887)
+++ framework/branches/hbraun/ant-import/build-thirdparty.xml 2008-03-07 19:12:05 UTC (rev 5888)
@@ -48,6 +48,8 @@
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jetty/${jetty}/lib/jetty.jar" dest="${thirdparty.dir}/jetty.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jetty/${jetty}/lib/jetty-util.jar" dest="${thirdparty.dir}/jetty-util.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
@@ -73,6 +75,8 @@
<pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jetty.jar"/>
+ <pathelement location="${thirdparty.dir}/jetty-util.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
</path>
Modified: framework/branches/hbraun/framework.iml
===================================================================
--- framework/branches/hbraun/framework.iml 2008-03-07 19:10:52 UTC (rev 5887)
+++ framework/branches/hbraun/framework.iml 2008-03-07 19:12:05 UTC (rev 5888)
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/output/classes" />
<exclude-output />
+ <output-test url="file://$MODULE_DIR$/output/test/classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -154,6 +156,43 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="spi" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/commons-logging-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="jetty-6.1.8" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jetty-util.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jetty.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-03-07 19:10:52 UTC (rev 5887)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -31,8 +31,10 @@
import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
+import org.jboss.wsf.framework.transport.DefaultTransportManagerFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory;
@@ -106,7 +108,7 @@
else if (ServiceRefMetaDataParserFactory.class.equals(spiType))
{
returnType = (T)loadService(spiType, DefaultServiceRefMetaDataParserFactory.class.getName());
- }
+ }
// SPI provided by either container or stack integration
@@ -138,6 +140,10 @@
{
returnType = (T)loadService(spiType, null);
}
+ else if (TransportManagerFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, null);
+ }
if (returnType == null)
throw new WSFException("Failed to provide SPI '" + spiType + "'");
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/DefaultTransportManagerFactory.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/DefaultTransportManagerFactory.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/DefaultTransportManagerFactory.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.transport;
+
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.Protocol;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DefaultTransportManagerFactory implements TransportManagerFactory
+{
+
+ public TransportManager createTransportManager(Protocol protocol)
+ {
+ TransportManager manager = null;
+
+ switch(protocol)
+ {
+ case HTTP:
+ manager = new HttpTransportManager();
+ break;
+ default:
+ throw new IllegalArgumentException("No TransportManager for protocol: " + protocol);
+ }
+
+ return manager;
+ }
+}
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/DefaultTransportManagerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,177 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.transport;
+
+import org.jboss.logging.Logger;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.handler.ContextHandlerCollection;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HttpDeamon
+{
+ private static final Logger LOG = Logger.getLogger(HttpDeamon.class);
+ private static final Lock CLASS_LOCK = new ReentrantLock();
+ private static HttpDeamon INSTANCE = null;
+
+ private final int port;
+
+ // Jetty stuff below
+ private Server server = null;
+ private final ContextHandlerCollection contexts;
+
+ private HttpDeamon(int port)
+ {
+ this.port = port;
+ this.server = new Server(port);
+
+ this.contexts = new ContextHandlerCollection();
+ this.server.setHandler(contexts);
+
+ Context root = new Context(contexts,"/");
+ root.addServlet(new ServletHolder(new HelloServlet("JBossWS HttpDeamon")), "/*");
+ }
+
+ public int getPort()
+ {
+ return port;
+ }
+
+ public void start()
+ {
+ try
+ {
+ this.server.start();
+ } catch (Exception e)
+ {
+ LOG.error("Failed to start Jetty", e);
+ }
+ }
+
+ public void stop()
+ {
+ try
+ {
+ this.server.stop();
+ } catch (Exception e)
+ {
+ LOG.error("Failed to stop Jetty", e);
+ }
+ }
+
+ /**
+ * Add a servlet for a contextand url pattern.
+ *
+ * @param name
+ * @param urlPattern
+ * @param servletClass
+ */
+ public void addServletContext(String name, String urlPattern, Servlet servletClass)
+ {
+ try
+ {
+ Context context = new Context();
+ context.setContextPath(name);
+ ServletHolder holder = new ServletHolder(servletClass);
+ context.addServlet(holder, urlPattern);
+ context.start();
+ this.contexts.addHandler(context);
+
+ } catch (Exception e)
+ {
+ throw new RuntimeException("Failed to start webcontext: " +name, e );
+ }
+ }
+
+ public static HttpDeamon getInstance(int port)
+ {
+ CLASS_LOCK.lock();
+ try
+ {
+ if (INSTANCE == null)
+ {
+ INSTANCE = new HttpDeamon(port);
+
+ try
+ {
+ INSTANCE.start();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to start HttpDeamon", e);
+ }
+
+ Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+ public void run()
+ {
+ try
+ {
+ INSTANCE.stop();
+ } catch (Exception e)
+ {
+ //
+ }
+ }
+ }, "HttpDeamonShutDownHook"));
+ }
+ else
+ {
+ LOG.warn("There is already a HttpDeamon running on port: " + INSTANCE.getPort());
+ }
+ return INSTANCE;
+ }
+ finally
+ {
+ CLASS_LOCK.unlock();
+ }
+ }
+
+ public static class HelloServlet extends HttpServlet
+ {
+ String greeting="Hello";
+ public HelloServlet()
+ {}
+
+ public HelloServlet(String hi)
+ {greeting=hi;}
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException
+ {
+ response.setContentType("text/plain");
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.getWriter().println(greeting);
+ }
+ }
+}
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpDeamon.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.transport;
+
+import org.jboss.wsf.spi.transport.ListenerRef;
+import org.jboss.wsf.spi.transport.Protocol;
+
+import java.net.URI;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HttpListenerRef implements ListenerRef
+{
+ private String webContext;
+ private URI address;
+
+ public HttpListenerRef(String webContext, URI address)
+ {
+ this.webContext = webContext;
+ this.address = address;
+ }
+
+ public Protocol getProtocol()
+ {
+ return Protocol.HTTP;
+ }
+
+ public URI getAddress()
+ {
+ return address;
+ }
+
+ public String getUUID()
+ {
+ return this.webContext;
+ }
+}
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.transport;
+
+import org.jboss.wsf.spi.transport.TransportSpec;
+import org.jboss.wsf.spi.transport.Protocol;
+
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HttpSpec implements TransportSpec
+{
+ private String webContext;
+ private String urlPattern;
+
+ public Protocol getProtocol()
+ {
+ return Protocol.HTTP;
+ }
+
+ public String getWebContext()
+ {
+ return webContext;
+ }
+
+ public void setWebContext(String webContext)
+ {
+ this.webContext = webContext;
+ }
+
+ public String getUrlPattern()
+ {
+ return urlPattern;
+ }
+
+ public void setUrlPattern(String urlPattern)
+ {
+ this.urlPattern = urlPattern;
+ }
+}
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpSpec.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.transport;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.transport.ListenerRef;
+import org.jboss.wsf.spi.transport.TransportManager;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HttpTransportManager implements TransportManager<HttpSpec>
+{
+ private Map<String, Object> contexts = new HashMap<String, Object>();
+
+ public ListenerRef createListener(Endpoint endpoint, HttpSpec transportProperties)
+ {
+ contexts.put(transportProperties.getWebContext(), new Object());
+ System.out.println( "Created webcontext: /" + transportProperties.getWebContext());
+
+ return createListenerRef(transportProperties);
+ }
+
+ private ListenerRef createListenerRef(HttpSpec transportProperties)
+ {
+ try
+ {
+ String ctx = transportProperties.getWebContext();
+ URI address = new URI("http://localhost/" + ctx);
+ return new HttpListenerRef(ctx, address);
+ } catch (URISyntaxException e)
+ {
+ throw new RuntimeException("Failed to create ListenerRef");
+ }
+ }
+
+ public void destroyListener(ListenerRef ref)
+ {
+ Object result = contexts.remove(ref.getUUID());
+ if(result==null)
+ {
+ throw new IllegalArgumentException("No such webcontext: " + ref.getUUID());
+ }
+
+ System.out.println("Removed webcontext: /" + ref.getUUID());
+ }
+
+
+}
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java
===================================================================
--- framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java (rev 0)
+++ framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.framework.transport;
+
+import junit.framework.TestCase;
+import org.jboss.wsf.framework.transport.HttpDeamon;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HttpDeamonTestCase extends TestCase
+{
+ private static HttpDeamon SERVER = HttpDeamon.getInstance(20000);
+
+ public void testRootContext() throws Exception
+ {
+ String response = GETRequest("");
+ assertEquals("JBossWS HttpDeamon", response.toString());
+ }
+
+ public void testContextCreation() throws Exception
+ {
+ SERVER.addServletContext("/endpoint", "/*", new EndpointServlet());
+ assertEquals("I'm a web service endpoint", GETRequest("endpoint"));
+ }
+
+ private static String GETRequest(String context)
+ throws IOException
+ {
+ URLConnection con = new URL("http://localhost:20000/"+context).openConnection();
+ con.connect();
+
+ BufferedReader in = new BufferedReader(
+ new InputStreamReader(
+ con.getInputStream()
+ )
+ );
+
+ String inputLine;
+ StringBuffer sb = new StringBuffer();
+ while ((inputLine = in.readLine()) != null)
+ sb.append(inputLine);
+ in.close();
+ return sb.toString();
+ }
+
+ private class EndpointServlet extends HttpServlet
+ {
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException
+ {
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.getWriter().println("I'm a web service endpoint");
+ }
+ }
+}
+
Property changes on: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/HttpDeamonTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java
===================================================================
--- framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java (rev 0)
+++ framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java 2008-03-07 19:12:05 UTC (rev 5888)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.framework.transport;
+
+import junit.framework.TestCase;
+import org.jboss.wsf.framework.DefaultSPIProviderResolver;
+import org.jboss.wsf.framework.transport.HttpSpec;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.transport.ListenerRef;
+import org.jboss.wsf.spi.transport.Protocol;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class TransportManagerTestCase extends TestCase
+{
+ private Endpoint EP;
+ private TransportManagerFactory TM_FACTORY;
+
+ protected void setUp() throws Exception
+ {
+ SPIProvider framework = DefaultSPIProviderResolver.getInstance().getProvider();
+ DeploymentModelFactory fac = framework.getSPI(DeploymentModelFactory.class);
+ EP = fac.newEndpoint("MyEndpointBean.class");
+ TM_FACTORY = framework.getSPI(TransportManagerFactory.class);
+ }
+
+ public void testHttpTransportManager() throws Exception
+ {
+ TransportManager transportManager = TM_FACTORY.createTransportManager(Protocol.HTTP);
+ HttpSpec spec = new HttpSpec();
+ spec.setWebContext("myWebContext");
+
+ ListenerRef ref = transportManager.createListener(EP, spec);
+ assertEquals(spec.getProtocol(), ref.getProtocol());
+ System.out.println(ref.getProtocol() +": "+ref.getAddress());
+ transportManager.destroyListener(ref);
+
+
+ }
+}
Property changes on: framework/branches/hbraun/src/test/java/org/jboss/test/ws/framework/transport/TransportManagerTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/branches/hbraun/version.properties
===================================================================
--- framework/branches/hbraun/version.properties 2008-03-07 19:10:52 UTC (rev 5887)
+++ framework/branches/hbraun/version.properties 2008-03-07 19:12:05 UTC (rev 5888)
@@ -15,7 +15,7 @@
# Thirdparty library versions
jbossws-common=snapshot
-jbossws-spi=1.0.1.GA
+jbossws-spi=1.1.0.DEV
junit=3.8.1
dom4j=1.6.1
@@ -24,6 +24,7 @@
jboss-javaee=5.0.0.Beta3
jboss-microcontainer=2.0.0.Beta3
jboss-jbossxb=1.0.0.GA
+jetty=6.1.8
sun-jaf=1.1
sun-jaxb=2.1.4
sun-jaxrpc=1.1
16 years, 3 months
- 1
- 0
JBossWS SVN: r5887 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-07 14:10:52 -0500 (Fri, 07 Mar 2008)
New Revision: 5887
Added:
framework/branches/hbraun/
Log:
Create user branch
Copied: framework/branches/hbraun (from rev 5886, framework/trunk)
16 years, 3 months
- 1
- 0
JBossWS SVN: r5886 - in stack/native/trunk: src/main/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-06 16:58:45 -0500 (Thu, 06 Mar 2008)
New Revision: 5886
Removed:
stack/native/trunk/src/main/etc/component-info42.xml
stack/native/trunk/src/main/etc/component-info50.xml
Modified:
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/src/main/etc/component-info.xml
Log:
Remove repository components jbossws-native42, jbossws-native50
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-06 21:58:45 UTC (rev 5886)
@@ -38,7 +38,7 @@
<target name="release-to-repository" depends="jars,check-svn-externals,warn-svn-externals"
description="Release to jboss.local.repository">
- <!-- jboss/jbossws -->
+ <!-- jboss/jbossws-native -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/bin"/>
<mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/>
@@ -64,44 +64,18 @@
</fileset>
</copy>
<copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true">
- <fileset dir="${core.dir}/src/main/resources/standard-config">
+ <fileset dir="${core.resources.dir}/standard-config">
<include name="standard-*-config.xml"/>
</fileset>
+ <fileset dir="${core.resources.dir}">
+ <include name="jbossws-native-config.xml"/>
+ </fileset>
</copy>
<copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
-
- <!-- jboss/jbossws-native50 -->
- <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
- <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources"/>
- <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources" overwrite="true">
- <fileset dir="${core.output.lib.dir}/jbossws-native50">
- <include name="jbossws-beans.xml"/>
- </fileset>
- </copy>
- <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info50.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${core.dir}/version.properties"/>
- </filterset>
- </copy>
-
- <!-- jboss/jbossws-native42 -->
- <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
- <mkdir dir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib" overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <include name="jbossws-native42.sar"/>
- </fileset>
- </copy>
- <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info42.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${core.dir}/version.properties"/>
- </filterset>
- </copy>
-
</target>
<target name="check-svn-externals" depends="init">
Modified: stack/native/trunk/src/main/etc/component-info.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info.xml 2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-06 21:58:45 UTC (rev 5886)
@@ -17,11 +17,25 @@
<artifact id="standard-jaxrpc-endpoint-config.xml"/>
<artifact id="standard-jaxws-client-config.xml"/>
<artifact id="standard-jaxws-endpoint-config.xml"/>
+ <artifact id="jbossws-native-config.xml"/>
<artifact id="wsrunclient.bat"/>
<artifact id="wsrunclient.sh"/>
<artifact id="wstools.bat"/>
<artifact id="wstools.sh"/>
+ <import componentref="jboss/jbossxb">
+ <compatible version="@jboss-jbossxb-jboss42@"/>
+ <compatible version="@jboss-jbossxb-jboss42@-brew"/>
+ <compatible version="@jboss-jbossxb-jboss50@"/>
+ <compatible version="@jboss-jbossxb-jboss50@-brew"/>
+ </import>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss42@"/>
+ <compatible version="@jboss-remoting-jboss42@-brew"/>
+ <compatible version="@jboss-remoting-jboss50@"/>
+ <compatible version="@jboss-remoting-jboss50@-brew"/>
+ </import>
+
<import componentref="jboss/jaxbintros">
<compatible version="@jboss-jaxbintros@"/>
</import>
Deleted: stack/native/trunk/src/main/etc/component-info42.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info42.xml 2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/src/main/etc/component-info42.xml 2008-03-06 21:58:45 UTC (rev 5886)
@@ -1,27 +0,0 @@
-<project name="jboss/jbossws-native42">
-
- <component id="jboss/jbossws-native42"
- description="JBossWS an implementation of J2EE Web Services"
- version="@repository.id@"
- licenseType="lgpl">
-
- <artifact id="jbossws-native42.sar"/>
-
- <import componentref="jboss/jbossws">
- <compatible version="@repository.id@"/>
- </import>
- <import componentref="jboss/jbossxb">
- <compatible version="@jboss-jbossxb-jboss42@"/>
- <compatible version="@jboss-jbossxb-jboss42@-brew"/>
- </import>
- <import componentref="jboss/remoting">
- <compatible version="@jboss-remoting-jboss42@"/>
- <compatible version="@jboss-remoting-jboss42@-brew"/>
- </import>
-
- <export>
- </export>
-
- </component>
-
-</project>
Deleted: stack/native/trunk/src/main/etc/component-info50.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info50.xml 2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/src/main/etc/component-info50.xml 2008-03-06 21:58:45 UTC (rev 5886)
@@ -1,27 +0,0 @@
-<project name="jboss/jbossws-native50">
-
- <component id="jboss/jbossws-native50"
- description="JBossWS an implementation of J2EE Web Services"
- version="@repository.id@"
- licenseType="lgpl">
-
- <artifact id="jbossws-beans.xml"/>
-
- <import componentref="jboss/jbossws">
- <compatible version="@repository.id@"/>
- </import>
- <import componentref="jboss/jbossxb">
- <compatible version="@jboss-jbossxb-jboss50@"/>
- <compatible version="@jboss-jbossxb-jboss50@-brew"/>
- </import>
- <import componentref="jboss/remoting">
- <compatible version="@jboss-remoting-jboss50@"/>
- <compatible version="@jboss-remoting-jboss50@-brew"/>
- </import>
-
- <export>
- </export>
-
- </component>
-
-</project>
16 years, 3 months
- 1
- 0
JBossWS SVN: r5885 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-06 15:50:48 -0500 (Thu, 06 Mar 2008)
New Revision: 5885
Modified:
stack/native/trunk/ant-import/build-release.xml
Log:
dont release jbossws-core-scripts.zip
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-03-06 20:40:06 UTC (rev 5884)
+++ stack/native/trunk/ant-import/build-release.xml 2008-03-06 20:50:48 UTC (rev 5885)
@@ -61,7 +61,6 @@
<include name="jboss-saaj.jar"/>
<include name="jbossws-context.war"/>
<include name="jbossws-core-src.zip"/>
- <include name="jbossws-core-scripts.zip"/>
</fileset>
</copy>
<copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true">
16 years, 3 months
- 1
- 0