Repository: cxf Updated Branches: refs/heads/split-spring [created] fc2cbb290
http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/spring/src/test/java/org/apache/cxf/bus/spring/test.xml ---------------------------------------------------------------------- diff --git a/rt/spring/src/test/java/org/apache/cxf/bus/spring/test.xml b/rt/spring/src/test/java/org/apache/cxf/bus/spring/test.xml new file mode 100644 index 0000000..65506f3 --- /dev/null +++ b/rt/spring/src/test/java/org/apache/cxf/bus/spring/test.xml @@ -0,0 +1,27 @@ +<?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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> + <bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer"> + <property name="propertyEditorRegistrars"> + <list merge="true"> + </list> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/spring/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml ---------------------------------------------------------------------- diff --git a/rt/spring/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml b/rt/spring/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml new file mode 100644 index 0000000..8bcecc3 --- /dev/null +++ b/rt/spring/src/test/java/org/apache/cxf/bus/spring/testjsr250.xml @@ -0,0 +1,24 @@ +<?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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> + <bean id="testExtension" class="org.apache.cxf.bus.spring.SpringBusFactoryTest$TestExtension"> + <constructor-arg ref="cxf"/> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/spring/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java ---------------------------------------------------------------------- diff --git a/rt/spring/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java new file mode 100644 index 0000000..41094cf --- /dev/null +++ b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java @@ -0,0 +1,412 @@ +/** + * 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.configuration.spring; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Set; + +import javax.xml.bind.DatatypeConverter; +import javax.xml.bind.DatatypeConverterInterface; +import javax.xml.bind.annotation.adapters.HexBinaryAdapter; +import javax.xml.namespace.QName; + +import org.apache.cxf.bus.spring.BusApplicationContext; +import org.apache.cxf.configuration.Configurable; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + + + + + +public class ConfigurerImplTest extends Assert { + + static { + Class<?> cls; + try { + try { + cls = Class.forName("com.sun.xml.bind.DatatypeConverterImpl"); + } catch (ClassNotFoundException e) { + cls = Class.forName("com.sun.xml.internal.bind.DatatypeConverterImpl"); + } + DatatypeConverterInterface convert = (DatatypeConverterInterface)cls.getField("theInstance") + .get(null); + DatatypeConverter.setDatatypeConverter(convert); + } catch (Exception ex) { + //ignore; + } + } + + @Test + public void testConfigureSimpleNoMatchingBean() { + SimpleBean sb = new SimpleBean("unknown"); + + BusApplicationContext ac = + new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml", + false); + + ConfigurerImpl configurer = new ConfigurerImpl(ac); + configurer.configureBean(sb); + assertEquals("Unexpected value for attribute stringAttr", + "hello", sb.getStringAttr()); + assertTrue("Unexpected value for attribute booleanAttr", + sb.getBooleanAttr()); + assertEquals("Unexpected value for attribute integerAttr", + BigInteger.ONE, sb.getIntegerAttr()); + assertEquals("Unexpected value for attribute intAttr", + new Integer(2), sb.getIntAttr()); + assertEquals("Unexpected value for attribute longAttr", + new Long(3L), sb.getLongAttr()); + assertEquals("Unexpected value for attribute shortAttr", + new Short((short)4), sb.getShortAttr()); + assertEquals("Unexpected value for attribute decimalAttr", + new BigDecimal("5"), sb.getDecimalAttr()); + assertEquals("Unexpected value for attribute floatAttr", + new Float(6F), sb.getFloatAttr()); + assertEquals("Unexpected value for attribute doubleAttr", + new Double(7D), sb.getDoubleAttr()); + assertEquals("Unexpected value for attribute byteAttr", + new Byte((byte)8), sb.getByteAttr()); + + QName qn = sb.getQnameAttr(); + assertEquals("Unexpected value for attribute qnameAttrNoDefault", + "schema", qn.getLocalPart()); + assertEquals("Unexpected value for attribute qnameAttrNoDefault", + "http://www.w3.org/2001/XMLSchema";, qn.getNamespaceURI()); + byte[] expected = DatatypeConverter.parseBase64Binary("abcd"); + byte[] val = sb.getBase64BinaryAttr(); + assertEquals("Unexpected value for attribute base64BinaryAttrNoDefault", expected.length, val.length); + for (int i = 0; i < expected.length; i++) { + assertEquals("Unexpected value for attribute base64BinaryAttrNoDefault", expected[i], val[i]); + } + expected = new HexBinaryAdapter().unmarshal("aaaa"); + val = sb.getHexBinaryAttr(); + assertEquals("Unexpected value for attribute hexBinaryAttrNoDefault", expected.length, val.length); + for (int i = 0; i < expected.length; i++) { + assertEquals("Unexpected value for attribute hexBinaryAttrNoDefault", expected[i], val[i]); + } + + assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault", + new Long(9L), sb.getUnsignedIntAttr()); + assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault", + new Integer(10), sb.getUnsignedShortAttr()); + assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault", + new Short((short)11), sb.getUnsignedByteAttr()); + } + + @Test + public void testConfigureSimple() { + // Try to configure the bean with id + verifyConfigureSimple("simple"); + // Try to configure the bean with an alias name + verifyConfigureSimple("simpleValueBean"); + } + + + public void verifyConfigureSimple(String beanName) { + + SimpleBean sb = new SimpleBean(beanName); + BusApplicationContext ac = + new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml", + false); + + ConfigurerImpl configurer = new ConfigurerImpl(); + configurer.setApplicationContext(ac); + + configurer.configureBean(sb); + assertEquals("Unexpected value for attribute stringAttr", + "hallo", sb.getStringAttr()); + assertTrue("Unexpected value for attribute booleanAttr", + !sb.getBooleanAttr()); + assertEquals("Unexpected value for attribute integerAttr", + BigInteger.TEN, sb.getIntegerAttr()); + assertEquals("Unexpected value for attribute intAttr", + new Integer(12), sb.getIntAttr()); + assertEquals("Unexpected value for attribute longAttr", + new Long(13L), sb.getLongAttr()); + assertEquals("Unexpected value for attribute shortAttr", + new Short((short)14), sb.getShortAttr()); + assertEquals("Unexpected value for attribute decimalAttr", + new BigDecimal("15"), sb.getDecimalAttr()); + assertEquals("Unexpected value for attribute floatAttr", + new Float(16F), sb.getFloatAttr()); + assertEquals("Unexpected value for attribute doubleAttr", + new Double(17D), sb.getDoubleAttr()); + assertEquals("Unexpected value for attribute byteAttr", + new Byte((byte)18), sb.getByteAttr()); + + assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault", + new Long(19L), sb.getUnsignedIntAttr()); + assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault", + new Integer(20), sb.getUnsignedShortAttr()); + assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault", + new Short((short)21), sb.getUnsignedByteAttr()); + } + + @Test + public void testConfigureSimpleMatchingStarBeanId() { + SimpleBean sb = new SimpleBean("simple2"); + BusApplicationContext ac = + new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml", + false); + + ConfigurerImpl configurer = new ConfigurerImpl(); + configurer.setApplicationContext(ac); + configurer.configureBean(sb); + assertTrue("Unexpected value for attribute booleanAttr", + !sb.getBooleanAttr()); + assertEquals("Unexpected value for attribute integerAttr", + BigInteger.TEN, sb.getIntegerAttr()); + assertEquals("Unexpected value for attribute stringAttr", + "StarHallo", sb.getStringAttr()); + } + + @Test + public void testConfigureSimpleMatchingStarBeanIdWithChildInstance() { + SimpleBean sb = new ChildBean("simple2"); + BusApplicationContext ac = + new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml", + false); + + ConfigurerImpl configurer = new ConfigurerImpl(); + configurer.setApplicationContext(ac); + configurer.configureBean(sb); + assertTrue("Unexpected value for attribute booleanAttr", + !sb.getBooleanAttr()); + assertEquals("Unexpected value for attribute integerAttr", + BigInteger.TEN, sb.getIntegerAttr()); + assertEquals("Unexpected value for attribute stringAttr", + "StarHallo", sb.getStringAttr()); + } + + @Test + public void testGetBeanName() { + ConfigurerImpl configurer = new ConfigurerImpl(); + Object beanInstance = new Configurable() { + + public String getBeanName() { + return "a"; + } + }; + assertEquals("a", configurer.getBeanName(beanInstance)); + final class NamedBean { + @SuppressWarnings("unused") + public String getBeanName() { + return "b"; + } + } + beanInstance = new NamedBean(); + assertEquals("b", configurer.getBeanName(beanInstance)); + beanInstance = this; + assertNull(configurer.getBeanName(beanInstance)); + } + + @Test + public void testAddApplicationContext() { + ConfigurableApplicationContext context1 = + new ClassPathXmlApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml"); + ConfigurerImpl configurer = new ConfigurerImpl(); + configurer.setApplicationContext(context1); + // Just to simulate the OSGi's uninstall command + context1.close(); + + ConfigurableApplicationContext context2 = + new ClassPathXmlApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml"); + configurer.addApplicationContext(context2); + Set<ApplicationContext> contexts = configurer.getAppContexts(); + assertEquals("The Context's size is wrong", 1, contexts.size()); + assertTrue("The conetxts' contains a wrong application context", contexts.contains(context2)); + } + + class SimpleBean implements Configurable { + + private String beanName; + + private String stringAttr = "hello"; + private Boolean booleanAttr = Boolean.TRUE; + private BigInteger integerAttr = BigInteger.ONE; + private Integer intAttr = new Integer(2); + private Long longAttr = new Long(3); + private Short shortAttr = new Short((short)4); + private BigDecimal decimalAttr = new BigDecimal("5"); + private Float floatAttr = new Float(6F); + private Double doubleAttr = new Double(7D); + private Byte byteAttr = new Byte((byte)8); + private QName qnameAttr = new QName("http://www.w3.org/2001/XMLSchema";, "schema", "xs"); + private byte[] base64BinaryAttr = DatatypeConverter.parseBase64Binary("abcd"); + private byte[] hexBinaryAttr = new HexBinaryAdapter().unmarshal("aaaa"); + private Long unsignedIntAttr = new Long(9); + private Integer unsignedShortAttr = new Integer(10); + private Short unsignedByteAttr = new Short((short)11); + + + public SimpleBean(String bn) { + beanName = bn; + } + + public String getBeanName() { + return beanName; + } + + public byte[] getBase64BinaryAttr() { + return base64BinaryAttr; + } + + public void setBase64BinaryAttr(byte[] base64BinaryAttr) { + this.base64BinaryAttr = base64BinaryAttr; + } + + public Boolean getBooleanAttr() { + return booleanAttr; + } + + public void setBooleanAttr(Boolean booleanAttr) { + this.booleanAttr = booleanAttr; + } + + public Byte getByteAttr() { + return byteAttr; + } + + public void setByteAttr(Byte byteAttr) { + this.byteAttr = byteAttr; + } + + public BigDecimal getDecimalAttr() { + return decimalAttr; + } + + public void setDecimalAttr(BigDecimal decimalAttr) { + this.decimalAttr = decimalAttr; + } + + public Double getDoubleAttr() { + return doubleAttr; + } + + public void setDoubleAttr(Double doubleAttr) { + this.doubleAttr = doubleAttr; + } + + public Float getFloatAttr() { + return floatAttr; + } + + public void setFloatAttr(Float floatAttr) { + this.floatAttr = floatAttr; + } + + public byte[] getHexBinaryAttr() { + return hexBinaryAttr; + } + + public void setHexBinaryAttr(byte[] hexBinaryAttr) { + this.hexBinaryAttr = hexBinaryAttr; + } + + public Integer getIntAttr() { + return intAttr; + } + + public void setIntAttr(Integer intAttr) { + this.intAttr = intAttr; + } + + public BigInteger getIntegerAttr() { + return integerAttr; + } + + public void setIntegerAttr(BigInteger integerAttr) { + this.integerAttr = integerAttr; + } + + public Long getLongAttr() { + return longAttr; + } + + public void setLongAttr(Long longAttr) { + this.longAttr = longAttr; + } + + public QName getQnameAttr() { + return qnameAttr; + } + + public void setQnameAttr(QName qnameAttr) { + this.qnameAttr = qnameAttr; + } + + public Short getShortAttr() { + return shortAttr; + } + + public void setShortAttr(Short shortAttr) { + this.shortAttr = shortAttr; + } + + public String getStringAttr() { + return stringAttr; + } + + public void setStringAttr(String stringAttr) { + this.stringAttr = stringAttr; + } + + public Short getUnsignedByteAttr() { + return unsignedByteAttr; + } + + public void setUnsignedByteAttr(Short unsignedByteAttr) { + this.unsignedByteAttr = unsignedByteAttr; + } + + public Long getUnsignedIntAttr() { + return unsignedIntAttr; + } + + public void setUnsignedIntAttr(Long unsignedIntAttr) { + this.unsignedIntAttr = unsignedIntAttr; + } + + public Integer getUnsignedShortAttr() { + return unsignedShortAttr; + } + + public void setUnsignedShortAttr(Integer unsignedShortAttr) { + this.unsignedShortAttr = unsignedShortAttr; + } + + public void setBeanName(String beanName) { + this.beanName = beanName; + } + } + + class ChildBean extends SimpleBean { + + public ChildBean(String bn) { + super(bn); + } + + } +} http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/spring/src/test/java/org/apache/cxf/configuration/spring/bean.properties ---------------------------------------------------------------------- diff --git a/rt/spring/src/test/java/org/apache/cxf/configuration/spring/bean.properties b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/bean.properties new file mode 100644 index 0000000..9199905 --- /dev/null +++ b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/bean.properties @@ -0,0 +1,17 @@ +# 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. +simple.name=simpleValueBean http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml ---------------------------------------------------------------------- diff --git a/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml new file mode 100644 index 0000000..359bb47 --- /dev/null +++ b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-beans.xml @@ -0,0 +1,59 @@ +<?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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> + <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="location" value="org/apache/cxf/configuration/spring/bean.properties"/> + </bean> + <bean name="*2" abstract="true" class="org.apache.cxf.configuration.spring.ConfigurerImplTest$SimpleBean"> + <property name="stringAttr" value="StarHallo"/> + </bean> + <!-- additional wildcards for class SimpleBean will be ignored with a warning --> + <bean name="*duplicateWildcardForClassWillBeIgnored" abstract="true" class="SimpleBean"> + <property name="stringAttr" value="duplicateWildcardForClassWillBeIgnored"/> + </bean> + <!-- wildcards bean with no class will be ignored with a warning --> + <bean name="*willBeIgnoredBecausOfNoClass" abstract="true"> + <property name="stringAttr" value="willBeIgnoredBecausOfNoClass"/> + </bean> + <bean id="simple2" lazy-init="true"> + <property name="booleanAttr" value="false"/> + <property name="integerAttr" value="10"/> + </bean> + <bean id="simple" name="${simple.name}" lazy-init="true"> + <property name="stringAttr" value="hallo"/> + <property name="booleanAttr" value="false"/> + <property name="integerAttr" value="10"/> + <property name="intAttr" value="12"/> + <property name="longAttr" value="13"/> + <property name="shortAttr" value="14"/> + <property name="decimalAttr" value="15"/> + <property name="floatAttr" value="16"/> + <property name="doubleAttr" value="17"/> + <property name="byteAttr" value="18"/> + <!-- + <property name="qnameAttr" value="xs:string"/> + --> + <property name="base64BinaryAttr" value="abcd"/> + <property name="hexBinaryAttr" value="bbbb"/> + <property name="unsignedIntAttr" value="19"/> + <property name="unsignedShortAttr" value="20"/> + <property name="unsignedByteAttr" value="21"/> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml ---------------------------------------------------------------------- diff --git a/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml new file mode 100644 index 0000000..801968a --- /dev/null +++ b/rt/spring/src/test/java/org/apache/cxf/configuration/spring/test-jaxb-beans.xml @@ -0,0 +1,43 @@ +<?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. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:foo="http://cxf.apache.org/configuration/foo"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> + <bean id="complex" class="org.apache.cxf.configuration.spring.JaxbPropertyEditorTest$FooBean" lazy-init="true"> + <property name="name"> + <value>foam</value> + </property> + <property name="position"> + <value> + <foo:point> + <foo:x>12</foo:x> + <foo:y>33</foo:y> + </foo:point> + </value> + </property> + <property name="address"> + <value> + <foo:address> + <foo:city>Dublin</foo:city> + <foo:zip>4</foo:zip> + <foo:street>Shelbourne Rd</foo:street> + </foo:address> + </value> + </property> + </bean> +</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/transports/http-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml index d2af63c..1925908 100644 --- a/rt/transports/http-jetty/pom.xml +++ b/rt/transports/http-jetty/pom.xml @@ -74,6 +74,12 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <optional>true</optional> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/transports/http-netty/netty-server/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index aeb6a5b..b015f23 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -53,6 +53,12 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> <version>${cxf.netty.version}</version> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/transports/http/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index f5a7c57..56b01b7 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -83,6 +83,12 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/ws/addr/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml index 803d37d..63e062f 100644 --- a/rt/ws/addr/pom.xml +++ b/rt/ws/addr/pom.xml @@ -78,6 +78,12 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/ws/policy/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index 3b03dd7..6b16df9 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -92,6 +92,12 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-wsdl</artifactId> <version>${project.version}</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/rt/ws/rm/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index 086dca3..2354f72 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -71,6 +71,12 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/testutils/pom.xml ---------------------------------------------------------------------- diff --git a/testutils/pom.xml b/testutils/pom.xml index 8853fd7..a2fd487 100644 --- a/testutils/pom.xml +++ b/testutils/pom.xml @@ -47,6 +47,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-broker</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/cxf/blob/e46d0180/tools/javato/ws/pom.xml ---------------------------------------------------------------------- diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml index f7192d5..4c2abb4 100644 --- a/tools/javato/ws/pom.xml +++ b/tools/javato/ws/pom.xml @@ -43,6 +43,11 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-spring</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-simple</artifactId> <version>${project.version}</version> </dependency>
