JBossWS SVN: r4003 - in branches/jbossws-2.0/jbossws-core/src: main/java/org/jboss/ws/tools/helpers and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-26 11:33:02 -0400 (Thu, 26 Jul 2007)
New Revision: 4003
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
Removed:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1723 - WSDL To Java - Anonymous Types Referenced As Bound Headers Not Handled Correctly.
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -55,6 +55,7 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
+import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
@@ -439,7 +440,8 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
- QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ WSDLTypes wsdlTypes = wsdl.getWsdlTypes();
+ QName xmlType = wsdlTypes.getXMLType(header.getElement());
// Replace the xt with the real type from the schema.
xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
@@ -449,7 +451,7 @@
buf.append(", ");
}
- generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder);
+ generateParameter(buf, xe.getName(), xmlType, xsmodel, xt, false, true, holder);
buf.append(" ").append(header.getPartName());
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -371,13 +371,13 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
- QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes();
+ QName xmlType = wsdlTypes.getXMLType(header.getElement());
// Replace the xt with the real type from the schema.
xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
if (xt instanceof XSSimpleTypeDefinition)
xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
-
String partName = header.getPartName();
MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
Copied: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723 (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723)
Deleted: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -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.jbws1723;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.spi.test.JBossWSTest;
-
-/**
- * Test WSDL with bound headers defined as anonymous types.
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-1723
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Jul 26, 2007
- */
-public class JBWS1723TestCase extends JBossWSTest
-{
- public void testGenerateDocLitIn() throws Exception
- {
- generateScenario("doclit_in");
- }
-
- public void testGenerateRpcLitIn() throws Exception
- {
- generateScenario("rpclit_in");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1723/" + scenario;
- String toolsDir = "tools/jbws1723/" + scenario;
- 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/jbws1723/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723");
- 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: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -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.jbws1723;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
+
+/**
+ * Test WSDL with bound headers defined as anonymous types.
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1723
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Jul 26, 2007
+ */
+public class JBWS1723TestCase extends JBossWSTest
+{
+ public void testGenerateDocLitIn() throws Exception
+ {
+ generateScenario("doclit_in");
+ }
+
+ public void testGenerateRpcLitIn() throws Exception
+ {
+ generateScenario("rpclit_in");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1723/" + scenario;
+ String toolsDir = "tools/jbws1723/" + scenario;
+ 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/jbws1723/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723");
+ 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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723 (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723)
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in)
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
-
-
-public class BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
-
-
-public class Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1723'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1723/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1723'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1723/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
- <element name='billingAccount'>
- <complexType>
- <sequence>
- <element name='sortCode' nillable='true' type='string'/>
- <element name='accountNumber' nillable='true' type='string'/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- <part element='ns1:billingAccount' name='header'/>
- </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' parts='parameters'/>
- <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
- </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>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1723'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='billingAccount'>
+ <complexType>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ <part element='ns1:billingAccount' name='header'/>
+ </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' parts='parameters'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </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>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,89 +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.jbws1723</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1723</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1723.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>firstName</java-variable-name>
- <xml-element-name>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>areaCode</java-variable-name>
- <xml-element-name>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type>
- <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>sortCode</java-variable-name>
- <xml-element-name>sortCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>accountNumber</java-variable-name>
- <xml-element-name>accountNumber</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message>
- <wsdl-message-part-name>header</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.jbws1723.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,89 @@
+<?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.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</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.jbws1723.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in)
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
-
-
-public class BillingAccount
-{
-
-protected java.lang.String sortCode;
-
-protected java.lang.String accountNumber;
-public BillingAccount(){}
-
-public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
-this.sortCode=sortCode;
-this.accountNumber=accountNumber;
-}
-public java.lang.String getSortCode() { return sortCode ;}
-
-public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
-
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
-
-
-public class Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws1723'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1723/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1723'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1723/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
-
- <element name='billingAccount'>
- <complexType>
- <sequence>
- <element name='sortCode' nillable='true' type='string'/>
- <element name='accountNumber' nillable='true' type='string'/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='Person_1' type='ns1:Person'/>
- <part name='Account_1' element='ns1:billingAccount'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part name='result' type='ns1:TelephoneNumber'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup' parameterOrder='Person_1'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
- <soap:header message="tns:PhoneBook_lookup"
- part="Account_1" use="literal" />
- </input>
- <output>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1723'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+
+ <element name='billingAccount'>
+ <complexType>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part name='result' type='ns1:TelephoneNumber'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='Person_1'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+ <soap:header message="tns:PhoneBook_lookup"
+ part="Account_1" use="literal" />
+ </input>
+ <output>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,89 +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.jbws1723</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1723</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1723.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>firstName</java-variable-name>
- <xml-element-name>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>areaCode</java-variable-name>
- <xml-element-name>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type>
- <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>sortCode</java-variable-name>
- <xml-element-name>sortCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>accountNumber</java-variable-name>
- <xml-element-name>accountNumber</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>Person_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message>
- <wsdl-message-part-name>Account_1</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.jbws1723.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,89 @@
+<?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.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>Account_1</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.jbws1723.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 15:05:06 UTC (rev 4002)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml (from rev 4002, branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
16 years, 10 months
- 1
- 0
JBossWS SVN: r4002 - in branches/dlofthouse/JBWS-1723/jbossws-core/src: main/java/org/jboss/ws/tools/helpers and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-26 11:05:06 -0400 (Thu, 26 Jul 2007)
New Revision: 4002
Added:
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
Fix implementation and test case.
Modified: branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 14:01:56 UTC (rev 4001)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -55,6 +55,7 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
+import org.jboss.ws.metadata.wsdl.WSDLTypes;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils;
@@ -439,7 +440,8 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
- QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ WSDLTypes wsdlTypes = wsdl.getWsdlTypes();
+ QName xmlType = wsdlTypes.getXMLType(header.getElement());
// Replace the xt with the real type from the schema.
xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
@@ -449,7 +451,7 @@
buf.append(", ");
}
- generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder);
+ generateParameter(buf, xe.getName(), xmlType, xsmodel, xt, false, true, holder);
buf.append(" ").append(header.getPartName());
}
Modified: branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 14:01:56 UTC (rev 4001)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -371,13 +371,13 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI());
XSTypeDefinition xt = xe.getTypeDefinition();
- QName xmlType = new QName(xt.getNamespace(), xt.getName());
+ WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes();
+ QName xmlType = wsdlTypes.getXMLType(header.getElement());
// Replace the xt with the real type from the schema.
xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
if (xt instanceof XSSimpleTypeDefinition)
xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
-
String partName = header.getPartName();
MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true);
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -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.jbws1723;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.spi.test.JBossWSTest;
+
+/**
+ * Test WSDL with bound headers defined as anonymous types.
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-1723
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Jul 26, 2007
+ */
+public class JBWS1723TestCase extends JBossWSTest
+{
+ public void testGenerateDocLitIn() throws Exception
+ {
+ generateScenario("doclit_in");
+ }
+
+ public void testGenerateRpcLitIn() throws Exception
+ {
+ generateScenario("rpclit_in");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1723/" + scenario;
+ String toolsDir = "tools/jbws1723/" + scenario;
+ 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/jbws1723/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723");
+ 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();
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1723'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ <element name='billingAccount'>
+ <complexType>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ <part element='ns1:billingAccount' name='header'/>
+ </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' parts='parameters'/>
+ <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' />
+ </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>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:56:31 BST 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.jbws1723;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,89 @@
+<?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.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>header</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.jbws1723.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+
+
+public class BillingAccount
+{
+
+protected java.lang.String sortCode;
+
+protected java.lang.String accountNumber;
+public BillingAccount(){}
+
+public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){
+this.sortCode=sortCode;
+this.accountNumber=accountNumber;
+}
+public java.lang.String getSortCode() { return sortCode ;}
+
+public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; }
+
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws1723'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1723/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+
+ <element name='billingAccount'>
+ <complexType>
+ <sequence>
+ <element name='sortCode' nillable='true' type='string'/>
+ <element name='accountNumber' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person'/>
+ <part name='Account_1' element='ns1:billingAccount'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part name='result' type='ns1:TelephoneNumber'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup' parameterOrder='Person_1'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' />
+ <soap:header message="tns:PhoneBook_lookup"
+ part="Account_1" use="literal" />
+ </input>
+ <output>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jul 26 15:58:39 BST 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.jbws1723;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,89 @@
+<?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.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1723</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>sortCode</java-variable-name>
+ <xml-element-name>sortCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>accountNumber</java-variable-name>
+ <xml-element-name>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>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.jbws1723.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>Person_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message>
+ <wsdl-message-part-name>Account_1</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.jbws1723.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>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
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml (rev 0)
+++ branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 15:05:06 UTC (rev 4002)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1723/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 10 months
- 1
- 0
JBossWS SVN: r4001 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-26 10:01:56 -0400 (Thu, 26 Jul 2007)
New Revision: 4001
Added:
branches/dlofthouse/JBWS-1723/
Log:
Branch for fix.
Copied: branches/dlofthouse/JBWS-1723 (from rev 4000, branches/jbossws-2.0)
16 years, 10 months
- 1
- 0
JBossWS SVN: r4000 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-26 09:43:59 -0400 (Thu, 26 Jul 2007)
New Revision: 4000
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java
Modified:
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
Log:
Remove UnifiedDeploymentInfo
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -30,13 +30,11 @@
import org.jboss.aop.Dispatcher;
import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
-import org.jboss.wsf.common.ObjectNameFactory;
/**
* Handles invocations on EJB3 endpoints.
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -31,7 +31,6 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
@@ -44,7 +43,7 @@
*/
public abstract class AbstractApplicationMetaDataAdapter
{
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentInfo di)
{
ApplicationMetaData apmd = (ApplicationMetaData)di.metaData;
dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -35,7 +35,6 @@
import org.jboss.mx.util.MBeanProxyCreationException;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
@@ -51,12 +50,14 @@
{
// logging support
private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class);
+
+ public static final String DEPLOYED_OBJECT = "org.jboss.ws.ejb3.deployed.object";
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi)
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep)
{
UnifiedApplicationMetaData appMetaData = null;
- ObjectName oname = (ObjectName)dep.getContext().getProperty("DeployedObject");
+ ObjectName oname = (ObjectName)dep.getContext().getProperty(DEPLOYED_OBJECT);
// jboss.j2ee:service=EJB3,module=some-ejb3.jar
if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service")))
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -31,9 +31,9 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.WebMetaData;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.framework.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.deployment.DeploymentContext;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
@@ -68,27 +68,33 @@
this.webMetaDataAdapter = adapter;
}
- public UnifiedDeploymentInfo buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ public void buildDeploymentInfo(Deployment dep, DeploymentInfo di)
{
- dep.getContext().addAttachment(DeploymentInfo.class, di);
+ DeploymentContext ctx = dep.getContext();
+
+ ctx.addAttachment(DeploymentInfo.class, di);
+ ctx.setProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject);
- if (di.parent != null)
+ if (di.metaData instanceof WebMetaData)
{
- udi.setParent(new UnifiedDeploymentInfo());
- buildDeploymentInfo(dep, udi.getParent(), di.parent);
+ UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, di);
+ if (webMetaData != null)
+ ctx.addAttachment(UnifiedWebMetaData.class, webMetaData);
+
+ ctx.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di));
}
-
- //udi.setVfRoot(new ResourceLoaderAdapter(di.localCl));
- //udi.setSimpleName(di.shortName);
- udi.setUrl(getDeploymentURL(di));
-
- if (di.deployedObject != null)
- dep.getContext().setProperty("DeployedObject", di.deployedObject);
-
- buildMetaData(dep, udi, di);
-
- log.debug("UnifiedDeploymentInfo:\n" + udi);
- return udi;
+ else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3)
+ {
+ UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep);
+ if (appMetaData != null)
+ ctx.addAttachment(UnifiedApplicationMetaData.class, appMetaData);
+ }
+ else if (di.metaData instanceof ApplicationMetaData)
+ {
+ UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, di);
+ if (appMetaData != null)
+ ctx.addAttachment(UnifiedApplicationMetaData.class, appMetaData);
+ }
}
private URL getDeploymentURL(DeploymentInfo di)
@@ -111,26 +117,4 @@
}
return deploymentURL;
}
-
- private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
- {
- if (di.metaData instanceof WebMetaData)
- {
- UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
- if (webMetaData != null)
- dep.getContext().addAttachment(UnifiedWebMetaData.class, webMetaData);
- }
- else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3)
- {
- UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
- if (appMetaData != null)
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData);
- }
- else if (di.metaData instanceof ApplicationMetaData)
- {
- UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
- if (appMetaData != null)
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData);
- }
- }
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -42,7 +42,6 @@
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -36,7 +36,6 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.SecurityHandler;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
@@ -51,7 +50,7 @@
{
String securityDomain = null;
- ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject");
+ ObjectName deployedObject = (ObjectName)dep.getContext().getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT);
Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject);
for (Object manager : ejb3Module.getContainers().values())
{
@@ -82,7 +81,7 @@
public void addSecurityRoles(Element webApp, Deployment dep)
{
// The container objects below provide access to all of the ejb metadata
- ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject");
+ ObjectName deployedObject = (ObjectName)dep.getContext().getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT);
Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject);
for (Object manager : ejb3Module.getContainers().values())
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -24,13 +24,8 @@
//$Id: UnifiedDeploymentInfoDeployer.java 3407 2007-06-03 16:06:36Z thomas.diesler(a)jboss.com $
import org.jboss.deployment.DeploymentInfo;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
-import org.jboss.wsf.spi.deployment.JAXWSDeployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* A deployer that builds the UnifiedDeploymentInfo
@@ -41,7 +36,7 @@
public class UnifiedDeploymentInfoDeploymentAspect extends DeploymentAspect
{
private DeploymentInfoAdapter deploymentInfoAdapter;
-
+
public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter)
{
this.deploymentInfoAdapter = adapter;
@@ -50,27 +45,10 @@
@Override
public void create(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- {
- DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class);
- if (unit == null)
- throw new IllegalStateException("Cannot obtain deployment unit");
+ DeploymentInfo di = dep.getContext().getAttachment(DeploymentInfo.class);
+ if (di == null)
+ throw new IllegalStateException("Cannot obtain deployment info");
- DeploymentType type = dep.getType();
- if (type.toString().startsWith("JAXWS"))
- {
- udi = new JAXWSDeployment(type);
- deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
- }
- else
- {
- WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class);
- udi = new JAXRPCDeployment(type, wsMetaData);
- deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
- }
-
- dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi);
- }
+ deploymentInfoAdapter.buildDeploymentInfo(dep, di);
}
}
\ No newline at end of file
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -58,10 +58,6 @@
{
if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3"))
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement info");
-
URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL);
log.debug("publishServiceEndpoint: " + warURL);
@@ -87,14 +83,10 @@
public void destroy(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement info");
-
URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL);
if (warURL == null)
{
- log.error("Cannot obtain warURL for: " + udi);
+ log.error("Cannot obtain warURL");
return;
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -36,9 +36,7 @@
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
-import org.jboss.wsf.framework.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
@@ -52,7 +50,7 @@
*/
public class WebMetaDataAdapter
{
- public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentInfo di)
{
String contextRoot = null;
@@ -84,8 +82,6 @@
webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
- dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl());
-
return webMetaData;
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -29,7 +29,6 @@
import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
import org.jboss.metadata.ApplicationMetaData.Webservices;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.*;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
@@ -48,7 +47,7 @@
// logging support
private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB21.class);
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit)
{
ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
dep.getContext().addAttachment(ApplicationMetaData.class, appMetaData);
@@ -58,7 +57,6 @@
buildWebservicesMetaData(umd, appMetaData);
umd.setSecurityDomain(appMetaData.getSecurityDomain());
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
return umd;
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -32,7 +32,6 @@
import org.jboss.ejb3.metamodel.*;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.*;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
@@ -51,7 +50,7 @@
// logging support
private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class);
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit)
{
Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment);
@@ -61,7 +60,6 @@
buildUnifiedBeanMetaData(umd, ejb3Deployment);
buildWebservicesMetaData(umd, jarDD);
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
return umd;
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -21,19 +21,21 @@
*/
package org.jboss.wsf.container.jboss50;
+//$Id$
+
+import java.net.URL;
+
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.WebMetaData;
-import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.framework.deployment.WebXMLRewriter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
-// $Id$
-
/**
* Build container independent deployment info.
*
@@ -64,32 +66,41 @@
this.webMetaDataAdapter = adapter;
}
- public void buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ public void buildDeploymentInfo(Deployment dep, DeploymentUnit unit)
{
dep.getContext().addAttachment(DeploymentUnit.class, unit);
try
{
- if (unit.getParent() != null)
+ // JSE endpoints
+ if (unit.getAttachment(WebMetaData.class) != null)
{
- udi.setParent(new UnifiedDeploymentInfo());
- buildDeploymentInfo(dep, udi.getParent(), unit.getParent());
- }
+ UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, unit);
+ if (webMetaData != null)
+ dep.getContext().addAttachment(UnifiedWebMetaData.class, webMetaData);
- VirtualFile vfsRoot = ((VFSDeploymentUnit)unit).getRoot();
- //udi.setVfRoot(new VirtualFileAdaptor(vfsRoot));
-
- //udi.setSimpleName(unit.getSimpleName());
- udi.setUrl(vfsRoot.toURL());
-
- buildMetaData(dep, udi, unit);
-
- // Since we create temporary classes, we need to create a delegate loader
- // This prevents CCE problems where the parent loader is available at deploy time,
- // and a child loader is available at start time.
- // udi.setClassLoader(new URLClassLoader(new URL[] {}, unit.getClassLoader()));
-
- log.debug("UnifiedDeploymentInfo:\n" + udi);
+ if (dep instanceof ArchiveDeployment)
+ {
+ URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL();
+ dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webURL);
+ }
+ }
+
+ // EJB3 endpoints
+ else if (unit.getAttachment(Ejb3Deployment.class) != null)
+ {
+ UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, unit);
+ if (appMetaData != null)
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData);
+ }
+
+ // EJB21 endpoints
+ else if (unit.getAttachment(ApplicationMetaData.class) != null)
+ {
+ UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, unit);
+ if (appMetaData != null)
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData);
+ }
}
catch (RuntimeException rte)
{
@@ -100,21 +111,4 @@
throw new IllegalStateException(ex);
}
}
-
- private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception
- {
- if (unit.getAttachment(WebMetaData.class) != null)
- {
- webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
- dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl());
- }
- else if (unit.getAttachment(Ejb3Deployment.class) != null)
- {
- applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
- }
- else if (unit.getAttachment(ApplicationMetaData.class) != null)
- {
- applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit);
- }
- }
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -23,6 +23,12 @@
// $Id$
+import java.lang.reflect.Method;
+
+import javax.ejb.EJBContext;
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+
import org.jboss.aop.Dispatcher;
import org.jboss.aop.MethodInfo;
import org.jboss.ejb3.BeanContext;
@@ -32,18 +38,16 @@
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.injection.lang.reflect.BeanProperty;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.invocation.*;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.InvocationType;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
-import javax.ejb.EJBContext;
-import javax.management.ObjectName;
-import javax.xml.ws.WebServiceException;
-import java.lang.reflect.Method;
-
/**
* Handles invocations on EJB3 endpoints.
*
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -24,9 +24,8 @@
//$Id: UnifiedDeploymentInfoDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.wsf.spi.deployment.*;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* A deployer that builds the UnifiedDeploymentInfo
@@ -37,36 +36,19 @@
public class UnifiedDeploymentInfoDeploymentAspect extends DeploymentAspect
{
private DeploymentInfoAdapter deploymentInfoAdapter = new DeploymentInfoAdapter();
-
+
public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter)
{
this.deploymentInfoAdapter = adapter;
}
-
+
@Override
public void create(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- {
- DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class);
- if (unit == null)
- throw new IllegalStateException("Cannot obtain deployment unit");
+ DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class);
+ if (unit == null)
+ throw new IllegalStateException("Cannot obtain deployment unit");
- DeploymentType type = dep.getType();
- if (type.toString().startsWith("JAXWS"))
- {
- udi = new JAXWSDeployment(type);
- deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
- }
- else
- {
- WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class);
- udi = new JAXRPCDeployment(type, wsMetaData);
- deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
- }
-
- dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi);
- }
+ deploymentInfoAdapter.buildDeploymentInfo(dep, unit);
}
}
\ No newline at end of file
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -23,6 +23,10 @@
// $Id: WebAppDeployerDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
@@ -31,13 +35,8 @@
import org.jboss.wsf.framework.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Publish the HTTP service endpoint to Tomcat
*
@@ -67,10 +66,6 @@
{
if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3"))
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement info");
-
URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL);
log.debug("publishServiceEndpoint: " + warURL);
@@ -92,14 +87,10 @@
public void destroy(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement info");
-
URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL);
if (warURL == null)
{
- log.error("Cannot obtain warURL for: " + udi);
+ log.error("Cannot obtain warURL");
return;
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -32,7 +32,6 @@
import org.jboss.metadata.web.Servlet;
import org.jboss.metadata.web.ServletMapping;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData;
@@ -48,7 +47,7 @@
*/
public class WebMetaDataAdapter
{
- public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentUnit unit)
{
String contextRoot = null;
@@ -79,7 +78,6 @@
umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
- dep.getContext().addAttachment(UnifiedWebMetaData.class, umd);
return umd;
}
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -27,9 +27,8 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
@@ -43,17 +42,13 @@
@Override
public void create(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement info");
-
UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
if (umd == null)
throw new IllegalStateException("Cannot obtain unified meta data");
try
{
- WSDLFilePublisher publisher = new WSDLFilePublisher((ArchiveDeployment)dep, udi);
+ WSDLFilePublisher publisher = new WSDLFilePublisher((ArchiveDeployment)dep);
publisher.publishWsdlFiles(umd);
}
catch (IOException ex)
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -30,8 +30,10 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
-import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
/**
@@ -48,29 +50,25 @@
UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
if (umd == null)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployment info");
-
if (dep.getType() == DeploymentType.JAXRPC_JSE)
{
JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder();
- umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep);
}
else if (dep.getType() == DeploymentType.JAXRPC_EJB21)
{
JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder();
- umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep);
}
else if (dep.getType() == DeploymentType.JAXWS_JSE)
{
JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE();
- umd = builder.buildMetaData((ArchiveDeployment)dep, udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep);
}
else if (dep.getType() == DeploymentType.JAXWS_EJB3)
{
JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3();
- umd = builder.buildMetaData((ArchiveDeployment)dep, udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep);
}
else
{
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -52,7 +52,6 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.w3c.dom.Document;
@@ -70,14 +69,12 @@
// The deployment info for the web service archive
private ArchiveDeployment dep;
- private UnifiedDeploymentInfo udi;
// The expected wsdl location in the deployment
private String expLocation;
- public WSDLFilePublisher(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
+ public WSDLFilePublisher(ArchiveDeployment dep)
{
this.dep = dep;
- this.udi = udi;
if (dep.getType().toString().endsWith("JSE"))
{
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -24,13 +24,12 @@
//$Id$
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
/**
* A deployer that assigns the context root to the service
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.framework.deployment;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class JAXRPCClientDeployment extends UnifiedDeploymentInfo
-{
-
- public JAXRPCClientDeployment(DeploymentType type)
- {
- super();
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.framework.deployment;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-
-// $Id$
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class JAXRPCDeployment extends UnifiedDeploymentInfo
-{
- private WebservicesMetaData wsMetaData;
-
- public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData)
- {
- super();
- this.wsMetaData = wsMetaData;
- }
-
- public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices)
- {
- super();
-
- try
- {
- // Unmarshall webservices.xml
- URL webservicesURL = vfWebservices.toURL();
- InputStream is = webservicesURL.openStream();
- try
- {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WebservicesFactory(webservicesURL);
- wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null);
- }
- finally
- {
- is.close();
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new IllegalStateException(ex);
- }
- }
-
- public WebservicesMetaData getWebservicesMetaData()
- {
- return wsMetaData;
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.framework.deployment;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 29-Jun-2006
- */
-public class JAXWSDeployment extends UnifiedDeploymentInfo
-{
- public JAXWSDeployment(DeploymentType type)
- {
- super();
- }
-}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -34,15 +34,20 @@
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.SecurityHandler;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-import org.jboss.wsf.spi.deployment.*;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
/**
* A deployer that generates a webapp for an EJB endpoint
@@ -68,10 +73,6 @@
@Override
public void create(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement info");
-
if (dep.getType().toString().endsWith("EJB21"))
{
URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21);
@@ -97,7 +98,6 @@
ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy");
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
String deploymentName = dep.getCanonicalName().replace('/', '-');
tmpWar = File.createTempFile(deploymentName, ".war", tmpdir);
tmpWar.delete();
@@ -128,8 +128,6 @@
private Document createWebAppDescriptor(Deployment dep, SecurityHandler securityHandler)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
-
Document document = DocumentHelper.createDocument();
Element webApp = document.addElement("web-app");
@@ -172,7 +170,7 @@
String beanAuthMethod = null;
WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class);
- if(anWebContext != null)
+ if (anWebContext != null)
{
if (anWebContext.authMethod().length() > 0)
beanAuthMethod = anWebContext.authMethod();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -33,8 +33,8 @@
import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
-import org.jboss.wsf.spi.deployment.*;
import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
/**
* The rewriter for web.xml
@@ -63,10 +63,6 @@
public RewriteResults rewriteWebXml(Deployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployment info");
-
URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL);
File warFile = new File(warURL.getFile());
if (warFile.isDirectory() == false)
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.spi.deployment;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class JAXRPCClientDeployment extends UnifiedDeploymentInfo
-{
-
- public JAXRPCClientDeployment(DeploymentType type)
- {
- super();
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.spi.deployment;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-
-// $Id$
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class JAXRPCDeployment extends UnifiedDeploymentInfo
-{
- private WebservicesMetaData wsMetaData;
-
- public JAXRPCDeployment(DeploymentType type, WebservicesMetaData wsMetaData)
- {
- super();
- this.wsMetaData = wsMetaData;
- }
-
- public JAXRPCDeployment(DeploymentType type, UnifiedVirtualFile vfWebservices)
- {
- super();
-
- try
- {
- // Unmarshall webservices.xml
- URL webservicesURL = vfWebservices.toURL();
- InputStream is = webservicesURL.openStream();
- try
- {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WebservicesFactory(webservicesURL);
- wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(is, factory, null);
- }
- finally
- {
- is.close();
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new IllegalStateException(ex);
- }
- }
-
- public WebservicesMetaData getWebservicesMetaData()
- {
- return wsMetaData;
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.spi.deployment;
-
-//$Id$
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 29-Jun-2006
- */
-public class JAXWSDeployment extends UnifiedDeploymentInfo
-{
- public JAXWSDeployment(DeploymentType type)
- {
- super();
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.wsf.spi.deployment;
-
-// $Id$
-
-import java.net.URL;
-
-/**
- * The container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class UnifiedDeploymentInfo
-{
- /** Sub deployments have a parent */
- private UnifiedDeploymentInfo parent;
- /** The URL for this deployment */
- private URL url;
-
- public void setUrl(URL url)
- {
- this.url = url;
- }
-
- public URL getUrl()
- {
- return url;
- }
-
- public void setParent(UnifiedDeploymentInfo parent)
- {
- this.parent = parent;
- }
-
- public UnifiedDeploymentInfo getParent()
- {
- return parent;
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -47,7 +47,6 @@
import org.jboss.ws.metadata.wsdl.WSDLInterface;
import org.jboss.ws.metadata.wsdl.WSDLProperty;
import org.jboss.ws.metadata.wsdl.WSDLService;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
/**
* A meta data builder for policies; handles checks for policy support
@@ -105,7 +104,7 @@
return builder;
}
- public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi)
+ public void processPolicyAnnotations(EndpointMetaData epMetaData, Class<?> sepClass)
{
UnifiedVirtualFile vfRoot = epMetaData.getServiceMetaData().getUnifiedMetaData().getRootFile();
for (org.jboss.ws.extensions.policy.annotation.Policy anPolicy : sepClass.getAnnotation(PolicyAttachment.class).value())
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -71,7 +71,6 @@
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
@@ -130,7 +129,7 @@
}
}
- protected void initEndpointAddress(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData)
+ protected void initEndpointAddress(Deployment dep, ServerEndpointMetaData sepMetaData)
{
String contextRoot = dep.getService().getContextRoot();
String urlPattern = null;
@@ -175,7 +174,7 @@
sepMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath));
}
- public static ObjectName createServiceEndpointID(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData)
+ public static ObjectName createServiceEndpointID(Deployment dep, ServerEndpointMetaData sepMetaData)
{
String linkName = sepMetaData.getLinkName();
String context = sepMetaData.getContextRoot();
@@ -244,7 +243,7 @@
/**
* Read the transport guarantee from web.xml
*/
- protected void initTransportGuaranteeJSE(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException
+ protected void initTransportGuaranteeJSE(Deployment dep, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException
{
String transportGuarantee = null;
UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -44,7 +44,6 @@
import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
@@ -53,6 +52,7 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
* A server side meta data builder that is based on webservices.xml.
@@ -68,7 +68,7 @@
/**
* Build from webservices.xml
*/
- public UnifiedMetaData buildMetaData(ArchiveDeployment dep, JAXRPCDeployment udi)
+ public UnifiedMetaData buildMetaData(ArchiveDeployment dep)
{
log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
@@ -78,7 +78,8 @@
wsMetaData.setDeploymentName(dep.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
- WebserviceDescriptionMetaData[] wsDescriptionArr = udi.getWebservicesMetaData().getWebserviceDescriptions();
+ WebservicesMetaData jaxrpcMapping = dep.getContext().getAttachment(WebservicesMetaData.class);
+ WebserviceDescriptionMetaData[] wsDescriptionArr = jaxrpcMapping.getWebserviceDescriptions();
for (WebserviceDescriptionMetaData wsdMetaData : wsDescriptionArr)
{
ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, null);
@@ -141,7 +142,7 @@
initEndpointEncodingStyle(sepMetaData);
- initEndpointAddress(dep, udi, sepMetaData);
+ initEndpointAddress(dep, sepMetaData);
UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class);
UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class);
@@ -201,11 +202,11 @@
if (configName != null || configFile != null)
sepMetaData.setConfigName(configName, configFile);
- initTransportGuaranteeJSE(dep, udi, sepMetaData, linkName);
+ initTransportGuaranteeJSE(dep, sepMetaData, linkName);
}
// init service endpoint id
- ObjectName sepID = createServiceEndpointID(dep, udi, sepMetaData);
+ ObjectName sepID = createServiceEndpointID(dep, sepMetaData);
sepMetaData.setServiceEndpointID(sepID);
replaceAddressLocation(sepMetaData);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -32,7 +32,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
@@ -52,7 +51,7 @@
/** Build from webservices.xml
*/
- public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
+ public UnifiedMetaData buildMetaData(ArchiveDeployment dep)
{
log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
@@ -72,7 +71,7 @@
if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class))
{
String ejbLink = beanMetaData.getEjbName();
- JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, udi, beanClass, ejbLink);
+ JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, ejbLink);
// setup the security domain
if (beanClass.isAnnotationPresent(SecurityDomain.class))
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -28,7 +28,6 @@
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
/**
* A server side meta data builder that is based on JSR-181 annotations
@@ -44,7 +43,7 @@
/** Build from annotations
*/
- public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
+ public UnifiedMetaData buildMetaData(ArchiveDeployment dep)
{
log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
@@ -58,7 +57,7 @@
{
String shortName = ep.getShortName();
Class beanClass = ep.getTargetBeanClass();
- JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, udi, beanClass, shortName);
+ JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, shortName);
}
log.debug("END buildMetaData: " + wsMetaData);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -49,7 +49,6 @@
import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.wsf.common.JavaUtils;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
/**
* A server side meta data builder that is based on JSR-181 annotations
@@ -60,7 +59,7 @@
*/
public class JAXWSProviderMetaDataBuilder extends JAXWSServerMetaDataBuilder
{
- public ServerEndpointMetaData buildProviderMetaData(ArchiveDeployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) throws IOException
+ public ServerEndpointMetaData buildProviderMetaData(ArchiveDeployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName) throws IOException
{
// 5.3 Conformance (Provider implementation): A Provider based service endpoint implementation MUST
// implement a typed Provider interface.
@@ -132,20 +131,20 @@
processHandlerChain(sepMetaData, sepClass);
// process config
- processEndpointConfig(udi, sepClass, linkName, sepMetaData);
+ processEndpointConfig(sepClass, linkName, sepMetaData);
// Set the endpoint address
processWebContext(dep, sepClass, linkName, sepMetaData);
// Init the endpoint address
- initEndpointAddress(dep, udi, sepMetaData);
+ initEndpointAddress(dep, sepMetaData);
// A provider may not have a WSDL file
if (sepMetaData.getServiceMetaData().getWsdlLocation() != null)
MetaDataBuilder.replaceAddressLocation(sepMetaData);
// init service endpoint id
- ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, udi, sepMetaData);
+ ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, sepMetaData);
sepMetaData.setServiceEndpointID(sepID);
return sepMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -32,7 +32,6 @@
import org.jboss.wsf.spi.annotation.WebContext;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
/**
@@ -43,21 +42,21 @@
*/
public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder
{
- static void setupProviderOrWebService(ArchiveDeployment dep, UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception
+ static void setupProviderOrWebService(ArchiveDeployment dep, UnifiedMetaData umd, Class<?> beanClass, String beanName) throws Exception
{
if (beanClass.isAnnotationPresent(WebService.class))
{
JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder();
- builder.buildWebServiceMetaData(dep, umd, udi, beanClass, beanName);
+ builder.buildWebServiceMetaData(dep, umd, beanClass, beanName);
}
else if (beanClass.isAnnotationPresent(WebServiceProvider.class))
{
JAXWSProviderMetaDataBuilder builder = new JAXWSProviderMetaDataBuilder();
- builder.buildProviderMetaData(dep, umd, udi, beanClass, beanName);
+ builder.buildProviderMetaData(dep, umd, beanClass, beanName);
}
}
- protected void processEndpointConfig(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
+ protected void processEndpointConfig(Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
{
EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -60,7 +60,6 @@
import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
@@ -101,11 +100,11 @@
this.generateWsdl = generateWsdl;
}
- public ServerEndpointMetaData buildWebServiceMetaData(Deployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName)
+ public ServerEndpointMetaData buildWebServiceMetaData(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName)
{
try
{
- EndpointResult result = processWebService(dep, wsMetaData, sepClass, udi);
+ EndpointResult result = processWebService(dep, wsMetaData, sepClass);
// Clear the java types, etc.
resetMetaDataBuilder(dep.getInitialClassLoader());
@@ -131,13 +130,13 @@
processBindingType(sepMetaData, seiClass);
// process config
- processEndpointConfig(udi, sepClass, linkName, sepMetaData);
+ processEndpointConfig(sepClass, linkName, sepMetaData);
// Process web methods
processWebMethods(sepMetaData, seiClass);
// Init the transport guarantee
- initTransportGuaranteeJSE(dep, udi, sepMetaData, linkName);
+ initTransportGuaranteeJSE(dep, sepMetaData, linkName);
// Initialize types
createJAXBContext(sepMetaData);
@@ -147,7 +146,7 @@
if (sepClass.isAnnotationPresent(PolicyAttachment.class))
{
PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode);
- policyBuilder.processPolicyAnnotations(sepMetaData, sepClass, udi);
+ policyBuilder.processPolicyAnnotations(sepMetaData, sepClass);
}
// The server must always generate WSDL
@@ -180,7 +179,7 @@
processWSDDContribution(sepMetaData);
// Init the endpoint address
- initEndpointAddress(dep, udi, sepMetaData);
+ initEndpointAddress(dep, sepMetaData);
// Process an optional @SOAPMessageHandlers annotation
if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || seiClass.isAnnotationPresent(SOAPMessageHandlers.class))
@@ -190,7 +189,7 @@
processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions);
// init service endpoint id
- ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, udi, sepMetaData);
+ ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, sepMetaData);
sepMetaData.setServiceEndpointID(sepID);
return sepMetaData;
@@ -276,7 +275,7 @@
}
}
- private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi)
+ private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass)
throws ClassNotFoundException, IOException
{
WebService anWebService = sepClass.getAnnotation(WebService.class);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -33,10 +33,8 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.tools.WSContractProvider;
/**
@@ -69,12 +67,6 @@
throw new WSException("Could not create directory: " + sourceDir);
}
- private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader)
- {
- UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo();
- return udi;
- }
-
@Override
public void provide(Class<?> endpointClass)
{
@@ -104,13 +96,11 @@
if (generateWsdl)
messageStream.println("Generating WSDL:");
- UnifiedDeploymentInfo udi = createUDI(endpointClass, loader);
-
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
DeploymentModelFactory factory = spiProvider.getSPI(DeploymentModelFactory.class);
Deployment dep = factory.createDeployment("wsprovide-deployment", loader);
- builder.buildWebServiceMetaData(dep, umd, udi, endpointClass, null);
+ builder.buildWebServiceMetaData(dep, umd, endpointClass, null);
try
{
generator.write();
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-26 11:33:20 UTC (rev 3999)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-26 13:43:59 UTC (rev 4000)
@@ -115,7 +115,7 @@
EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, new QName("dummyPortName"), new QName("dummyPortTypeName"), Type.JAXWS);
serviceMetaData.addEndpoint(epMetaData);
- builder.processPolicyAnnotations(epMetaData, TestMultipleEndpointPolicy.class, null);
+ builder.processPolicyAnnotations(epMetaData, TestMultipleEndpointPolicy.class);
PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);
16 years, 10 months
- 1
- 0
JBossWS SVN: r3999 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-26 07:33:20 -0400 (Thu, 26 Jul 2007)
New Revision: 3999
Modified:
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
Log:
Add notion of parent deployment
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -30,6 +30,8 @@
import org.jboss.aop.Dispatcher;
import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.Invocation;
@@ -54,11 +56,11 @@
public void init(Endpoint ep)
{
String ejbName = ep.getShortName();
- UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
- String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.getSimpleName();
- if (udi.getParent() != null)
+ ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment();
+ String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName();
+ if (dep.getParent() != null)
{
- nameStr += ",ear=" + udi.getParent().getSimpleName();
+ nameStr += ",ear=" + dep.getParent().getSimpleName();
}
objectName = ObjectNameFactory.create(nameStr.toString());
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -35,7 +35,7 @@
import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
@@ -50,9 +50,9 @@
*/
public class ServiceRefMetaDataAdapter
{
- public UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException
+ public UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedVirtualFile vfRoot, ServiceRefMetaData srmd) throws IOException
{
- UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.getVfRoot());
+ UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(vfRoot);
usrmd.setServiceRefName(srmd.getServiceRefName());
usrmd.setServiceInterface(srmd.getServiceInterface());
usrmd.setWsdlFile(srmd.getWsdlFile());
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -23,6 +23,9 @@
// $Id$
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Iterator;
import javax.naming.Context;
@@ -33,16 +36,10 @@
import org.jboss.util.naming.Util;
import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable;
+import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.ws.integration.URLLoaderAdapter;
-import org.jboss.wsf.container.jboss42.DeploymentInfoAdapter;
-import org.jboss.wsf.container.jboss42.DeploymentInfoAdapterFactory;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.JAXRPCClientDeployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
/**
* Binds a JAXRPC Service object in the client's ENC for every service-ref element in the
@@ -70,16 +67,10 @@
ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next();
String serviceRefName = serviceRef.getServiceRefName();
- // Build the container independent deployment info
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment(di.ucl);
- UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(Deployment.DeploymentType.JAXRPC_CLIENT);
- DeploymentInfoAdapter adapter = DeploymentInfoAdapterFactory.getDeploymentInfoAdapter();
- adapter.buildDeploymentInfo(dep, udi, di);
+ UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl);
+ UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(vfRoot, serviceRef);
+ usr.setVfsRoot(new URLLoaderAdapter(getDeploymentURL(di)));
- UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef);
- usr.setVfsRoot(new URLLoaderAdapter(udi.getUrl()));
-
ServiceReferenceable ref = new ServiceReferenceable(usr);
Util.bind(envCtx, serviceRefName, ref);
@@ -91,4 +82,25 @@
throw new DeploymentException("Cannot bind webservice to client environment", e);
}
}
+
+ private URL getDeploymentURL(DeploymentInfo di)
+ {
+ URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url);
+ if ("file".equals(deploymentURL.getProtocol()))
+ {
+ String path = deploymentURL.getPath();
+ if (new File(path).isFile())
+ {
+ try
+ {
+ deploymentURL = new URL("jar:file:" + path + "!/");
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+ }
+ }
+ return deploymentURL;
+ }
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -75,12 +75,19 @@
return deploymentModelFactory;
}
- public ArchiveDeployment createDeployment(ClassLoader initialLoader)
+ public ArchiveDeployment newDeployment(DeploymentInfo di)
{
try
{
DeploymentModelFactory factory = getDeploymentModelFactory();
- return (ArchiveDeployment)factory.createDeployment(initialLoader);
+ ArchiveDeployment dep = (ArchiveDeployment)factory.createDeployment(di.shortName, di.annotationsCl);
+ if (di.parent != null)
+ {
+ DeploymentInfo parentInfo = di.parent;
+ ArchiveDeployment parentDep = (ArchiveDeployment)factory.createDeployment(parentInfo.shortName, parentInfo.annotationsCl);
+ dep.setParent(parentDep);
+ }
+ return dep;
}
catch (Exception ex)
{
@@ -88,7 +95,7 @@
}
}
- public Endpoint createEndpoint()
+ public Endpoint newEndpoint()
{
try
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -31,8 +31,7 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.WebMetaData;
-import org.jboss.ws.integration.ResourceLoaderAdapter;
-import org.jboss.wsf.framework.deployment.WebXMLRewriter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -79,8 +78,8 @@
buildDeploymentInfo(dep, udi.getParent(), di.parent);
}
- udi.setVfRoot(new ResourceLoaderAdapter(di.localCl));
- udi.setSimpleName(di.shortName);
+ //udi.setVfRoot(new ResourceLoaderAdapter(di.localCl));
+ //udi.setSimpleName(di.shortName);
udi.setUrl(getDeploymentURL(di));
if (di.deployedObject != null)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -40,6 +40,7 @@
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext;
@@ -70,11 +71,11 @@
public void init(Endpoint ep)
{
String ejbName = ep.getShortName();
- UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
- String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.getSimpleName();
- if (udi.getParent() != null)
+ ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment();
+ String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName();
+ if (dep.getParent() != null)
{
- nameStr += ",ear=" + udi.getParent().getSimpleName();
+ nameStr += ",ear=" + dep.getParent().getSimpleName();
}
objectName = ObjectNameFactory.create(nameStr.toString());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -54,7 +54,7 @@
@Override
public Deployment createDeployment(DeploymentInfo di)
{
- ArchiveDeployment dep = createDeployment(di.annotationsCl);
+ ArchiveDeployment dep = newDeployment(di);
dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(di.ucl);
dep.setType(getDeploymentType());
@@ -88,7 +88,7 @@
String ejbClass = beanMetaData.getEjbClass();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(ejbLink);
ep.setService(service);
ep.setTargetBeanName(ejbClass);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -60,7 +60,7 @@
@Override
public Deployment createDeployment(DeploymentInfo di)
{
- ArchiveDeployment dep = createDeployment(di.annotationsCl);
+ ArchiveDeployment dep = newDeployment(di);
dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
@@ -105,7 +105,7 @@
}
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(servletLink);
ep.setService(service);
ep.setTargetBeanName(servletClass);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -55,7 +55,7 @@
@Override
public Deployment createDeployment(DeploymentInfo di)
{
- ArchiveDeployment dep = createDeployment(di.annotationsCl);
+ ArchiveDeployment dep = newDeployment(di);
dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(di.ucl);
dep.setType(getDeploymentType());
@@ -74,7 +74,7 @@
String epBean = container.getBeanClassName();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(ejbName);
ep.setService(service);
ep.setTargetBeanName(epBean);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -57,30 +57,30 @@
}
@Override
- public Deployment createDeployment(DeploymentInfo unit)
+ public Deployment createDeployment(DeploymentInfo di)
{
- ArchiveDeployment dep = createDeployment(unit.annotationsCl);
- dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
+ ArchiveDeployment dep = newDeployment(di);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Service service = dep.getService();
- WebMetaData webMetaData = (WebMetaData)unit.metaData;
+ WebMetaData webMetaData = (WebMetaData)di.metaData;
if (webMetaData == null)
throw new IllegalStateException("Deployment unit does not contain web meta data");
// Copy the attachments
dep.getContext().addAttachment(WebMetaData.class, webMetaData);
- List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl);
+ List<Servlet> servlets = getRelevantServlets(webMetaData, di.annotationsCl);
for (Servlet servlet : servlets)
{
String servletName = servlet.getServletName();
String servletClass = servlet.getServletClass();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(servletName);
ep.setService(service);
ep.setTargetBeanName(servletClass);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -66,7 +66,7 @@
while (it.hasNext())
{
J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
- if (module.getFileName().equals(udi.getSimpleName()))
+ if (module.getFileName().equals(dep.getSimpleName()))
contextRoot = module.getWebContext();
}
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -68,12 +68,19 @@
return deploymentModelFactory;
}
- public ArchiveDeployment createDeployment(ClassLoader initialLoader)
+ public ArchiveDeployment newDeployment(DeploymentUnit unit)
{
try
{
DeploymentModelFactory factory = getDeploymentModelFactory();
- return (ArchiveDeployment)factory.createDeployment(initialLoader);
+ ArchiveDeployment dep = (ArchiveDeployment)factory.createDeployment(unit.getSimpleName(), unit.getClassLoader());
+ if (unit.getParent() != null)
+ {
+ DeploymentUnit parentUnit = unit.getParent();
+ ArchiveDeployment parentDep = (ArchiveDeployment)factory.createDeployment(parentUnit.getSimpleName(), parentUnit.getClassLoader());
+ dep.setParent(parentDep);
+ }
+ return dep;
}
catch (Exception ex)
{
@@ -81,20 +88,8 @@
}
}
- public Service createService()
+ public Endpoint newEndpoint()
{
- try
- {
- return getDeploymentModelFactory().createService();
- }
- catch (Exception ex)
- {
- throw new WSFDeploymentException("Cannot load spi.deployment.Service class", ex);
- }
- }
-
- public Endpoint createEndpoint()
- {
try
{
return getDeploymentModelFactory().createEndpoint();
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -77,9 +77,9 @@
}
VirtualFile vfsRoot = ((VFSDeploymentUnit)unit).getRoot();
- udi.setVfRoot(new VirtualFileAdaptor(vfsRoot));
+ //udi.setVfRoot(new VirtualFileAdaptor(vfsRoot));
- udi.setSimpleName(unit.getSimpleName());
+ //udi.setSimpleName(unit.getSimpleName());
udi.setUrl(vfsRoot.toURL());
buildMetaData(dep, udi, unit);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -32,6 +32,7 @@
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.injection.lang.reflect.BeanProperty;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.*;
@@ -65,11 +66,11 @@
public void init(Endpoint ep)
{
String ejbName = ep.getShortName();
- UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
- String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.getSimpleName();
- if (udi.getParent() != null)
+ ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment();
+ String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName();
+ if (dep.getParent() != null)
{
- nameStr += ",ear=" + udi.getParent().getSimpleName();
+ nameStr += ",ear=" + dep.getParent().getSimpleName();
}
objectName = ObjectNameFactory.create(nameStr.toString());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -54,7 +54,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- ArchiveDeployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = newDeployment(unit);
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
@@ -88,7 +88,7 @@
String ejbClass = beanMetaData.getEjbClass();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(ejbLink);
ep.setService(service);
ep.setTargetBeanName(ejbClass);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -57,7 +57,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- ArchiveDeployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = newDeployment(unit);
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
@@ -88,7 +88,7 @@
String servletClass = servlet.getServletClass();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(servletLink);
ep.setService(service);
ep.setTargetBeanName(servletClass);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -56,7 +56,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- ArchiveDeployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = newDeployment(unit);
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
@@ -80,7 +80,7 @@
String epBean = container.getBeanClassName();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(ejbName);
ep.setService(service);
ep.setTargetBeanName(epBean);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -56,7 +56,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- ArchiveDeployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = newDeployment(unit);
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
@@ -77,7 +77,7 @@
String servletClass = servlet.getServletClass();
// Create the endpoint
- Endpoint ep = createEndpoint();
+ Endpoint ep = newEndpoint();
ep.setShortName(servletName);
ep.setService(service);
ep.setTargetBeanName(servletClass);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -60,7 +60,7 @@
J2eeApplicationMetaData appmd = unit.getParent().getAttachment(J2eeApplicationMetaData.class);
if (appmd != null)
{
- J2eeModuleMetaData module = appmd.getModule(udi.getSimpleName());
+ J2eeModuleMetaData module = appmd.getModule(dep.getSimpleName());
if (module != null)
contextRoot = module.getWebContext();
}
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -26,6 +26,7 @@
import java.io.IOException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
@@ -52,7 +53,7 @@
try
{
- WSDLFilePublisher publisher = new WSDLFilePublisher(dep, udi);
+ WSDLFilePublisher publisher = new WSDLFilePublisher((ArchiveDeployment)dep, udi);
publisher.publishWsdlFiles(umd);
}
catch (IOException ex)
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -47,14 +47,14 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.tools.wsdl.WSDLWriter;
-import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.IOUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -69,12 +69,12 @@
private static final Logger log = Logger.getLogger(WSDLFilePublisher.class);
// The deployment info for the web service archive
- private Deployment dep;
+ private ArchiveDeployment dep;
private UnifiedDeploymentInfo udi;
// The expected wsdl location in the deployment
private String expLocation;
- public WSDLFilePublisher(Deployment dep, UnifiedDeploymentInfo udi)
+ public WSDLFilePublisher(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
{
this.dep = dep;
this.udi = udi;
@@ -93,7 +93,7 @@
*/
public void publishWsdlFiles(UnifiedMetaData wsMetaData) throws IOException
{
- String deploymentName = udi.getCanonicalName();
+ String deploymentName = dep.getCanonicalName();
// For each service
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
@@ -202,7 +202,7 @@
File targetFile = new File(xsdURL.getPath());
targetFile.getParentFile().mkdirs();
- String deploymentName = udi.getCanonicalName();
+ String deploymentName = dep.getCanonicalName();
// get the resource path
int index = baseURI.indexOf(deploymentName);
@@ -212,7 +212,7 @@
resourcePath = resourcePath + "/";
resourcePath = expLocation + resourcePath + schemaLocation;
- URL resourceURL = udi.getMetaDataFileURL(resourcePath);
+ URL resourceURL = dep.getMetaDataFileURL(resourcePath);
InputStream is = new ResourceURL(resourceURL).openStream();
if (is == null)
throw new IllegalArgumentException("Cannot find schema import in deployment: " + resourcePath);
@@ -243,7 +243,7 @@
*/
public void unpublishWsdlFiles() throws IOException
{
- String deploymentDir = (udi.getParent() != null ? udi.getParent().getSimpleName() : udi.getSimpleName());
+ String deploymentDir = (dep.getParent() != null ? dep.getParent().getSimpleName() : dep.getSimpleName());
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();
File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -32,9 +32,9 @@
*/
public class ArchiveDeploymentModelFactory extends DeploymentModelFactory
{
- public Deployment createDeployment(ClassLoader initialLoader)
+ public Deployment createDeployment(String simpleName, ClassLoader initialLoader)
{
- return new BasicArchiveDeployment(initialLoader);
+ return new BasicArchiveDeployment(simpleName, initialLoader);
}
public Service createService()
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -23,6 +23,10 @@
//$Id: BasicDeployment.java 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
@@ -35,14 +39,26 @@
*/
public class BasicArchiveDeployment extends BasicDeployment implements ArchiveDeployment
{
+ // The optional parent
+ private ArchiveDeployment parent;
// The root file for this deployment
private UnifiedVirtualFile rootFile;
- BasicArchiveDeployment(ClassLoader classLoader)
+ BasicArchiveDeployment(String simpleName, ClassLoader classLoader)
{
- super(classLoader);
+ super(simpleName, classLoader);
}
+ public ArchiveDeployment getParent()
+ {
+ return parent;
+ }
+
+ public void setParent(ArchiveDeployment parent)
+ {
+ this.parent = parent;
+ }
+
public UnifiedVirtualFile getRootFile()
{
return rootFile;
@@ -52,4 +68,58 @@
{
this.rootFile = rootFile;
}
+
+ public String getCanonicalName()
+ {
+ String name = getSimpleName();
+ if (getParent() != null)
+ name = getParent().getCanonicalName() + "/" + name;
+ return name;
+ }
+
+ public URL getMetaDataFileURL(String resourcePath) throws IOException
+ {
+ URL resourceURL = null;
+ if (resourcePath != null && resourcePath.length() > 0)
+ {
+ if (resourcePath.startsWith("/"))
+ resourcePath = resourcePath.substring(1);
+
+ try
+ {
+ // assign an absolute URL
+ resourceURL = new URL(resourcePath);
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+
+ if (resourceURL == null && getRootFile() != null)
+ {
+ UnifiedVirtualFile vfResource = getRootFile().findChild(resourcePath);
+ resourceURL = vfResource.toURL();
+ }
+
+ /*
+ if (resourceURL == null)
+ {
+ String deploymentPath = getUrl().toExternalForm();
+
+ if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false)
+ deploymentPath += "!/";
+
+ if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false)
+ deploymentPath += "!/";
+
+ if (deploymentPath.endsWith("/") == false)
+ deploymentPath += "/";
+
+ // assign a relative URL
+ resourceURL = new URL(deploymentPath + resourcePath);
+ }
+ */
+ }
+ return resourceURL;
+ }
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -40,7 +40,7 @@
// The context for this deployment dep
private DeploymentContext context;
// The name for this deployment
- private String name;
+ private String simpleName;
// A deployment has one service
private Service service;
// The type of this deployment
@@ -52,8 +52,9 @@
// The runtime class loader
private ClassLoader runtimeLoader;
- BasicDeployment(ClassLoader classLoader)
+ BasicDeployment(String name, ClassLoader classLoader)
{
+ simpleName = name;
context = new BasicDeploymentContext();
state = DeploymentState.UNDEFINED;
initialLoader = classLoader;
@@ -70,14 +71,14 @@
this.context = context;
}
- public String getName()
+ public String getSimpleName()
{
- return name;
+ return simpleName;
}
- public void setName(String name)
+ public void setSimpleName(String name)
{
- this.name = name;
+ this.simpleName = name;
}
public void setInitialClassLoader(ClassLoader classLoader)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -26,6 +26,7 @@
import org.jboss.wsf.spi.annotation.WebContext;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -47,7 +48,7 @@
{
contextRoot = getExplicitContextRoot(dep);
if (contextRoot == null)
- contextRoot = getImplicitContextRoot(dep);
+ contextRoot = getImplicitContextRoot((ArchiveDeployment)dep);
// Always prefix with '/'
if (contextRoot.startsWith("/") == false)
@@ -95,14 +96,13 @@
/** Use the implicit context root derived from the deployment name
*/
- protected String getImplicitContextRoot(Deployment dep)
+ protected String getImplicitContextRoot(ArchiveDeployment dep)
{
- UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- String simpleName = udi.getSimpleName();
+ String simpleName = dep.getSimpleName();
String contextRoot = simpleName.substring(0, simpleName.length() - 4);
- if (udi.getParent() != null)
+ if (dep.getParent() != null)
{
- simpleName = udi.getParent().getSimpleName();
+ simpleName = dep.getParent().getSimpleName();
contextRoot = simpleName.substring(0, simpleName.length() - 4) + "-" + contextRoot;
}
return contextRoot;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -32,9 +32,9 @@
*/
public class DeploymentModelFactoryImpl extends DeploymentModelFactory
{
- public Deployment createDeployment(ClassLoader initialLoader)
+ public Deployment createDeployment(String simpleName, ClassLoader initialLoader)
{
- return new BasicDeployment(initialLoader);
+ return new BasicDeployment(simpleName, initialLoader);
}
public Service createService()
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -74,17 +74,17 @@
if (dep.getType().toString().endsWith("EJB21"))
{
- URL webAppURL = generatWebDeployment(dep, securityHandlerEJB21);
+ URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21);
dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL);
}
else if (dep.getType().toString().endsWith("EJB3"))
{
- URL webAppURL = generatWebDeployment(dep, securityHandlerEJB3);
+ URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3);
dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL);
}
}
- private URL generatWebDeployment(Deployment dep, SecurityHandler securityHandler)
+ private URL generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler)
{
Document webDoc = createWebAppDescriptor(dep, securityHandler);
Document jbossDoc = createJBossWebAppDescriptor(dep, securityHandler);
@@ -98,7 +98,7 @@
File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy");
UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- String deploymentName = udi.getCanonicalName().replace('/', '-');
+ String deploymentName = dep.getCanonicalName().replace('/', '-');
tmpWar = File.createTempFile(deploymentName, ".war", tmpdir);
tmpWar.delete();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.spi.deployment;
+import java.io.IOException;
+import java.net.URL;
+
import org.jboss.ws.integration.UnifiedVirtualFile;
@@ -37,10 +40,21 @@
*/
public interface ArchiveDeployment extends Deployment
{
+ /** Get the optional parent of this deployment */
+ ArchiveDeployment getParent();
+
+ /** Set the optional parent for this deployment */
+ void setParent (ArchiveDeployment parent);
+
/** Get the root file for this deployment */
UnifiedVirtualFile getRootFile();
/** Set the root file for this deployment */
void setRootFile(UnifiedVirtualFile root);
+ /** The concatenated names including all parents. */
+ String getCanonicalName();
+
+ /** Get the URL for a given resource path */
+ URL getMetaDataFileURL(String resourcePath) throws IOException;
}
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -43,11 +43,11 @@
UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
};
- /** Get the unique identifier for this deployment */
- String getName();
+ /** Get the identifier for this deployment */
+ String getSimpleName();
- /** Set the unique identifier for this deployment */
- void setName(String name);
+ /** Set the identifier for this deployment */
+ void setSimpleName(String name);
/** Get the class loader for this deployment */
ClassLoader getInitialClassLoader();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -29,7 +29,7 @@
*/
public abstract class DeploymentModelFactory implements SPIView
{
- public abstract Deployment createDeployment(ClassLoader initialLoader);
+ public abstract Deployment createDeployment(String simpleName, ClassLoader initialLoader);
public abstract Service createService();
public abstract Endpoint createEndpoint();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -23,12 +23,8 @@
// $Id$
-import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-
/**
* The container independent deployment info.
*
@@ -39,23 +35,9 @@
{
/** Sub deployments have a parent */
private UnifiedDeploymentInfo parent;
- /** The suffix of the deployment url */
- private String simpleName;
/** The URL for this deployment */
private URL url;
- /** The virtual file for the deployment root */
- private UnifiedVirtualFile vfRoot;
-
- public void setVfRoot(UnifiedVirtualFile vfRoot)
- {
- this.vfRoot = vfRoot;
- }
- public UnifiedVirtualFile getVfRoot()
- {
- return vfRoot;
- }
-
public void setUrl(URL url)
{
this.url = url;
@@ -66,16 +48,6 @@
return url;
}
- public void setSimpleName(String simpleName)
- {
- this.simpleName = simpleName;
- }
-
- public String getSimpleName()
- {
- return simpleName;
- }
-
public void setParent(UnifiedDeploymentInfo parent)
{
this.parent = parent;
@@ -85,57 +57,4 @@
{
return parent;
}
-
- /** The sortName concatenated with the canonical names of all parents. */
- public String getCanonicalName()
- {
- String name = getSimpleName();
- if (getParent() != null)
- name = getParent().getCanonicalName() + "/" + name;
- return name;
- }
-
- public URL getMetaDataFileURL(String resourcePath) throws IOException
- {
- URL resourceURL = null;
- if (resourcePath != null && resourcePath.length() > 0)
- {
- if (resourcePath.startsWith("/"))
- resourcePath = resourcePath.substring(1);
-
- try
- {
- // assign an absolute URL
- resourceURL = new URL(resourcePath);
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
-
- if (resourceURL == null && getVfRoot() != null)
- {
- UnifiedVirtualFile vfResource = getVfRoot().findChild(resourcePath);
- resourceURL = vfResource.toURL();
- }
-
- if (resourceURL == null)
- {
- String deploymentPath = getUrl().toExternalForm();
-
- if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false)
- deploymentPath += "!/";
-
- if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false)
- deploymentPath += "!/";
-
- if (deploymentPath.endsWith("/") == false)
- deploymentPath += "/";
-
- // assign a relative URL
- resourceURL = new URL(deploymentPath + resourcePath);
- }
- }
- return resourceURL;
- }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -68,6 +68,7 @@
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
@@ -145,13 +146,16 @@
// If not, derive the context root from the deployment
if (contextRoot == null)
{
- String simpleName = udi.getSimpleName();
+ String simpleName = dep.getSimpleName();
contextRoot = simpleName.substring(0, simpleName.indexOf('.'));
- if (udi.getParent() != null)
+ if (dep instanceof ArchiveDeployment)
{
- simpleName = udi.getParent().getSimpleName();
- simpleName = simpleName.substring(0, simpleName.indexOf('.'));
- contextRoot = simpleName + "-" + contextRoot;
+ if (((ArchiveDeployment)dep).getParent() != null)
+ {
+ simpleName = ((ArchiveDeployment)dep).getParent().getSimpleName();
+ simpleName = simpleName.substring(0, simpleName.indexOf('.'));
+ contextRoot = simpleName + "-" + contextRoot;
+ }
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -70,12 +70,12 @@
*/
public UnifiedMetaData buildMetaData(ArchiveDeployment dep, JAXRPCDeployment udi)
{
- log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
+ log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
{
// For every webservice-description build the ServiceMetaData
UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
- wsMetaData.setDeploymentName(udi.getCanonicalName());
+ wsMetaData.setDeploymentName(dep.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
WebserviceDescriptionMetaData[] wsDescriptionArr = udi.getWebservicesMetaData().getWebserviceDescriptions();
@@ -94,7 +94,7 @@
// Unmarshall the jaxrpc-mapping.xml
String mappingFile = wsdMetaData.getJaxrpcMappingFile();
- serviceMetaData.setMappingLocation(udi.getMetaDataFileURL(mappingFile));
+ serviceMetaData.setMappingLocation(dep.getMetaDataFileURL(mappingFile));
JavaWsdlMapping javaWsdlMapping = serviceMetaData.getJavaWsdlMapping();
if (javaWsdlMapping == null)
throw new WSException("jaxrpc-mapping-file not configured from webservices.xml");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -32,7 +32,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
@@ -55,11 +54,11 @@
*/
public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
{
- log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
+ log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
{
UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
- wsMetaData.setDeploymentName(udi.getCanonicalName());
+ wsMetaData.setDeploymentName(dep.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
// The container objects below provide access to all of the ejb metadata
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -46,11 +46,11 @@
*/
public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
{
- log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
+ log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
{
UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
- wsMetaData.setDeploymentName(udi.getCanonicalName());
+ wsMetaData.setDeploymentName(dep.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
// For every bean
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -47,9 +47,9 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.common.JavaUtils;
/**
* A server side meta data builder that is based on JSR-181 annotations
@@ -60,7 +60,7 @@
*/
public class JAXWSProviderMetaDataBuilder extends JAXWSServerMetaDataBuilder
{
- public ServerEndpointMetaData buildProviderMetaData(Deployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) throws IOException
+ public ServerEndpointMetaData buildProviderMetaData(ArchiveDeployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) throws IOException
{
// 5.3 Conformance (Provider implementation): A Provider based service endpoint implementation MUST
// implement a typed Provider interface.
@@ -121,7 +121,7 @@
String wsdlLocation = anWebServiceProvider.wsdlLocation();
if (wsdlLocation.length() > 0)
{
- URL wsdlURL = udi.getMetaDataFileURL(wsdlLocation);
+ URL wsdlURL = dep.getMetaDataFileURL(wsdlLocation);
serviceMetaData.setWsdlLocation(wsdlURL);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -30,6 +30,7 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -42,7 +43,7 @@
*/
public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder
{
- static void setupProviderOrWebService(Deployment dep, UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception
+ static void setupProviderOrWebService(ArchiveDeployment dep, UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception
{
if (beanClass.isAnnotationPresent(WebService.class))
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -58,6 +58,7 @@
import org.jboss.ws.tools.wsdl.WSDLWriter;
import org.jboss.ws.tools.wsdl.WSDLWriterResolver;
import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
@@ -275,8 +276,8 @@
}
}
- private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) throws ClassNotFoundException,
- IOException
+ private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi)
+ throws ClassNotFoundException, IOException
{
WebService anWebService = sepClass.getAnnotation(WebService.class);
if (anWebService == null)
@@ -342,9 +343,11 @@
result.serviceMetaData = new ServiceMetaData(wsMetaData, new QName(serviceNS, serviceName));
result.sepMetaData = new ServerEndpointMetaData(result.serviceMetaData, portQName, portTypeQName, EndpointMetaData.Type.JAXWS);
result.epClass = (seiClass != null ? seiClass : sepClass);
- result.wsdlLocation = udi.getMetaDataFileURL(wsdlLocation);
result.serviceMetaData.addEndpoint(result.sepMetaData);
wsMetaData.addService(result.serviceMetaData);
+
+ if (dep instanceof ArchiveDeployment)
+ result.wsdlLocation = ((ArchiveDeployment)dep).getMetaDataFileURL(wsdlLocation);
return result;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-26 10:00:45 UTC (rev 3998)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-26 11:33:20 UTC (rev 3999)
@@ -1,43 +1,44 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.ws.tools.jaxws.impl;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+
import org.jboss.ws.WSException;
import org.jboss.ws.integration.ResourceLoaderAdapter;
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.tools.WSContractProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.SPIProvider;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-
/**
* The default WSContractProvider implementation.
*
@@ -52,17 +53,17 @@
private File resourceDir = null;
private File sourceDir = null;
private PrintStream messageStream = new NullPrintStream();
-
+
private void createDirectories(File resourceDir, File sourceDir)
{
if (!outputDir.exists())
if (!outputDir.mkdirs())
throw new WSException("Could not create directory: " + outputDir);
-
+
if (generateWsdl && !resourceDir.exists())
if (!resourceDir.mkdirs())
throw new WSException("Could not create directory: " + resourceDir);
-
+
if (generateSource && !sourceDir.exists())
if (!sourceDir.mkdirs())
throw new WSException("Could not create directory: " + sourceDir);
@@ -70,15 +71,7 @@
private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader)
{
- //DeploymentType type = (endpointClass.isAnnotationPresent(Stateless.class)) ? JAXWS_EJB3 : JAXWS_JSE;
- UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo()
- {
- @Override
- public URL getMetaDataFileURL(String resourcePath) throws IOException
- {
- return null;
- }
- };
+ UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo();
return udi;
}
@@ -88,33 +81,34 @@
// Use the output directory as the default
File resourceDir = (this.resourceDir != null) ? this.resourceDir : outputDir;
File sourceDir = (this.sourceDir != null) ? this.sourceDir : outputDir;
-
+
createDirectories(resourceDir, sourceDir);
-
+
// Create a dummy classloader to catch generated classes
ClassLoader loader = new URLClassLoader(new URL[0], this.loader);
UnifiedMetaData umd = new UnifiedMetaData(new ResourceLoaderAdapter(loader));
umd.setClassLoader(loader);
-
+
ChainedWritableWrapperGenerator generator = new ChainedWritableWrapperGenerator();
if (generateSource)
generator.add(new SourceWrapperGenerator(loader, messageStream), sourceDir);
generator.add(new BytecodeWrapperGenerator(loader, messageStream), outputDir);
-
+
JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder();
builder.setWrapperGenerator(generator);
builder.setGenerateWsdl(generateWsdl);
builder.setToolMode(true);
builder.setWsdlDirectory(resourceDir);
builder.setMessageStream(messageStream);
-
+
if (generateWsdl)
messageStream.println("Generating WSDL:");
UnifiedDeploymentInfo udi = createUDI(endpointClass, loader);
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment(loader);
+ DeploymentModelFactory factory = spiProvider.getSPI(DeploymentModelFactory.class);
+ Deployment dep = factory.createDeployment("wsprovide-deployment", loader);
builder.buildWebServiceMetaData(dep, umd, udi, endpointClass, null);
try
@@ -163,7 +157,7 @@
{
this.generateSource = generateSource;
}
-
+
@Override
public void setResourceDirectory(File directory)
{
16 years, 10 months
- 1
- 0
JBossWS SVN: r3998 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-26 06:00:45 -0400 (Thu, 26 Jul 2007)
New Revision: 3998
Added:
trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
Modified:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
Log:
Add ArchiveDeployment
Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-07-26 10:00:45 UTC (rev 3998)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -75,11 +75,12 @@
return deploymentModelFactory;
}
- public Deployment createDeployment(ClassLoader initialLoader)
+ public ArchiveDeployment createDeployment(ClassLoader initialLoader)
{
try
{
- return getDeploymentModelFactory().createDeployment(initialLoader);
+ DeploymentModelFactory factory = getDeploymentModelFactory();
+ return (ArchiveDeployment)factory.createDeployment(initialLoader);
}
catch (Exception ex)
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -27,6 +27,7 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
@@ -53,7 +54,7 @@
@Override
public Deployment createDeployment(DeploymentInfo di)
{
- Deployment dep = createDeployment(di.annotationsCl);
+ ArchiveDeployment dep = createDeployment(di.annotationsCl);
dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(di.ucl);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -30,6 +30,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.WebMetaData;
import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
@@ -59,7 +60,7 @@
@Override
public Deployment createDeployment(DeploymentInfo di)
{
- Deployment dep = createDeployment(di.annotationsCl);
+ ArchiveDeployment dep = createDeployment(di.annotationsCl);
dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -31,6 +31,7 @@
import org.jboss.ejb3.Ejb3ModuleMBean;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
@@ -54,7 +55,7 @@
@Override
public Deployment createDeployment(DeploymentInfo di)
{
- Deployment dep = createDeployment(di.annotationsCl);
+ ArchiveDeployment dep = createDeployment(di.annotationsCl);
dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(di.ucl);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -35,6 +35,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.WebMetaData;
import org.jboss.ws.integration.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
@@ -58,7 +59,7 @@
@Override
public Deployment createDeployment(DeploymentInfo unit)
{
- Deployment dep = createDeployment(unit.annotationsCl);
+ ArchiveDeployment dep = createDeployment(unit.annotationsCl);
dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-07-26 10:00:45 UTC (rev 3998)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -68,11 +68,12 @@
return deploymentModelFactory;
}
- public Deployment createDeployment(ClassLoader initialLoader)
+ public ArchiveDeployment createDeployment(ClassLoader initialLoader)
{
try
{
- return getDeploymentModelFactory().createDeployment(initialLoader);
+ DeploymentModelFactory factory = getDeploymentModelFactory();
+ return (ArchiveDeployment)factory.createDeployment(initialLoader);
}
catch (Exception ex)
{
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -27,6 +27,7 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.WebMetaData;
+import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.framework.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
@@ -75,10 +76,11 @@
buildDeploymentInfo(dep, udi.getParent(), unit.getParent());
}
- udi.setVfRoot(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ VirtualFile vfsRoot = ((VFSDeploymentUnit)unit).getRoot();
+ udi.setVfRoot(new VirtualFileAdaptor(vfsRoot));
udi.setSimpleName(unit.getSimpleName());
- udi.setUrl(udi.getVfRoot().toURL());
+ udi.setUrl(vfsRoot.toURL());
buildMetaData(dep, udi, unit);
@@ -104,7 +106,7 @@
if (unit.getAttachment(WebMetaData.class) != null)
{
webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
- dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getVfRoot().toURL());
+ dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl());
}
else if (unit.getAttachment(Ejb3Deployment.class) != null)
{
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -29,6 +29,7 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
@@ -53,7 +54,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -29,6 +29,7 @@
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
@@ -56,7 +57,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -30,6 +30,7 @@
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
@@ -55,7 +56,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -29,6 +29,7 @@
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
@@ -55,7 +56,7 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment(unit.getClassLoader());
+ ArchiveDeployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-07-26 10:00:45 UTC (rev 3998)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -55,22 +55,22 @@
if (dep.getType() == DeploymentType.JAXRPC_JSE)
{
JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder();
- umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi);
}
else if (dep.getType() == DeploymentType.JAXRPC_EJB21)
{
JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder();
- umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi);
}
else if (dep.getType() == DeploymentType.JAXWS_JSE)
{
JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE();
- umd = builder.buildMetaData(dep, udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep, udi);
}
else if (dep.getType() == DeploymentType.JAXWS_EJB3)
{
JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3();
- umd = builder.buildMetaData(dep, udi);
+ umd = builder.buildMetaData((ArchiveDeployment)dep, udi);
}
else
{
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.wsf.framework.deployment;
+
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 26-Jul-2007
+ */
+public class ArchiveDeploymentModelFactory extends DeploymentModelFactory
+{
+ public Deployment createDeployment(ClassLoader initialLoader)
+ {
+ return new BasicArchiveDeployment(initialLoader);
+ }
+
+ public Service createService()
+ {
+ return new BasicService();
+ }
+
+ public Endpoint createEndpoint()
+ {
+ return new BasicEndpoint();
+ }
+}
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.wsf.framework.deployment;
+
+//$Id: BasicDeployment.java 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+
+
+/**
+ * A general web service deployment that is based on an archive.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class BasicArchiveDeployment extends BasicDeployment implements ArchiveDeployment
+{
+ // The root file for this deployment
+ private UnifiedVirtualFile rootFile;
+
+ BasicArchiveDeployment(ClassLoader classLoader)
+ {
+ super(classLoader);
+ }
+
+ public UnifiedVirtualFile getRootFile()
+ {
+ return rootFile;
+ }
+
+ public void setRootFile(UnifiedVirtualFile rootFile)
+ {
+ this.rootFile = rootFile;
+ }
+}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -21,14 +21,12 @@
*/
package org.jboss.wsf.framework.deployment;
-import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentContext;
import org.jboss.wsf.spi.deployment.Service;
//$Id$
-
/**
* A general web service deployment dep.
*
@@ -41,8 +39,8 @@
{
// The context for this deployment dep
private DeploymentContext context;
- // The root file for this deployment
- private UnifiedVirtualFile rootFile;
+ // The name for this deployment
+ private String name;
// A deployment has one service
private Service service;
// The type of this deployment
@@ -72,36 +70,36 @@
this.context = context;
}
- public UnifiedVirtualFile getRootFile()
+ public String getName()
{
- return rootFile;
+ return name;
}
- public void setRootFile(UnifiedVirtualFile rootFile)
+ public void setName(String name)
{
- this.rootFile = rootFile;
+ this.name = name;
}
public void setInitialClassLoader(ClassLoader classLoader)
{
this.initialLoader = classLoader;
}
-
+
public ClassLoader getInitialClassLoader()
{
return initialLoader;
}
-
+
public void setRuntimeClassLoader(ClassLoader classLoader)
{
this.runtimeLoader = classLoader;
}
-
+
public ClassLoader getRuntimeClassLoader()
{
return runtimeLoader;
}
-
+
public Service getService()
{
return service;
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.wsf.spi.deployment;
+
+import org.jboss.ws.integration.UnifiedVirtualFile;
+
+
+// $Id: Deployment.java 3992 2007-07-25 12:48:59Z thomas.diesler(a)jboss.com $
+
+
+/**
+ * A general web service deployment dep.
+ *
+ * It has no notion of J2EE deployment packages.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public interface ArchiveDeployment extends Deployment
+{
+ /** Get the root file for this deployment */
+ UnifiedVirtualFile getRootFile();
+
+ /** Set the root file for this deployment */
+ void setRootFile(UnifiedVirtualFile root);
+
+}
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -21,12 +21,8 @@
*/
package org.jboss.wsf.spi.deployment;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-
-
// $Id$
-
/**
* A general web service deployment dep.
*
@@ -47,12 +43,12 @@
UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
};
- /** Get the root file for this deployment */
- UnifiedVirtualFile getRootFile();
-
- /** Set the root file for this deployment */
- void setRootFile(UnifiedVirtualFile root);
-
+ /** Get the unique identifier for this deployment */
+ String getName();
+
+ /** Set the unique identifier for this deployment */
+ void setName(String name);
+
/** Get the class loader for this deployment */
ClassLoader getInitialClassLoader();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -42,6 +42,7 @@
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.metadata.wsse.WSSecurityOMFactory;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
@@ -67,13 +68,13 @@
/**
* Build from webservices.xml
*/
- public UnifiedMetaData buildMetaData(Deployment dep, JAXRPCDeployment udi)
+ public UnifiedMetaData buildMetaData(ArchiveDeployment dep, JAXRPCDeployment udi)
{
log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
try
{
// For every webservice-description build the ServiceMetaData
- UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot());
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
wsMetaData.setDeploymentName(udi.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -31,6 +31,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
@@ -52,12 +53,12 @@
/** Build from webservices.xml
*/
- public UnifiedMetaData buildMetaData(Deployment dep, UnifiedDeploymentInfo udi)
+ public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
{
- if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
+ log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
try
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot());
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
wsMetaData.setDeploymentName(udi.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
@@ -88,7 +89,7 @@
}
}
- if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData);
+ log.debug("END buildMetaData: " + wsMetaData);
return wsMetaData;
}
catch (RuntimeException rte)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 09:14:44 UTC (rev 3997)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 10:00:45 UTC (rev 3998)
@@ -25,6 +25,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
@@ -43,12 +44,12 @@
/** Build from annotations
*/
- public UnifiedMetaData buildMetaData(Deployment dep, UnifiedDeploymentInfo udi)
+ public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi)
{
log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]");
try
{
- UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot());
+ UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
wsMetaData.setDeploymentName(udi.getCanonicalName());
wsMetaData.setClassLoader(dep.getInitialClassLoader());
16 years, 10 months
- 1
- 0
JBossWS SVN: r3997 - in trunk: integration/spi/src/main/java/org/jboss/wsf/framework and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-26 05:14:44 -0400 (Thu, 26 Jul 2007)
New Revision: 3997
Modified:
trunk/build/eclipse/JBossWSCodeStyle.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
Log:
layout code
Modified: trunk/build/eclipse/JBossWSCodeStyle.xml
===================================================================
--- trunk/build/eclipse/JBossWSCodeStyle.xml 2007-07-26 09:07:09 UTC (rev 3996)
+++ trunk/build/eclipse/JBossWSCodeStyle.xml 2007-07-26 09:14:44 UTC (rev 3997)
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="8">
-<profile name="JBossWSCodeStyle" version="8">
+<profiles version="10">
+<profile name="JBossWSCodeStyle" version="10">
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
@@ -56,10 +57,12 @@
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
@@ -73,6 +76,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
@@ -216,6 +220,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
@@ -231,7 +236,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-26 09:07:09 UTC (rev 3996)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-26 09:14:44 UTC (rev 3997)
@@ -113,17 +113,13 @@
// help debugging
if (null == returnType)
throw new WSFException("Failed to provide SPI '" + spiType + "'");
- else log.debug(spiType + " Implementation: " + returnType);
+ log.debug(spiType + " Implementation: " + returnType);
+
return returnType;
}
- /**
- * Load SPI implementation through ServiceLoader
- * @param spiType
- * @param defaultImpl
- * @return the spiType implementation
- */
+ // Load SPI implementation through ServiceLoader
private <T> T loadService(Class<T> spiType, String defaultImpl)
{
return (T)ServiceLoader.loadService(spiType.getName(), defaultImpl);
16 years, 10 months
- 1
- 0
JBossWS SVN: r3996 - trunk/integration/spi/src/main/java/org/jboss/wsf/framework.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-26 05:07:09 -0400 (Thu, 26 Jul 2007)
New Revision: 3996
Modified:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
Log:
layout code
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-26 08:52:45 UTC (rev 3995)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-26 09:07:09 UTC (rev 3996)
@@ -26,12 +26,16 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory;
-import org.jboss.wsf.spi.invocation.*;
+import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
+import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
+import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
/**
* @author Heiko.Braun(a)jboss.com
@@ -56,67 +60,60 @@
*/
public <T> T getSPI(Class<T> spiType)
{
- log.debug("provide SPI '"+spiType+"'");
+ log.debug("provide SPI '" + spiType + "'");
T returnType = null;
// SPI provided by framework, default that can be overridden
- if(DeploymentModelFactory.class.equals(spiType))
+ if (DeploymentModelFactory.class.equals(spiType))
{
- returnType = (T) loadService(
- spiType, "org.jboss.wsf.framework.deployment.DeploymentModelFactoryImpl"
- );
+ returnType = (T)loadService(spiType, "org.jboss.wsf.framework.deployment.DeploymentModelFactoryImpl");
}
else if (ResourceInjectorFactory.class.equals(spiType))
{
- returnType = (T) loadService(
- spiType, "org.jboss.wsf.framework.invocation.ResourceInjectorFactoryImpl"
- );
+ returnType = (T)loadService(spiType, "org.jboss.wsf.framework.invocation.ResourceInjectorFactoryImpl");
}
- else if(LifecycleHandlerFactory.class.equals(spiType))
+ else if (LifecycleHandlerFactory.class.equals(spiType))
{
- returnType = (T) loadService(
- spiType, "org.jboss.wsf.framework.deployment.LifecycleHandlerFactoryImpl"
- );
+ returnType = (T)loadService(spiType, "org.jboss.wsf.framework.deployment.LifecycleHandlerFactoryImpl");
}
// SPI provided by either container or stack integration
- else if(InvocationHandlerFactory.class.equals(spiType))
+ else if (InvocationHandlerFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
- else if(DeploymentAspectManagerFactory.class.equals(spiType))
+ else if (DeploymentAspectManagerFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
- else if(RequestHandlerFactory.class.equals(spiType))
+ else if (RequestHandlerFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
- else if(EndpointRegistryFactory.class.equals(spiType))
+ else if (EndpointRegistryFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
- else if(ServerConfigFactory.class.equals(spiType))
+ else if (ServerConfigFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
- else if(SecurityAdaptorFactory.class.equals(spiType))
+ else if (SecurityAdaptorFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
- else if(WebServiceContextFactory.class.equals(spiType))
+ else if (WebServiceContextFactory.class.equals(spiType))
{
- returnType = (T) loadService(spiType, null);
+ returnType = (T)loadService(spiType, null);
}
// help debugging
- if(null == returnType)
- throw new WSFException("Failed to provide SPI '"+spiType+"'");
- else
- log.debug(spiType + " Implementation: " + returnType);
+ if (null == returnType)
+ throw new WSFException("Failed to provide SPI '" + spiType + "'");
+ else log.debug(spiType + " Implementation: " + returnType);
return returnType;
}
@@ -129,9 +126,8 @@
*/
private <T> T loadService(Class<T> spiType, String defaultImpl)
{
- return (T) ServiceLoader.loadService(spiType.getName(), defaultImpl);
+ return (T)ServiceLoader.loadService(spiType.getName(), defaultImpl);
}
}
-
}
16 years, 10 months
- 1
- 0
JBossWS SVN: r3995 - in trunk: integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40 and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-26 04:52:45 -0400 (Thu, 26 Jul 2007)
New Revision: 3995
Modified:
trunk/build/ant.properties.example
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
Log:
Fix ear deployment. Mandatory Deployment.initialLoader
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/build/ant.properties.example 2007-07-26 08:52:45 UTC (rev 3995)
@@ -5,7 +5,7 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
@@ -36,12 +36,12 @@
hudson.jboss50.build=jboss-5.0.0.Beta3
hudson.jboss50.rev=HEAD
-hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
+hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA
hudson.jboss42.build=jboss-4.2.1.GA
hudson.jboss42.rev=HEAD
-hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1
+hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA
+hudson.jboss40.build=jboss-4.0.5.GA
hudson.jboss40.rev=HEAD
hudson.mail.recipients=
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -72,7 +72,7 @@
// Build the container independent deployment info
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment();
+ Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment(di.ucl);
UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(Deployment.DeploymentType.JAXRPC_CLIENT);
DeploymentInfoAdapter adapter = DeploymentInfoAdapterFactory.getDeploymentInfoAdapter();
adapter.buildDeploymentInfo(dep, udi, di);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -49,16 +49,14 @@
ApplicationMetaData apmd = (ApplicationMetaData)di.metaData;
dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, apmd);
- umd.setConfigName(apmd.getConfigName());
- umd.setConfigFile(apmd.getConfigFile());
- umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
- umd.setSecurityDomain(apmd.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
+ UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(appMetaData, apmd);
+ appMetaData.setConfigName(apmd.getConfigName());
+ appMetaData.setConfigFile(apmd.getConfigFile());
+ appMetaData.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
+ appMetaData.setSecurityDomain(apmd.getSecurityDomain());
+ appMetaData.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
+ return appMetaData;
}
protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -75,11 +75,11 @@
return deploymentModelFactory;
}
- public Deployment createDeployment()
+ public Deployment createDeployment(ClassLoader initialLoader)
{
try
{
- return getDeploymentModelFactory().createDeployment();
+ return getDeploymentModelFactory().createDeployment(initialLoader);
}
catch (Exception ex)
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -54,27 +54,32 @@
public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi)
{
- ObjectName deployedObject = (ObjectName)dep.getContext().getProperty("DeployedObject");
- Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject);
+ UnifiedApplicationMetaData appMetaData = null;
+
+ ObjectName oname = (ObjectName)dep.getContext().getProperty("DeployedObject");
+
+ // jboss.j2ee:service=EJB3,module=some-ejb3.jar
+ if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service")))
+ {
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(oname);
- ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
- for (Object container : ejb3Module.getContainers().values())
- {
- if (container instanceof StatelessContainer)
+ ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ for (Object container : ejb3Module.getContainers().values())
{
- StatelessContainer slc = (StatelessContainer)container;
- UnifiedBeanMetaData usmd = new UnifiedSessionMetaData();
- usmd.setEjbName(slc.getEjbName());
- usmd.setEjbClass(slc.getBeanClassName());
- beans.add(usmd);
+ if (container instanceof StatelessContainer)
+ {
+ StatelessContainer slc = (StatelessContainer)container;
+ UnifiedBeanMetaData usmd = new UnifiedSessionMetaData();
+ usmd.setEjbName(slc.getEjbName());
+ usmd.setEjbClass(slc.getBeanClassName());
+ beans.add(usmd);
+ }
}
+
+ appMetaData = new UnifiedApplicationMetaData();
+ appMetaData.setEnterpriseBeans(beans);
}
-
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- umd.setEnterpriseBeans(beans);
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
+ return appMetaData;
}
static Ejb3ModuleMBean getEJB3Module(ObjectName objectName)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -36,6 +36,8 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
/**
* Build container independent deployment info.
@@ -47,7 +49,7 @@
{
// logging support
private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class);
-
+
private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3;
private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21;
private WebMetaDataAdapter webMetaDataAdapter;
@@ -80,7 +82,7 @@
udi.setVfRoot(new ResourceLoaderAdapter(di.localCl));
udi.setSimpleName(di.shortName);
udi.setUrl(getDeploymentURL(di));
-
+
if (di.deployedObject != null)
dep.getContext().setProperty("DeployedObject", di.deployedObject);
@@ -115,16 +117,21 @@
{
if (di.metaData instanceof WebMetaData)
{
- webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
- dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl());
+ UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
+ if (webMetaData != null)
+ dep.getContext().addAttachment(UnifiedWebMetaData.class, webMetaData);
}
else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3)
{
- applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
+ UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
+ if (appMetaData != null)
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData);
}
else if (di.metaData instanceof ApplicationMetaData)
{
- applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
+ UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
+ if (appMetaData != null)
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData);
}
}
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -51,21 +51,20 @@
}
@Override
- public Deployment createDeployment(DeploymentInfo unit)
+ public Deployment createDeployment(DeploymentInfo di)
{
- Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
- dep.setInitialClassLoader(unit.annotationsCl);
- dep.setRuntimeClassLoader(unit.ucl);
+ Deployment dep = createDeployment(di.annotationsCl);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
+ dep.setRuntimeClassLoader(di.ucl);
dep.setType(getDeploymentType());
Service service = dep.getService();
- ApplicationMetaData appmd = (ApplicationMetaData)unit.metaData;
+ ApplicationMetaData appmd = (ApplicationMetaData)di.metaData;
if (appmd == null)
throw new IllegalStateException("Deployment unit does not contain application meta data");
- WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, null);
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(di, null);
if (wsMetaData == null)
throw new IllegalStateException("Deployment unit does not contain webservices meta data");
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -57,21 +57,20 @@
* Create an endpoint for every servlet-link in webservices.xml
*/
@Override
- public Deployment createDeployment(DeploymentInfo unit)
+ public Deployment createDeployment(DeploymentInfo di)
{
- Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
- dep.setInitialClassLoader(unit.annotationsCl);
+ Deployment dep = createDeployment(di.annotationsCl);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Service service = dep.getService();
- WebMetaData webMetaData = (WebMetaData)unit.metaData;
+ WebMetaData webMetaData = (WebMetaData)di.metaData;
if (webMetaData == null)
throw new IllegalStateException("Deployment unit does not contain web meta data");
- WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml");
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(di, "WEB-INF/webservices.xml");
if (wsMetaData == null)
throw new IllegalStateException("Deployment unit does not contain webservices meta data");
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -52,17 +52,16 @@
}
@Override
- public Deployment createDeployment(DeploymentInfo unit)
+ public Deployment createDeployment(DeploymentInfo di)
{
- Deployment dep = createDeployment();
- dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
- dep.setInitialClassLoader(unit.annotationsCl);
- dep.setRuntimeClassLoader(unit.ucl);
+ Deployment dep = createDeployment(di.annotationsCl);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
+ dep.setRuntimeClassLoader(di.ucl);
dep.setType(getDeploymentType());
Service service = dep.getService();
- Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdapterEJB3.getEJB3Module(unit.deployedObject);
+ Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdapterEJB3.getEJB3Module(di.deployedObject);
for (Object manager : ejb3Module.getContainers().values())
{
if (manager instanceof EJBContainer)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -58,9 +58,8 @@
@Override
public Deployment createDeployment(DeploymentInfo unit)
{
- Deployment dep = createDeployment();
+ Deployment dep = createDeployment(unit.annotationsCl);
dep.setRootFile(new URLLoaderAdapter(unit.localUrl));
- dep.setInitialClassLoader(unit.annotationsCl);
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -36,6 +36,7 @@
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
+import org.jboss.wsf.framework.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
@@ -73,18 +74,19 @@
if (contextRoot == null)
contextRoot = wmd.getContextRoot();
- UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(contextRoot);
- umd.setServletMappings(wmd.getServletMappings());
- umd.setServletClassNames(getServletClassMap(wmd));
- umd.setConfigName(wmd.getConfigName());
- umd.setConfigFile(wmd.getConfigFile());
- umd.setSecurityDomain(wmd.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
- umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
+ UnifiedWebMetaData webMetaData = new UnifiedWebMetaData();
+ webMetaData.setContextRoot(contextRoot);
+ webMetaData.setServletMappings(wmd.getServletMappings());
+ webMetaData.setServletClassNames(getServletClassMap(wmd));
+ webMetaData.setConfigName(wmd.getConfigName());
+ webMetaData.setConfigFile(wmd.getConfigFile());
+ webMetaData.setSecurityDomain(wmd.getSecurityDomain());
+ webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+ webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
+
+ dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl());
- dep.getContext().addAttachment(UnifiedWebMetaData.class, umd);
- return umd;
+ return webMetaData;
}
private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -68,11 +68,11 @@
return deploymentModelFactory;
}
- public Deployment createDeployment()
+ public Deployment createDeployment(ClassLoader initialLoader)
{
try
{
- return getDeploymentModelFactory().createDeployment();
+ return getDeploymentModelFactory().createDeployment(initialLoader);
}
catch (Exception ex)
{
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -53,9 +53,8 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment();
+ Deployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
- dep.setInitialClassLoader(unit.getClassLoader());
dep.setRuntimeClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -56,9 +56,8 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment();
+ Deployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
- dep.setInitialClassLoader(unit.getClassLoader());
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -55,9 +55,8 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment();
+ Deployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
- dep.setInitialClassLoader(unit.getClassLoader());
dep.setRuntimeClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -55,9 +55,8 @@
@Override
public Deployment createDeployment(DeploymentUnit unit)
{
- Deployment dep = createDeployment();
+ Deployment dep = createDeployment(unit.getClassLoader());
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
- dep.setInitialClassLoader(unit.getClassLoader());
dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -54,11 +54,12 @@
// The runtime class loader
private ClassLoader runtimeLoader;
- BasicDeployment()
+ BasicDeployment(ClassLoader classLoader)
{
context = new BasicDeploymentContext();
- service = new BasicService(this);
state = DeploymentState.UNDEFINED;
+ initialLoader = classLoader;
+ setService(new BasicService());
}
public DeploymentContext getContext()
@@ -108,6 +109,7 @@
public void setService(Service service)
{
+ service.setDeployment(this);
this.service = service;
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -45,10 +45,8 @@
private List<Endpoint> endpoints = new LinkedList<Endpoint>();
private String contextRoot;
- BasicService(Deployment dep)
+ BasicService()
{
- this.dep = dep;
- this.dep.setService(this);
}
public Deployment getDeployment()
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentModelFactoryImpl.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -32,14 +32,14 @@
*/
public class DeploymentModelFactoryImpl extends DeploymentModelFactory
{
- public Deployment createDeployment()
+ public Deployment createDeployment(ClassLoader initialLoader)
{
- return new BasicDeployment();
+ return new BasicDeployment(initialLoader);
}
public Service createService()
{
- return new BasicService( createDeployment() );
+ return new BasicService();
}
public Endpoint createEndpoint()
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -29,7 +29,7 @@
*/
public abstract class DeploymentModelFactory implements SPIView
{
- public abstract Deployment createDeployment();
+ public abstract Deployment createDeployment(ClassLoader initialLoader);
public abstract Service createService();
public abstract Endpoint createEndpoint();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-25 19:19:15 UTC (rev 3994)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-26 08:52:45 UTC (rev 3995)
@@ -114,7 +114,7 @@
UnifiedDeploymentInfo udi = createUDI(endpointClass, loader);
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment();
+ Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment(loader);
builder.buildWebServiceMetaData(dep, umd, udi, endpointClass, null);
try
16 years, 10 months
- 1
- 0
JBossWS SVN: r3994 - trunk/integration/jboss40.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-25 15:19:15 -0400 (Wed, 25 Jul 2007)
New Revision: 3994
Modified:
trunk/integration/jboss40/build.xml
Log:
Fix int-40 build, exclude jboss42.InvocationHandlerFactory from compilation
Modified: trunk/integration/jboss40/build.xml
===================================================================
--- trunk/integration/jboss40/build.xml 2007-07-25 13:11:20 UTC (rev 3993)
+++ trunk/integration/jboss40/build.xml 2007-07-25 19:19:15 UTC (rev 3994)
@@ -74,7 +74,7 @@
<exclude name="org/jboss/wsf/container/jboss42/jms/**"/>
<exclude name="org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java"/>
<exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"/>
- <exclude name="org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"/>
+ <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"/>
<classpath refid="jbws40.integration.classpath"/>
</javac>
</target>
16 years, 10 months
- 1
- 0