cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r529773 - in /incubator/cxf/trunk: ./ api/src/main/java/org/apache/cxf/message/ buildtools/ buildtools/src/main/java/ buildtools/src/main/java/org/ buildtools/src/main/java/org/apache/ buildtools/src/main/java/org/apache/cxf/ buildtools/src...
Date Tue, 17 Apr 2007 21:29:41 GMT
Author: dandiep
Date: Tue Apr 17 14:29:39 2007
New Revision: 529773

URL: http://svn.apache.org/viewvc?view=rev&rev=529773
Log:
o Revert to the tools-plugin.xml format
o Slightly rework the ServerImpl constructors for supplying a MessageObserver
o Add a cxf-bundle module which produces a bundle jar using the Shade plugin.
o Add a PluginTransformer to the buildtools module which combines the various
  tools-plugin.xml files on the filesystem
o Restructure the distribution to include the bundle jar. The cxf.jar is 
  in the root directory, the dependencies are in lib/ and the various
  modules & manifest jar are located in modules/. 
o Include some missing modules in the distribution (object/coloc/agegis/security)


Added:
    incubator/cxf/trunk/buildtools/src/main/java/
    incubator/cxf/trunk/buildtools/src/main/java/org/
    incubator/cxf/trunk/buildtools/src/main/java/org/apache/
    incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/
    incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/
    incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java   (with props)
    incubator/cxf/trunk/bundle/
    incubator/cxf/trunk/bundle/pom.xml   (with props)
    incubator/cxf/trunk/distribution/src/main/release/modules/
    incubator/cxf/trunk/distribution/src/main/release/modules/README   (with props)
Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java
    incubator/cxf/trunk/buildtools/pom.xml
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
    incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
    incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd
    incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
    incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml
    incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java Tue Apr 17 14:29:39 2007
@@ -75,5 +75,18 @@
     public static boolean isPartialResponse(Message message) {
         return Boolean.TRUE.equals(message.get(Message.PARTIAL_RESPONSE_MESSAGE));
     }
+    
+    /**
+     * Returns true if a value is either the String "true" or Boolean.TRUE.
+     * @param value
+     * @return
+     */
+    public static boolean isTrue(Object value) {
+        if (Boolean.TRUE.equals(value) || "true".equals(value)) {
+            return true;
+        }
+        
+        return false;
+    }
 
 }

Modified: incubator/cxf/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/pom.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/buildtools/pom.xml (original)
+++ incubator/cxf/trunk/buildtools/pom.xml Tue Apr 17 14:29:39 2007
@@ -35,7 +35,53 @@
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
-
+  
+    <dependencies>
+    		
+		<dependency>
+	      <groupId>asm</groupId>
+	      <artifactId>asm-all</artifactId>
+	      <version>20070324</version>
+	        <optional>true</optional>
+		</dependency>
+	    <dependency>
+	      <groupId>jdom</groupId>
+	      <artifactId>jdom</artifactId>
+	      <version>1.0</version>
+	      <optional>true</optional>
+		</dependency>
+	    <dependency>
+	      <groupId>org.codehaus.plexus</groupId>
+	      <artifactId>plexus-utils</artifactId>
+	      <version>1.4.1</version>
+	      <optional>true</optional>
+		</dependency> 
+	    <dependency>
+	      <groupId>org.apache.maven</groupId>
+	      <artifactId>maven-plugin-api</artifactId>
+	      <version>2.0.5</version>
+	      <optional>true</optional>
+		</dependency>
+	    <dependency>
+	      <groupId>org.apache.maven</groupId>
+	      <artifactId>maven-model</artifactId>
+	      <version>2.0.5</version>
+	      <optional>true</optional>
+		</dependency>
+	    <dependency>
+	      <groupId>org.apache.maven</groupId>
+	      <artifactId>maven-project</artifactId>
+	      <version>2.0.5</version>
+	      <optional>true</optional>
+		</dependency>
+		<dependency>
+	      <groupId>org.codehaus.mojo</groupId>
+	      <artifactId>shade-maven-plugin</artifactId>
+	      <version>1.0-alpha-6</version>
+	      <optional>true</optional>
+		</dependency>
+	</dependencies>
+	
     <build>
         <plugins>
             <plugin>

