geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Davanum Srinivas" <dava...@gmail.com>
Subject Re: svn commit: r501215 - in /geronimo/server/trunk/modules: ./ geronimo-axis2/ geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/ geronimo-cxf-builder/src/main/java/org/apache/geronimo/jaxws/builder/ geronimo-cxf/ geronimo-cxf/src/m
Date Tue, 30 Jan 2007 01:48:16 GMT
Done. Sorry.

-- dims

On 1/29/07, Jarek Gawor <jgawor@gmail.com> wrote:
> Dims,
>
> The following dependency needs to be added to configs/cxf/pom.xml:
>
>          <dependency>
>             <groupId>org.apache.geronimo.modules</groupId>
>             <artifactId>geronimo-jaxws</artifactId>
>             <version>${version}</version>
>         </dependency>
>
> Jarek
>
> On 1/29/07, dims@apache.org <dims@apache.org> wrote:
> > Author: dims
> > Date: Mon Jan 29 14:51:09 2007
> > New Revision: 501215
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=501215
> > Log:
> > move the common jaxws code into a separate maven module, next step would be to fix
axis2 modules to reuse the common code
> >
> > Added:
> >     geronimo/server/trunk/modules/geronimo-jaxws/
> >     geronimo/server/trunk/modules/geronimo-jaxws/LICENSE.txt
> >     geronimo/server/trunk/modules/geronimo-jaxws/NOTICE.txt
> >     geronimo/server/trunk/modules/geronimo-jaxws/pom.xml
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/
> >       - copied from r501199, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/jaxws/
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/builder/
> >       - copied from r501199, geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/jaxws/builder/
> > Removed:
> >     geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/jaxws/builder/
> >     geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/jaxws/
> > Modified:
> >     geronimo/server/trunk/modules/geronimo-axis2/pom.xml
> >     geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
> >     geronimo/server/trunk/modules/geronimo-cxf/pom.xml
> >     geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
> >     geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java
> >     geronimo/server/trunk/modules/pom.xml
> >
> > Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/pom.xml?view=diff&rev=501215&r1=501214&r2=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original)
> > +++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Mon Jan 29 14:51:09 2007
> > @@ -53,7 +53,7 @@
> >      <dependencies>
> >          <dependency>
> >              <groupId>org.apache.geronimo.modules</groupId>
> > -            <artifactId>geronimo-webservices</artifactId>
> > +            <artifactId>geronimo-jaxws</artifactId>
> >              <version>${version}</version>
> >          </dependency>
> >
> >
> > Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?view=diff&rev=501215&r1=501214&r2=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
(original)
> > +++ geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
Mon Jan 29 14:51:09 2007
> > @@ -22,6 +22,7 @@
> >  import org.apache.cxf.jaxws.javaee.ServiceImplBeanType;
> >  import org.apache.cxf.jaxws.javaee.WebserviceDescriptionType;
> >  import org.apache.cxf.jaxws.javaee.WebservicesType;
> > +import org.apache.cxf.jaxws.javaee.HandlerChainsType;
> >  import org.apache.geronimo.common.DeploymentException;
> >  import org.apache.geronimo.jaxws.PortInfo;
> >  import org.apache.geronimo.gbean.GBeanInfo;
> > @@ -119,7 +120,7 @@
> >                          portInfo.setEnableMTOM(port.getEnableMtom().isValue());
> >                      }
> >
> > -                    portInfo.setHandlers(port.getHandlerChains());
> > +                    portInfo.setHandlers(HandlerChainsType.class, port.getHandlerChains());
> >
> >                      if (port.getWsdlPort() != null) {
> >                          portInfo.setWsdlPort(port.getWsdlPort().getValue());
> >
> > Modified: geronimo/server/trunk/modules/geronimo-cxf/pom.xml
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/pom.xml?view=diff&rev=501215&r1=501214&r2=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-cxf/pom.xml (original)
> > +++ geronimo/server/trunk/modules/geronimo-cxf/pom.xml Mon Jan 29 14:51:09 2007
> > @@ -53,6 +53,12 @@
> >          </dependency>
> >
> >          <dependency>
> > +            <groupId>org.apache.geronimo.modules</groupId>
> > +            <artifactId>geronimo-jaxws</artifactId>
> > +            <version>${version}</version>
> > +        </dependency>
> > +
> > +        <dependency>
> >              <groupId>org.apache.cxf</groupId>
> >              <artifactId>cxf-rt-frontend-jaxws</artifactId>
> >          </dependency>
> >
> > Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?view=diff&rev=501215&r1=501214&r2=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
(original)
> > +++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
Mon Jan 29 14:51:09 2007
> > @@ -303,7 +303,7 @@
> >          List<Handler> chain = null;
> >
> >          // handlers in DD overwrite the handlers in annotation
> > -        HandlerChainsType handlerChains = this.portInfo.getHandlers();
> > +        HandlerChainsType handlerChains = (HandlerChainsType)this.portInfo.getHandlers(HandlerChainsType.class);
> >          if (handlerChains != null && handlerChains.getHandlerChain() !=
null
> >                  && handlerChains.getHandlerChain().size() > 0) {
> >              chain = new ArrayList<Handler>();
> >
> > Added: geronimo/server/trunk/modules/geronimo-jaxws/LICENSE.txt
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/LICENSE.txt?view=auto&rev=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-jaxws/LICENSE.txt (added)
> > +++ geronimo/server/trunk/modules/geronimo-jaxws/LICENSE.txt Mon Jan 29 14:51:09
2007
> > @@ -0,0 +1,203 @@
> > +
> > +                                 Apache License
> > +                           Version 2.0, January 2004
> > +                        http://www.apache.org/licenses/
> > +
> > +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> > +
> > +   1. Definitions.
> > +
> > +      "License" shall mean the terms and conditions for use, reproduction,
> > +      and distribution as defined by Sections 1 through 9 of this document.
> > +
> > +      "Licensor" shall mean the copyright owner or entity authorized by
> > +      the copyright owner that is granting the License.
> > +
> > +      "Legal Entity" shall mean the union of the acting entity and all
> > +      other entities that control, are controlled by, or are under common
> > +      control with that entity. For the purposes of this definition,
> > +      "control" means (i) the power, direct or indirect, to cause the
> > +      direction or management of such entity, whether by contract or
> > +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
> > +      outstanding shares, or (iii) beneficial ownership of such entity.
> > +
> > +      "You" (or "Your") shall mean an individual or Legal Entity
> > +      exercising permissions granted by this License.
> > +
> > +      "Source" form shall mean the preferred form for making modifications,
> > +      including but not limited to software source code, documentation
> > +      source, and configuration files.
> > +
> > +      "Object" form shall mean any form resulting from mechanical
> > +      transformation or translation of a Source form, including but
> > +      not limited to compiled object code, generated documentation,
> > +      and conversions to other media types.
> > +
> > +      "Work" shall mean the work of authorship, whether in Source or
> > +      Object form, made available under the License, as indicated by a
> > +      copyright notice that is included in or attached to the work
> > +      (an example is provided in the Appendix below).
> > +
> > +      "Derivative Works" shall mean any work, whether in Source or Object
> > +      form, that is based on (or derived from) the Work and for which the
> > +      editorial revisions, annotations, elaborations, or other modifications
> > +      represent, as a whole, an original work of authorship. For the purposes
> > +      of this License, Derivative Works shall not include works that remain
> > +      separable from, or merely link (or bind by name) to the interfaces of,
> > +      the Work and Derivative Works thereof.
> > +
> > +      "Contribution" shall mean any work of authorship, including
> > +      the original version of the Work and any modifications or additions
> > +      to that Work or Derivative Works thereof, that is intentionally
> > +      submitted to Licensor for inclusion in the Work by the copyright owner
> > +      or by an individual or Legal Entity authorized to submit on behalf of
> > +      the copyright owner. For the purposes of this definition, "submitted"
> > +      means any form of electronic, verbal, or written communication sent
> > +      to the Licensor or its representatives, including but not limited to
> > +      communication on electronic mailing lists, source code control systems,
> > +      and issue tracking systems that are managed by, or on behalf of, the
> > +      Licensor for the purpose of discussing and improving the Work, but
> > +      excluding communication that is conspicuously marked or otherwise
> > +      designated in writing by the copyright owner as "Not a Contribution."
> > +
> > +      "Contributor" shall mean Licensor and any individual or Legal Entity
> > +      on behalf of whom a Contribution has been received by Licensor and
> > +      subsequently incorporated within the Work.
> > +
> > +   2. Grant of Copyright License. Subject to the terms and conditions of
> > +      this License, each Contributor hereby grants to You a perpetual,
> > +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> > +      copyright license to reproduce, prepare Derivative Works of,
> > +      publicly display, publicly perform, sublicense, and distribute the
> > +      Work and such Derivative Works in Source or Object form.
> > +
> > +   3. Grant of Patent License. Subject to the terms and conditions of
> > +      this License, each Contributor hereby grants to You a perpetual,
> > +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> > +      (except as stated in this section) patent license to make, have made,
> > +      use, offer to sell, sell, import, and otherwise transfer the Work,
> > +      where such license applies only to those patent claims licensable
> > +      by such Contributor that are necessarily infringed by their
> > +      Contribution(s) alone or by combination of their Contribution(s)
> > +      with the Work to which such Contribution(s) was submitted. If You
> > +      institute patent litigation against any entity (including a
> > +      cross-claim or counterclaim in a lawsuit) alleging that the Work
> > +      or a Contribution incorporated within the Work constitutes direct
> > +      or contributory patent infringement, then any patent licenses
> > +      granted to You under this License for that Work shall terminate
> > +      as of the date such litigation is filed.
> > +
> > +   4. Redistribution. You may reproduce and distribute copies of the
> > +      Work or Derivative Works thereof in any medium, with or without
> > +      modifications, and in Source or Object form, provided that You
> > +      meet the following conditions:
> > +
> > +      (a) You must give any other recipients of the Work or
> > +          Derivative Works a copy of this License; and
> > +
> > +      (b) You must cause any modified files to carry prominent notices
> > +          stating that You changed the files; and
> > +
> > +      (c) You must retain, in the Source form of any Derivative Works
> > +          that You distribute, all copyright, patent, trademark, and
> > +          attribution notices from the Source form of the Work,
> > +          excluding those notices that do not pertain to any part of
> > +          the Derivative Works; and
> > +
> > +      (d) If the Work includes a "NOTICE" text file as part of its
> > +          distribution, then any Derivative Works that You distribute must
> > +          include a readable copy of the attribution notices contained
> > +          within such NOTICE file, excluding those notices that do not
> > +          pertain to any part of the Derivative Works, in at least one
> > +          of the following places: within a NOTICE text file distributed
> > +          as part of the Derivative Works; within the Source form or
> > +          documentation, if provided along with the Derivative Works; or,
> > +          within a display generated by the Derivative Works, if and
> > +          wherever such third-party notices normally appear. The contents
> > +          of the NOTICE file are for informational purposes only and
> > +          do not modify the License. You may add Your own attribution
> > +          notices within Derivative Works that You distribute, alongside
> > +          or as an addendum to the NOTICE text from the Work, provided
> > +          that such additional attribution notices cannot be construed
> > +          as modifying the License.
> > +
> > +      You may add Your own copyright statement to Your modifications and
> > +      may provide additional or different license terms and conditions
> > +      for use, reproduction, or distribution of Your modifications, or
> > +      for any such Derivative Works as a whole, provided Your use,
> > +      reproduction, and distribution of the Work otherwise complies with
> > +      the conditions stated in this License.
> > +
> > +   5. Submission of Contributions. Unless You explicitly state otherwise,
> > +      any Contribution intentionally submitted for inclusion in the Work
> > +      by You to the Licensor shall be under the terms and conditions of
> > +      this License, without any additional terms or conditions.
> > +      Notwithstanding the above, nothing herein shall supersede or modify
> > +      the terms of any separate license agreement you may have executed
> > +      with Licensor regarding such Contributions.
> > +
> > +   6. Trademarks. This License does not grant permission to use the trade
> > +      names, trademarks, service marks, or product names of the Licensor,
> > +      except as required for reasonable and customary use in describing the
> > +      origin of the Work and reproducing the content of the NOTICE file.
> > +
> > +   7. Disclaimer of Warranty. Unless required by applicable law or
> > +      agreed to in writing, Licensor provides the Work (and each
> > +      Contributor provides its Contributions) on an "AS IS" BASIS,
> > +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > +      implied, including, without limitation, any warranties or conditions
> > +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
> > +      PARTICULAR PURPOSE. You are solely responsible for determining the
> > +      appropriateness of using or redistributing the Work and assume any
> > +      risks associated with Your exercise of permissions under this License.
> > +
> > +   8. Limitation of Liability. In no event and under no legal theory,
> > +      whether in tort (including negligence), contract, or otherwise,
> > +      unless required by applicable law (such as deliberate and grossly
> > +      negligent acts) or agreed to in writing, shall any Contributor be
> > +      liable to You for damages, including any direct, indirect, special,
> > +      incidental, or consequential damages of any character arising as a
> > +      result of this License or out of the use or inability to use the
> > +      Work (including but not limited to damages for loss of goodwill,
> > +      work stoppage, computer failure or malfunction, or any and all
> > +      other commercial damages or losses), even if such Contributor
> > +      has been advised of the possibility of such damages.
> > +
> > +   9. Accepting Warranty or Additional Liability. While redistributing
> > +      the Work or Derivative Works thereof, You may choose to offer,
> > +      and charge a fee for, acceptance of support, warranty, indemnity,
> > +      or other liability obligations and/or rights consistent with this
> > +      License. However, in accepting such obligations, You may act only
> > +      on Your own behalf and on Your sole responsibility, not on behalf
> > +      of any other Contributor, and only if You agree to indemnify,
> > +      defend, and hold each Contributor harmless for any liability
> > +      incurred by, or claims asserted against, such Contributor by reason
> > +      of your accepting any such warranty or additional liability.
> > +
> > +   END OF TERMS AND CONDITIONS
> > +
> > +   APPENDIX: How to apply the Apache License to your work.
> > +
> > +      To apply the Apache License to your work, attach the following
> > +      boilerplate notice, with the fields enclosed by brackets "[]"
> > +      replaced with your own identifying information. (Don't include
> > +      the brackets!)  The text should be enclosed in the appropriate
> > +      comment syntax for the file format. We also recommend that a
> > +      file or class name and description of purpose be included on the
> > +      same "printed page" as the copyright notice for easier
> > +      identification within third-party archives.
> > +
> > +   Copyright [yyyy] [name of copyright owner]
> > +
> > +   Licensed under the Apache License, Version 2.0 (the "License");
> > +   you may not use this file except in compliance with the License.
> > +   You may obtain a copy of the License at
> > +
> > +       http://www.apache.org/licenses/LICENSE-2.0
> > +
> > +   Unless required by applicable law or agreed to in writing, software
> > +   distributed under the License is distributed on an "AS IS" BASIS,
> > +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > +   See the License for the specific language governing permissions and
> > +   limitations under the License.
> > +
> >
> > Added: geronimo/server/trunk/modules/geronimo-jaxws/NOTICE.txt
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/NOTICE.txt?view=auto&rev=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-jaxws/NOTICE.txt (added)
> > +++ geronimo/server/trunk/modules/geronimo-jaxws/NOTICE.txt Mon Jan 29 14:51:09
2007
> > @@ -0,0 +1,6 @@
> > +Apache Geronimo
> > +Copyright 2003-2006 The Apache Software Foundation
> > +
> > +This product includes software developed by
> > +The Apache Software Foundation (http://www.apache.org/).
> > +
> >
> > Added: geronimo/server/trunk/modules/geronimo-jaxws/pom.xml
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/pom.xml?view=auto&rev=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-jaxws/pom.xml (added)
> > +++ geronimo/server/trunk/modules/geronimo-jaxws/pom.xml Mon Jan 29 14:51:09 2007
> > @@ -0,0 +1,89 @@
> > +<?xml version="1.0" encoding="ISO-8859-1"?>
> > +<!--
> > +    Licensed to the Apache Software Foundation (ASF) under one or more
> > +    contributor license agreements.  See the NOTICE file distributed with
> > +    this work for additional information regarding copyright ownership.
> > +    The ASF licenses this file to You under the Apache License, Version 2.0
> > +    (the "License"); you may not use this file except in compliance with
> > +    the License.  You may obtain a copy of the License at
> > +
> > +       http://www.apache.org/licenses/LICENSE-2.0
> > +
> > +    Unless required by applicable law or agreed to in writing, software
> > +    distributed under the License is distributed on an "AS IS" BASIS,
> > +    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > +    See the License for the specific language governing permissions and
> > +    limitations under the License.
> > +-->
> > +
> > +<!-- $Rev: 500959 $ $Date: 2007-01-29 03:07:35 -0500 (Mon, 29 Jan 2007) $ -->
> > +
> > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
> > +
> > +    <modelVersion>4.0.0</modelVersion>
> > +
> > +    <parent>
> > +        <groupId>org.apache.geronimo.modules</groupId>
> > +        <artifactId>modules</artifactId>
> > +        <version>2.0-SNAPSHOT</version>
> > +        <relativePath>../pom.xml</relativePath>
> > +    </parent>
> > +
> > +    <artifactId>geronimo-jaxws</artifactId>
> > +    <name>Geronimo :: JAXWS</name>
> > +
> > +    <dependencies>
> > +
> > +        <dependency>
> > +            <groupId>org.apache.geronimo.modules</groupId>
> > +            <artifactId>geronimo-naming</artifactId>
> > +            <version>${version}</version>
> > +        </dependency>
> > +
> > +        <dependency>
> > +            <groupId>org.apache.geronimo.modules</groupId>
> > +            <artifactId>geronimo-j2ee-builder</artifactId>
> > +            <version>${version}</version>
> > +        </dependency>
> > +
> > +        <dependency>
> > +            <groupId>org.apache.geronimo.modules</groupId>
> > +            <artifactId>geronimo-service-builder</artifactId>
> > +            <version>${version}</version>
> > +        </dependency>
> > +
> > +        <dependency>
> > +            <groupId>org.apache.geronimo.modules</groupId>
> > +            <artifactId>geronimo-j2ee</artifactId>
> > +            <version>${version}</version>
> > +        </dependency>
> > +
> > +       <dependency>
> > +            <groupId>org.apache.xbean</groupId>
> > +            <artifactId>xbean-finder</artifactId>
> > +       </dependency>
> > +
> > +       <dependency>
> > +            <groupId>org.apache.geronimo.specs</groupId>
> > +            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
> > +       </dependency>
> > +
> > +        <dependency>
> > +            <groupId>org.apache.geronimo.modules</groupId>
> > +            <artifactId>geronimo-webservices</artifactId>
> > +            <version>${version}</version>
> > +        </dependency>
> > +
> > +        <dependency>
> > +            <groupId>org.apache.axis2</groupId>
> > +            <artifactId>axis2-jaxws-api</artifactId>
> > +        </dependency>
> > +
> > +        <dependency>
> > +            <groupId>javax.xml.bind</groupId>
> > +            <artifactId>jaxb-api</artifactId>
> > +        </dependency>
> > +
> > +    </dependencies>
> > +
> > +</project>
> >
> > Modified: geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java?view=diff&rev=501215&r1=501199&r2=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java
(original)
> > +++ geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java
Mon Jan 29 14:51:09 2007
> > @@ -28,7 +28,6 @@
> >  import javax.xml.parsers.DocumentBuilder;
> >  import javax.xml.parsers.DocumentBuilderFactory;
> >
> > -import org.apache.cxf.jaxws.javaee.HandlerChainsType;
> >  import org.w3c.dom.Document;
> >  import org.xml.sax.InputSource;
> >
> > @@ -117,12 +116,12 @@
> >       * so serialize the handler chain to XML and pass it as a String.
> >       */
> >
> > -    public void setHandlers(HandlerChainsType handlerChain) throws Exception {
> > +    public void setHandlers(Class type, Object handlerChain) throws Exception {
> >          if (handlerChain == null) {
> >              return;
> >          }
> >
> > -        JAXBContext ctx = JAXBContext.newInstance(HandlerChainsType.class);
> > +        JAXBContext ctx = JAXBContext.newInstance(type);
> >          Marshaller m = ctx.createMarshaller();
> >          StringWriter writer = new StringWriter();
> >          /*
> > @@ -130,13 +129,13 @@
> >           */
> >          QName rootElement = new QName("", "root");
> >          JAXBElement element = new JAXBElement(rootElement,
> > -                HandlerChainsType.class, handlerChain);
> > +                type, handlerChain);
> >          m.marshal(element, writer);
> >
> >          this.handlersAsXML = writer.toString();
> >      }
> >
> > -    public HandlerChainsType getHandlers() throws Exception {
> > +    public Object getHandlers(Class type) throws Exception {
> >          if (this.handlersAsXML == null) {
> >              return null;
> >          }
> > @@ -148,11 +147,11 @@
> >          DocumentBuilder db = dbf.newDocumentBuilder();
> >          Document doc = db.parse(is);
> >
> > -        JAXBContext ctx = JAXBContext.newInstance(HandlerChainsType.class);
> > +        JAXBContext ctx = JAXBContext.newInstance(type);
> >          Unmarshaller unmarshaller = ctx.createUnmarshaller();
> >
> > -        JAXBElement<HandlerChainsType> handlerElement = unmarshaller.unmarshal(
> > -                doc.getDocumentElement(), HandlerChainsType.class);
> > +        JAXBElement handlerElement = unmarshaller.unmarshal(
> > +                doc.getDocumentElement(), type);
> >
> >          return handlerElement.getValue();
> >      }
> >
> > Modified: geronimo/server/trunk/modules/pom.xml
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=501215&r1=501214&r2=501215
> > ==============================================================================
> > --- geronimo/server/trunk/modules/pom.xml (original)
> > +++ geronimo/server/trunk/modules/pom.xml Mon Jan 29 14:51:09 2007
> > @@ -96,6 +96,7 @@
> >          <module>geronimo-webservices-builder</module>
> >
> >          <!-- javaee 5 modules -->
> > +        <module>geronimo-jaxws</module>
> >          <module>geronimo-transformer</module>
> >          <module>geronimo-persistence-jpa10</module>
> >          <module>geronimo-persistence-jpa10-builder</module>
> >
> >
> >
>


-- 
Davanum Srinivas :: http://wso2.org/ :: Oxygen for Web Services Developers

Mime
View raw message