Added: incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java?view=auto&rev=529773
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java (added)
+++ incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java Tue Apr 17 14:29:39 2007
@@ -0,0 +1,92 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.maven;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
+import org.codehaus.mojo.shade.resource.ResourceTransformer;
+import org.jdom.Attribute;
+import org.jdom.Content;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
+
+public class PluginTransformer implements ResourceTransformer {
+    public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
+
+    String resource;
+    Document doc;
+
+    public PluginTransformer() {
+        super();
+    }
+
+    public boolean canTransformResource(String r) {
+        r = r.toLowerCase();
+
+        if (resource != null && resource.toLowerCase().equals(r)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public void processResource(InputStream is) throws IOException {
+        Document r;
+        try {
+            r = new SAXBuilder().build(is);
+        } catch (JDOMException e) {
+            throw new RuntimeException(e);
+        }
+
+        if (doc == null) {
+            doc = r;
+            
+            Element el = doc.getRootElement();
+            el.setAttribute("name", "default");
+            el.setAttribute("provider", "cxf.apache.org");
+        } else {
+            Element root = r.getRootElement();
+
+            for (Iterator itr = root.getChildren().iterator(); itr.hasNext();) {
+                Content n = (Content)itr.next();
+                itr.remove();
+
+                doc.getRootElement().addContent(n);
+            }
+        }
+    }
+
+    public boolean hasTransformedResource() {
+        return true;
+    }
+
+    public void modifyOutputStream(JarOutputStream jos) throws IOException {
+        jos.putNextEntry(new JarEntry(resource));
+
+        new XMLOutputter(Format.getPrettyFormat()).output(doc, jos);
+    }
+}

Propchange: incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/bundle/pom.xml?view=auto&rev=529773
==============================================================================
--- incubator/cxf/trunk/bundle/pom.xml (added)
+++ incubator/cxf/trunk/bundle/pom.xml Tue Apr 17 14:29:39 2007
@@ -0,0 +1,303 @@
+<!--
+	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.
+-->
+<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>
+	<groupId>org.apache.cxf</groupId>
+	<artifactId>cxf-bundle</artifactId>
+	<packaging>jar</packaging>
+	<name>Apache CXF Bundle Jar</name>
+	<version>2.0-incubator-RC-SNAPSHOT</version>
+	<url>http://cwiki.apache.org/CXF</url>
+
+	<parent>
+		<groupId>org.apache.cxf</groupId>
+		<artifactId>cxf-parent</artifactId>
+		<version>2.0-incubator-RC-SNAPSHOT</version>
+		<relativePath>../parent</relativePath>
+	</parent>
+
+	<properties>
+		<maven.test.skip>true</maven.test.skip>
+		<cxf.version>${pom.version}</cxf.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-common-utilities</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-common-schemas</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-common</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-validator</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-wsdlto-core</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-misctools</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-tools-java2wsdl</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-xjc-dv</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-api</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-core</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-management</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-transports-local</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-transports-http-jetty</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-transports-jms</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-bindings-soap</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-bindings-coloc</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-bindings-object</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-bindings-xml</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-bindings-http</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-ws-addr</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-ws-rm</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-ws-policy</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${pom.version}</version>
+            <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-frontend-js</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-frontend-simple</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>cxf-rt-databinding-aegis</artifactId>
+			<version>${pom.version}</version>
+		    <optional>true</optional>
+		</dependency>
+    </dependencies>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>shade-maven-plugin</artifactId>
+				<version>1.0-alpha-6</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+						    <shadedGroupFilter>org.apache.cxf</shadedGroupFilter>
+						    <shadedArtifactAttached>false</shadedArtifactAttached>
+							<transformers>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.ApacheNoticeResourceTransformer">
+							    <projectName>Apache CXF</projectName>
+							  </transformer>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+							    <resource>META-INF/spring.handlers</resource>
+							  </transformer>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+							    <resource>META-INF/spring.schemas</resource>
+							  </transformer>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
+							    <resource>META-INF/extensions.xml</resource>
+							  </transformer>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
+							    <resource>META-INF/bus-extensions.xml</resource>
+							  </transformer>
+							  <transformer implementation="org.apache.cxf.maven.PluginTransformer">
+							    <resource>META-INF/tools-plugin.xml</resource>
+							  </transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>${pom.groupId}</groupId>
+						<artifactId>cxf-buildtools</artifactId>
+						<version>${pom.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+		</plugins>
+	</build>
+
+	<scm>
+		<connection>
+			scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution
+		</connection>
+		<developerConnection>
+			scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution
+		</developerConnection>
+	</scm>
+
+</project>

Propchange: incubator/cxf/trunk/bundle/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/bundle/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/bundle/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Tue Apr 17 14:29:39 2007
@@ -144,12 +144,30 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-object</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-bindings-coloc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-http</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-databinding-aegis</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -163,7 +181,11 @@
             <artifactId>cxf-rt-ws-policy</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+		<dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -182,7 +204,12 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.0-beta-1</version>
+            <version>1.0-RC1</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>cxf-bundle</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 
@@ -239,6 +266,11 @@
                                     <artifactId>cxf-integration-jca</artifactId>
                                     <version>${pom.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>${pom.groupId}</groupId>
+                                    <artifactId>cxf-bundle</artifactId>
+                                    <version>${pom.version}</version>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -282,7 +314,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <finalName>cxf-incubator</finalName>
+                    <finalName>cxf-manifest-incubator</finalName>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>

Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Tue Apr 17 14:29:39 2007
@@ -1,161 +1,269 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * 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.
+	* 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.
 -->
 <assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>tar.gz</format>
-	<format>zip</format>
-    </formats>
+	<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+	<id></id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>tar.gz</format>
+		<format>zip</format>
+	</formats>
 
-    <fileSets>
-	 <fileSet>
-             <directory>src/main/release</directory>
-	     <outputDirectory>cxf-${cxf.version}</outputDirectory>
-	     <includes>
-	         <include>DISCLAIMER</include>
-		 <include>LICENSE</include>
-		 <include>licenses/*.*</include>
-		 <include>README</include>
-             </includes>
-	 </fileSet>
-         <fileSet>
-             <directory>target/maven-shared-archive-resources/META-INF</directory>
-             <outputDirectory>cxf-${cxf.version}</outputDirectory>
-             <includes>
-                 <include>NOTICE</include>
-             </includes>
-         </fileSet>
-	 <fileSet>
-	     <directory>src/main/release/bin</directory>
-	     <outputDirectory>cxf-${cxf.version}/bin</outputDirectory>
-	     <fileMode>755</fileMode>
-	 </fileSet>
-	 <fileSet>
-	     <directory>src/main/release/etc</directory>
-	     <outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
-	     <includes>
-	         <include>logging.properties</include>
-		 <include>log4j.properties</include>
-		 <include>ejb_servants.properties</include>
-                 <include>web.xml</include>
-	     </includes>
-	 </fileSet>
-	 <fileSet>
-	     <directory>src/main/release/docs</directory>
-	     <outputDirectory>cxf-${cxf.version}/docs</outputDirectory>
-	     <includes>
-	         <include>**/*.pdf</include>
-		 <include>release_notes.txt</include>
-             </includes>
-	 </fileSet>
-	 <fileSet>
-	     <directory>src/main/release/samples</directory>
-	     <outputDirectory>cxf-${cxf.version}/samples</outputDirectory>
-	     <excludes>
-	         <exclude>**/build</exclude>
-		 <exclude>**/build/**/*</exclude>
-                 <exclude>integration/JBI/**/build.properties</exclude>
-             </excludes>
-	 </fileSet>
-	 <fileSet>
-	     <directory>target/javadoc</directory>
-	     <outputDirectory>cxf-${cxf.version}/docs/api</outputDirectory>
-	     <includes>
-	         <include>**/*</include>
-             </includes>
-	</fileSet>
-	<fileSet>
-	    <directory>target/additional-libs</directory>
-	    <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
-	    <includes>
-	        <include>**/*</include>
-	    </includes>
-	</fileSet>
-	<fileSet>
-	     <directory>target</directory>
-	     <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
-	     <includes>
-	         <include>cxf-incubator.jar</include>
-             </includes>
-	</fileSet>
-	<fileSet>
-	    <directory>target</directory>
-	    <outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
-	    <includes>
-	        <include>version.properties</include>
-            </includes>
-	</fileSet>
-	<fileSet>
-	    <directory>../integration/jca/src/main/rar/META-INF</directory>
-	    <outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
-	    <includes>
-	        <include>ra.xml</include>
-            </includes>
-	</fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc</outputDirectory>
-            <includes>
-                <include>jbi.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc</outputDirectory>
-            <includes>
-                <include>jbi.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc</outputDirectory>
-            <includes>
-                <include>jbi.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/external_provider_external_consumer/service-engine/etc</outputDirectory>
-            <includes>
-                <include>jbi.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory>cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc</outputDirectory>
-            <includes>
-                <include>jbi.xml</include>
-            </includes>
-        </fileSet>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/release</directory>
+			<outputDirectory>cxf-${cxf.version}</outputDirectory>
+			<includes>
+				<include>DISCLAIMER</include>
+				<include>LICENSE</include>
+				<include>licenses/*.*</include>
+				<include>modules/*</include>
+				<include>README</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>
+				target/maven-shared-archive-resources/META-INF
+			</directory>
+			<outputDirectory>cxf-${cxf.version}</outputDirectory>
+			<includes>
+				<include>NOTICE</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/release/bin</directory>
+			<outputDirectory>cxf-${cxf.version}/bin</outputDirectory>
+			<fileMode>755</fileMode>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/release/etc</directory>
+			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
+			<includes>
+				<include>logging.properties</include>
+				<include>log4j.properties</include>
+				<include>ejb_servants.properties</include>
+				<include>web.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/release/docs</directory>
+			<outputDirectory>cxf-${cxf.version}/docs</outputDirectory>
+			<includes>
+				<include>**/*.pdf</include>
+				<include>release_notes.txt</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/release/samples</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/samples
+			</outputDirectory>
+			<excludes>
+				<exclude>**/build</exclude>
+				<exclude>**/build/**/*</exclude>
+				<exclude>integration/JBI/**/build.properties</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>target/javadoc</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/docs/api
+			</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/additional-libs</directory>
+			<outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
+			<includes>
+				<include>**/cxf-integration*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
+			<includes>
+				<include>cxf-manifest-incubator.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
+			<includes>
+				<include>version.properties</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>
+				../integration/jca/src/main/rar/META-INF
+			</directory>
+			<outputDirectory>cxf-${cxf.version}/etc</outputDirectory>
+			<includes>
+				<include>ra.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc
+			</outputDirectory>
+			<includes>
+				<include>jbi.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc
+			</outputDirectory>
+			<includes>
+				<include>jbi.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc
+			</outputDirectory>
+			<includes>
+				<include>jbi.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/samples/integration/JBI/external_provider_external_consumer/service-engine/etc
+			</outputDirectory>
+			<includes>
+				<include>jbi.xml</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>
+				cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc
+			</outputDirectory>
+			<includes>
+				<include>jbi.xml</include>
+			</includes>
+		</fileSet>
 
-    </fileSets>
-    <dependencySets>
+	</fileSets>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
+			<unpack>false</unpack>
+			<excludes>
+		        <exclude>org.apache.cxf:cxf-api</exclude>
+		        <exclude>org.apache.cxf:cxf-common-utilities</exclude>
+		        <exclude>org.apache.cxf:cxf-common-schemas</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-common</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-validator</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-wsdlto-core</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-misctools</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws</exclude>
+		        <exclude>org.apache.cxf:cxf-tools-java2wsdl</exclude>
+		        <exclude>org.apache.cxf:cxf-xjc-dv</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-core</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-databinding-jaxb</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-databinding-aegis</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-management</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-transports-local</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-transports-http</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-transports-http-jetty</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-transports-jms</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-bindings-soap</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-bindings-object</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-bindings-coloc</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-bindings-xml</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-bindings-http</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-ws-addr</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-ws-rm</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-ws-policy</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-ws-security</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-frontend-js</exclude>
+		        <exclude>org.apache.cxf:cxf-rt-frontend-simple</exclude>
+		        <exclude>org.apache.cxf:cxf-integration-jbi</exclude>
+		        <exclude>org.apache.cxf:cxf-integration-jca</exclude>
+		        <exclude>org.apache.cxf:cxf-distribution</exclude>
+		        <exclude>org.apache.cxf:cxf-bundle</exclude>
+		    </excludes>
+			<scope>runtime</scope>
+		</dependencySet>
         <dependencySet>
-	    <outputDirectory>cxf-${cxf.version}/lib</outputDirectory>
-	    <unpack>false</unpack>
-	    <excludes>
-	        <exclude>org.apache.cxf:cxf-distribution</exclude>
-	    </excludes>
-	    <scope>runtime</scope>
-	</dependencySet>
-    </dependencySets>
+		    <outputDirectory>cxf-${cxf.version}/modules</outputDirectory>
+		    <unpack>false</unpack>
+		    <includes>
+		        <include>org.apache.cxf:cxf-api</include>
+		        <include>org.apache.cxf:cxf-common-utilities</include>
+		        <include>org.apache.cxf:cxf-common-schemas</include>
+		        <include>org.apache.cxf:cxf-tools-common</include>
+		        <include>org.apache.cxf:cxf-tools-validator</include>
+		        <include>org.apache.cxf:cxf-tools-wsdlto-core</include>
+		        <include>org.apache.cxf:cxf-tools-misctools</include>
+		        <include>org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb</include>
+		        <include>org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws</include>
+		        <include>org.apache.cxf:cxf-tools-java2wsdl</include>
+		        <include>org.apache.cxf:cxf-xjc-dv</include>
+		        <include>org.apache.cxf:cxf-rt-core</include>
+		        <include>org.apache.cxf:cxf-rt-databinding-jaxb</include>
+		        <include>org.apache.cxf:cxf-rt-databinding-aegis</include>
+		        <include>org.apache.cxf:cxf-rt-management</include>
+		        <include>org.apache.cxf:cxf-rt-transports-local</include>
+		        <include>org.apache.cxf:cxf-rt-transports-http</include>
+		        <include>org.apache.cxf:cxf-rt-transports-http-jetty</include>
+		        <include>org.apache.cxf:cxf-rt-transports-jms</include>
+		        <include>org.apache.cxf:cxf-rt-bindings-soap</include>
+		        <include>org.apache.cxf:cxf-rt-bindings-object</include>
+		        <include>org.apache.cxf:cxf-rt-bindings-coloc</include>
+		        <include>org.apache.cxf:cxf-rt-bindings-xml</include>
+		        <include>org.apache.cxf:cxf-rt-bindings-http</include>
+		        <include>org.apache.cxf:cxf-rt-ws-addr</include>
+		        <include>org.apache.cxf:cxf-rt-ws-rm</include>
+		        <include>org.apache.cxf:cxf-rt-ws-policy</include>
+		        <include>org.apache.cxf:cxf-rt-ws-security</include>
+		        <include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
+		        <include>org.apache.cxf:cxf-rt-frontend-js</include>
+		        <include>org.apache.cxf:cxf-rt-frontend-simple</include>
+		        <include>org.apache.cxf:cxf-integration-jbi</include>
+		        <include>org.apache.cxf:cxf-integration-jca</include>
+		    </includes>
+		    <excludes>
+		        <exclude>org.apache.cxf:cxf-distribution</exclude>
+		        <exclude>org.apache.cxf:cxf-bundle</exclude>
+		    </excludes>
+		    <scope>runtime</scope>
+		</dependencySet>
+		<dependencySet>
+		    <outputDirectory>cxf-${cxf.version}/</outputDirectory>
+		    <unpack>false</unpack>
+		    <includes>
+		        <include>org.apache.cxf:cxf-bundle</include>
+		    </includes>
+		    <scope>runtime</scope>
+		    <outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>
+		</dependencySet>
+		
+	</dependencySets>
+	
 </assembly>

Added: incubator/cxf/trunk/distribution/src/main/release/modules/README
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/modules/README?view=auto&rev=529773
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/modules/README (added)
+++ incubator/cxf/trunk/distribution/src/main/release/modules/README Tue Apr 17 14:29:39 2007
@@ -0,0 +1,12 @@
+This directory contains all the CXF modules. These different modules
+have been combined into one cxf.jar in the top directory for your 
+convenience. You do NOT need both these jars and the cxf.jar.
+If you wish to pick and choose and use just specific portions 
+of CXF as opposed to using the one large jar, you can use these jars
+instead.
+
+There is also a manifest jar included in this directory to make it 
+easy to depend on these modules inside your build system. If you
+add cxf-manifest-incubator.jar to your classpath, it will find all
+the CXF dependencies in the directory and also add them to the 
+classpath automatically.
\ No newline at end of file

Propchange: incubator/cxf/trunk/distribution/src/main/release/modules/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/modules/README
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/cxf/trunk/distribution/src/main/release/modules/README
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Tue Apr 17 14:29:39 2007
@@ -81,7 +81,10 @@
         <pathelement location="${basedir}"/>
         <pathelement location="${build.classes.dir}"/>
         <pathelement path="${srcbuild.classpath}"/>
-        <pathelement location="${cxf.home}/lib/cxf-incubator.jar"/>
+        <pathelement location="${cxf.home}/modules/cxf-manifest-incubator.jar"/>
+    	<fileset dir="${cxf.home}/lib">
+    		<include name="**/*.jar"/>
+    	</fileset>
     </path>
     <condition property="thirdparty.classpath" value="">
         <not> <isset property="thirdparty.classpath"/> </not>

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Tue Apr 17 14:29:39 2007
@@ -47,7 +47,7 @@
         <jaxws.version>2.0</jaxws.version>
         <jetty.version>5.1.11</jetty.version>
         <saaj.version>1.3</saaj.version>
-        <spring.version>2.0.3</spring.version>
+        <spring.version>2.0.4</spring.version>
         <wsdl4j.version>1.6.1</wsdl4j.version>
         <derby.version>10.1.1.0</derby.version>
         <activemq.version>4.1.0-incubator</activemq.version>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Tue Apr 17 14:29:39 2007
@@ -143,6 +143,7 @@
             <!-- default profile enables checkstyle and Xlint stuff -->
             <id>everything</id>
             <modules>
+                <module>bundle</module>
                 <module>distribution</module>
                 <module>tools/eclipse-plugin</module>
                 <module>tools/eclipse3.1-plugin</module>
@@ -296,7 +297,8 @@
         </profile>
         <profile>
             <id>deploy</id>
-            <modules>
+            <modules> 
+                <module>bundle</module>
                 <module>distribution</module>
                 <module>tools/eclipse-plugin</module>
                 <module>tools/eclipse3.1-plugin</module>

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Tue Apr 17 14:29:39 2007
@@ -46,31 +46,30 @@
     private ServerLifeCycleManager mgr;
     private BindingFactory bindingFactory;
     private MessageObserver messageObserver;
-    
+
     public ServerImpl(Bus bus, 
                       Endpoint endpoint, 
                       DestinationFactory destinationFactory, 
-                      BindingFactory bindingFactory) throws BusException, IOException {
-        this(bus, endpoint, destinationFactory, bindingFactory, null);
+                      MessageObserver observer) throws BusException, IOException {
+        this.endpoint = endpoint;
+        this.bus = bus;
+        this.messageObserver = observer;
+        
+        initDestination(destinationFactory);
     }
-
+    
     public ServerImpl(Bus bus, 
                       Endpoint endpoint, 
                       DestinationFactory destinationFactory, 
-                      MessageObserver messageObserver) throws BusException, IOException {
-        this(bus, endpoint, destinationFactory, null, messageObserver);
-    }
-
-    protected ServerImpl(Bus bus, 
-                         Endpoint endpoint, 
-                         DestinationFactory destinationFactory, 
-                         BindingFactory bindingFactory,
-                         MessageObserver messageObserver) throws BusException, IOException {
+                      BindingFactory bindingFactory) throws BusException, IOException {
         this.endpoint = endpoint;
         this.bus = bus;
         this.bindingFactory = bindingFactory;
-        this.messageObserver = messageObserver;
         
+        initDestination(destinationFactory);
+    }
+
+    private void initDestination(DestinationFactory destinationFactory) throws BusException, IOException {
         EndpointInfo ei = endpoint.getEndpointInfo();
         
         //Treat local transport as a special case, transports loaded by transportId can be replaced
@@ -152,6 +151,14 @@
 
     public Endpoint getEndpoint() {
         return endpoint;
+    }
+
+    public MessageObserver getMessageObserver() {
+        return messageObserver;
+    }
+
+    public void setMessageObserver(MessageObserver messageObserver) {
+        this.messageObserver = messageObserver;
     }
     
 }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java Tue Apr 17 14:29:39 2007
@@ -28,6 +28,7 @@
 import org.apache.cxf.databinding.DataWriter;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.ServiceModelUtil;
@@ -43,7 +44,8 @@
         Service service = ServiceModelUtil.getService(message.getExchange());
         DataWriter<T> writer = service.getDataBinding().createWriter(output);
         
-        if (Boolean.TRUE.equals(message.getContextualProperty(Message.MTOM_ENABLED))) {
+        if (MessageUtils.isTrue(message.getContextualProperty(
+              org.apache.cxf.message.Message.MTOM_ENABLED))) {
             Collection<Attachment> atts = message.getAttachments();
             if (atts == null) {
                 atts = new ArrayList<Attachment>();

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java Tue Apr 17 14:29:39 2007
@@ -25,6 +25,7 @@
 import org.apache.cxf.attachment.AttachmentSerializer;
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
@@ -38,7 +39,8 @@
     }
 
     public void handleMessage(Message message) {
-        if (!Boolean.TRUE.equals(message.getContextualProperty(
+        
+        if (!MessageUtils.isTrue(message.getContextualProperty(
                 org.apache.cxf.message.Message.MTOM_ENABLED))) {
             return;
         }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java Tue Apr 17 14:29:39 2007
@@ -60,6 +60,8 @@
 
         String encoding = (String)message.get(Message.ENCODING);
         
+        encoding = extractEncoding(encoding);
+        
         XMLStreamReader reader;
         try {
             reader = getXMLInputFactory(message).createXMLStreamReader(is, encoding);
@@ -68,6 +70,20 @@
         }
 
         message.setContent(XMLStreamReader.class, reader);
+    }
+
+    private String extractEncoding(String encoding) {
+        if (encoding != null) {
+            int csIdx = encoding.indexOf("charset=");
+            if (csIdx != -1) {
+                int end = encoding.indexOf(';', csIdx + 1);
+                if (end == -1) {
+                    end = encoding.length();
+                }
+                encoding = encoding.substring(csIdx, end);
+            }
+        }
+        return encoding;
     }
 
     public static XMLInputFactory getXMLInputFactory(Message m) throws Fault {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java Tue Apr 17 14:29:39 2007
@@ -52,7 +52,7 @@
         String address = "http://localhost:9036/EchoService";
         sf.setAddress(address);
         Map<String, Object> props = new HashMap<String, Object>();
-        props.put(Message.MTOM_ENABLED, Boolean.TRUE);
+        props.put(Message.MTOM_ENABLED, "true");
         sf.setProperties(props);
         sf.create();
 

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java Tue Apr 17 14:29:39 2007
@@ -27,15 +27,14 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
@@ -49,7 +48,6 @@
 import org.apache.cxf.tools.plugin.FrontEnd;
 import org.apache.cxf.tools.plugin.Generator;
 import org.apache.cxf.tools.plugin.Plugin;
-import org.apache.cxf.tools.plugin.Plugins;
 
 public final class PluginLoader {
     public static final Logger LOG = LogUtils.getL7dLogger(PluginLoader.class);
@@ -57,7 +55,7 @@
     private static PluginLoader pluginLoader;
     private static final String PLUGIN_FILE_NAME = "META-INF/tools-plugin.xml";
     
-    private Map<String, Collection<Plugin>> plugins = new LinkedHashMap<String, Collection<Plugin>>();
+    private Map<String, Plugin> plugins = new LinkedHashMap<String, Plugin>();
 
     private Map<String, FrontEnd> frontends = new LinkedHashMap<String, FrontEnd>();
     private Map<String, FrontEndProfile> frontendProfiles = new LinkedHashMap<String, FrontEndProfile>();
@@ -105,7 +103,7 @@
     public void loadPlugin(URL url) throws IOException {
         try {
             LOG.log(Level.INFO, "PLUGIN_LOADING", url);
-            loadPlugins(getPlugins(url));
+            loadPlugin(getPlugin(url));
         } catch (JAXBException e) {
             Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, url);
             LOG.log(Level.SEVERE, msg.toString());
@@ -116,7 +114,7 @@
     public void loadPlugin(String resource) {
         try {
             LOG.log(Level.INFO, "PLUGIN_LOADING", resource);
-            loadPlugins(getPlugins(resource));
+            loadPlugin(getPlugin(resource));
         } catch (JAXBException e) {
             Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, resource);
             LOG.log(Level.SEVERE, msg.toString());
@@ -129,12 +127,6 @@
 
     }
     
-    protected void loadPlugins(Collection<Plugin> ps) {
-        for (Plugin p : ps) {
-            loadPlugin(p);
-        }
-    }
-    
     protected void loadPlugin(Plugin plugin) {
         if (plugin.getFrontend().size() > 0) {
             LOG.log(Level.INFO, "FOUND_FRONTENDS", new Object[]{plugin.getName(),
@@ -178,29 +170,28 @@
         }
     }
 
-    protected Collection<Plugin> getPlugins(URL url) 
-        throws IOException, JAXBException, FileNotFoundException {
-        Collection<Plugin> p = plugins.get(url.toString());
+    protected Plugin getPlugin(URL url) throws IOException, JAXBException, FileNotFoundException {
+        Plugin plugin = plugins.get(url.toString());
         InputStream is = null;
-        if (p == null) {
+        if (plugin == null) {
             is = url.openStream();
-            p = getPlugins(is);
-            if (p == null) {
+            plugin = getPlugin(is);
+            if (plugin == null || StringUtils.isEmpty(plugin.getName())) {
                 Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, url);
                 LOG.log(Level.SEVERE, msg.toString());
                 throw new ToolException(msg);
             }
-            plugins.put(url.toString(), p);
+            plugins.put(url.toString(), plugin);
         }        
         if (is == null) {
-            return getPlugins(url);
+            return getPlugin(url.toString());
         }
-        return p;
+        return plugin;
     }
     
-    protected Collection<Plugin> getPlugins(String resource) throws JAXBException, FileNotFoundException {
-        Collection<Plugin> p = plugins.get(resource);
-        if (p == null) {
+    protected Plugin getPlugin(String resource) throws JAXBException, FileNotFoundException {
+        Plugin plugin = plugins.get(resource);
+        if (plugin == null) {
             InputStream is = null;
             if (new File(resource).exists()) {
                 is = new BufferedInputStream(new FileInputStream(new File(resource)));
@@ -213,23 +204,19 @@
                 LOG.log(Level.SEVERE, msg.toString());
                 throw new ToolException(msg);
             }
-            p = getPlugins(is);
-            if (p == null) {
+            plugin = getPlugin(is);
+            if (plugin == null || StringUtils.isEmpty(plugin.getName())) {
                 Message msg = new Message("PLUGIN_LOAD_FAIL", LOG, resource);
                 LOG.log(Level.SEVERE, msg.toString());
                 throw new ToolException(msg);
             }
-            plugins.put(resource, p);
+            plugins.put(resource, plugin);
         }
-        return p;
+        return plugin;
     }
 
-    private Collection<Plugin> getPlugins(InputStream is) throws JAXBException {
-        Plugins ps = (Plugins) unmarshaller.unmarshal(is);
-        if (ps != null) {
-            return ps.getPlugin();
-        }
-        return null;
+    private Plugin getPlugin(InputStream is) throws JAXBException {
+        return (Plugin) ((JAXBElement<?>)unmarshaller.unmarshal(is)).getValue();
     }
 
     public FrontEnd getFrontEnd(String name) {
@@ -430,7 +417,7 @@
         return this.databindings;
     }
 
-    public Map<String, Collection<Plugin>> getPlugins() {
+    public Map<String, Plugin> getPlugins() {
         return this.plugins;
     }
 }

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd Tue Apr 17 14:29:39 2007
@@ -1,74 +1,63 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns="http://cxf.apache.org/tools/plugin"
-	targetNamespace="http://cxf.apache.org/tools/plugin"
-	elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	   xmlns="http://cxf.apache.org/tools/plugin" 
+	   targetNamespace="http://cxf.apache.org/tools/plugin" 
+	   elementFormDefault="qualified">
+
+    <xs:complexType name="DataBinding">
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="package" type="xs:string" use="required"/>
+	<xs:attribute name="profile" type="xs:string" use="required"/>
+    </xs:complexType>
+    
+    <xs:complexType name="FrontEnd">
+	<xs:sequence>
+	    <xs:element name="generators" type="Generators"/>
+	    <xs:element name="processor" type="Processor" maxOccurs="1" minOccurs="1"/>
+	    <xs:element name="container" type="Container" maxOccurs="1" minOccurs="1"/>
+	    <xs:element name="builder" type="Builder" maxOccurs="1"/>
+	</xs:sequence>
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="package" type="xs:string" use="required"/>
+	<xs:attribute name="profile" type="xs:string" use="required"/>
+    </xs:complexType>
+    
+    <xs:element name="generator" type="Generator"/>
+    <xs:complexType name="Generator">
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="package" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="Processor">
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="package" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="Builder">
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="package" type="xs:string"/>
+    </xs:complexType>
+    <xs:complexType name="Container">
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="package" type="xs:string"/>
+	<xs:attribute name="toolspec" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="Generators">
+	<xs:sequence>
+	    <xs:element ref="generator" maxOccurs="unbounded"/>
+	</xs:sequence>
+	<xs:attribute name="package" type="xs:string"/>
+    </xs:complexType>
+
+    <xs:element name="plugin" type="Plugin"/>
+    <xs:complexType name="Plugin">
+	<xs:sequence>
+	    <xs:element name="frontend" type="FrontEnd" maxOccurs="unbounded"/>
+	    <xs:element name="databinding" type="DataBinding" maxOccurs="unbounded"/>
+	</xs:sequence>
+	<xs:attribute name="name" type="xs:string" use="required"/>
+	<xs:attribute name="version" type="xs:string" use="required"/>
+	<xs:attribute name="provider" type="xs:string" use="required"/>
+    </xs:complexType>
 
-	<xs:complexType name="DataBinding">
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="package" type="xs:string" use="required" />
-		<xs:attribute name="profile" type="xs:string" use="required" />
-	</xs:complexType>
-
-	<xs:complexType name="FrontEnd">
-		<xs:sequence>
-			<xs:element name="generators" type="Generators" />
-			<xs:element name="processor" type="Processor" maxOccurs="1"
-				minOccurs="1" />
-			<xs:element name="container" type="Container" maxOccurs="1"
-				minOccurs="1" />
-			<xs:element name="builder" type="Builder" maxOccurs="1" />
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="package" type="xs:string" use="required" />
-		<xs:attribute name="profile" type="xs:string" use="required" />
-	</xs:complexType>
-
-	<xs:element name="generator" type="Generator" />
-	<xs:complexType name="Generator">
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="package" type="xs:string" />
-	</xs:complexType>
-	<xs:complexType name="Processor">
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="package" type="xs:string" />
-	</xs:complexType>
-	<xs:complexType name="Builder">
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="package" type="xs:string" />
-	</xs:complexType>
-	<xs:complexType name="Container">
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="package" type="xs:string" />
-		<xs:attribute name="toolspec" type="xs:string" use="required" />
-	</xs:complexType>
-
-	<xs:complexType name="Generators">
-		<xs:sequence>
-			<xs:element ref="generator" maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="package" type="xs:string" />
-	</xs:complexType>
-
-	<xs:element name="plugin" type="Plugin" />
-	<xs:complexType name="Plugin">
-		<xs:sequence>
-			<xs:element name="frontend" type="FrontEnd"
-				maxOccurs="unbounded" />
-			<xs:element name="databinding" type="DataBinding"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-		<xs:attribute name="name" type="xs:string" use="required" />
-		<xs:attribute name="version" type="xs:string" use="required" />
-		<xs:attribute name="provider" type="xs:string" use="required" />
-	</xs:complexType>
-
-    <xs:element name="plugins">
-      <xs:complexType>
-        <xs:sequence>
-          <xs:element ref="plugin" maxOccurs="unbounded" minOccurs="0"/>
-        </xs:sequence>
-      </xs:complexType>
-    </xs:element>
 </xs:schema>

Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Tue Apr 17 14:29:39 2007
@@ -180,7 +180,7 @@
             return;
         } catch (IOException e) {
             Message msg = new Message("FAIL_TO_GENERATE_TYPES", LOG);
-            throw new ToolException(msg, e);
+            throw new ToolException(msg);
         }
     }
 

Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml Tue Apr 17 14:29:39 2007
@@ -17,8 +17,7 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<plugins xmlns="http://cxf.apache.org/tools/plugin">
-  <plugin name="jaxb" version="" provider="cxf.apache.org">
+
+<plugin name="jaxb" version="" provider="cxf.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
     <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/>
-  </plugin>
-</plugins>
\ No newline at end of file
+</plugin>
\ No newline at end of file

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml Tue Apr 17 14:29:39 2007
@@ -17,8 +17,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<plugins xmlns="http://cxf.apache.org/tools/plugin">
-  <plugin name="jaxws" version="" provider="cxf.apache.org">
+
+<plugin name="jaxws" version="" provider="cxf.apache.org" xmlns="http://cxf.apache.org/tools/plugin">
     <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
 	<container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
 	<processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
@@ -33,5 +33,4 @@
 	    <generator name="ServiceGenerator"/>
 	</generators>
     </frontend>
-  </plugin>
-</plugins>
\ No newline at end of file
+</plugin>
\ No newline at end of file

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java Tue Apr 17 14:29:39 2007
@@ -19,10 +19,10 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws;
 
-import java.util.Collection;
 import java.util.Map;
 
 import junit.framework.TestCase;
+
 import org.apache.cxf.tools.common.Processor;
 import org.apache.cxf.tools.plugin.FrontEnd;
 import org.apache.cxf.tools.plugin.Generator;
@@ -92,8 +92,7 @@
     }
 
     protected Plugin getPlugin(PluginLoader loader, int index) {
-        Collection plugins = (Collection) loader.getPlugins().values().toArray()[index];
-        
-        return (Plugin) plugins.iterator().next();
+        int size = loader.getPlugins().size();
+        return loader.getPlugins().values().toArray(new Plugin[size])[index];
     }
 }

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml Tue Apr 17 14:29:39 2007
@@ -17,8 +17,7 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<plugins xmlns="http://cxf.apache.org/tools/plugin">
-<plugin name="tools-jaxws-frontend" version="2.0" provider="apache cxf">
+<plugin name="tools-jaxws-frontend" version="2.0" provider="apache cxf" xmlns="http://cxf.apache.org/tools/plugin">
     <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
 	<container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
 	<processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
@@ -29,5 +28,4 @@
 	</generators>
     </frontend>
     <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="DummyDataBinding"/>
-</plugin>
-</plugins>
\ No newline at end of file
+</plugin>
\ No newline at end of file

Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java?view=diff&rev=529773&r1=529772&r2=529773
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java Tue Apr 17 14:29:39 2007
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.tools.wsdlto.core;
 
-import java.util.Collection;
 import java.util.Map;
 
 import junit.framework.TestCase;
@@ -86,8 +85,7 @@
     }
     
     protected Plugin getPlugin(PluginLoader loader, int index) {
-        Collection plugins = (Collection) loader.getPlugins().values().toArray()[index];
-        
-        return (Plugin) plugins.iterator().next();
+        int size = loader.getPlugins().size();
+        return loader.getPlugins().values().toArray(new Plugin[size])[index];
     }
 }



Mime
View raw message