JBossWS SVN: r17259 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:20:19 -0500 (Fri, 25 Jan 2013)
New Revision: 17259
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
Log:
[JBWS-3592] Adding testcase
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2013-01-25 18:19:52 UTC (rev 17258)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2013-01-25 18:20:19 UTC (rev 17259)
@@ -71,6 +71,14 @@
assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFile"));
}
+ public void testCustomClientConfigurationFromFileUsingFeature() throws Exception {
+ assertTrue(getHelper().testCustomClientConfigurationFromFile());
+ }
+
+ public void testCustomClientConfigurationFromFileUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeature"));
+ }
+
/**
* Verifies a client configuration can be changed after another one has been set
*
@@ -104,6 +112,10 @@
assertEquals("1", runTestInContainer("testCustomClientConfiguration"));
}
+ public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature"));
+ }
+
// -------------------------
private Helper getHelper() {
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java 2013-01-25 18:19:52 UTC (rev 17258)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java 2013-01-25 18:20:19 UTC (rev 17259)
@@ -30,6 +30,7 @@
import javax.xml.ws.handler.Handler;
import org.jboss.test.helper.ClientHelper;
+import org.jboss.ws.api.configuration.ClientConfigFeature;
import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
@@ -72,6 +73,24 @@
return ("Kermit|RoutOut|CustomOut|UserOut|LogOut|endpoint|LogIn|UserIn|CustomIn|RoutIn".equals(resStr));
}
+ public boolean testCustomClientConfigurationFromFileUsingFeature() throws Exception
+ {
+ QName serviceName = new QName("http://clientConfig.jaxws.ws.test.jboss.org/", "EndpointImplService");
+ URL wsdlURL = new URL(address + "?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", "Custom Client Config"));
+
+ BindingProvider bp = (BindingProvider)port;
+ @SuppressWarnings("rawtypes")
+ List<Handler> hc = bp.getBinding().getHandlerChain();
+ hc.add(new UserHandler());
+ bp.getBinding().setHandlerChain(hc);
+
+ String resStr = port.echo("Kermit");
+ return ("Kermit|RoutOut|CustomOut|UserOut|LogOut|endpoint|LogIn|UserIn|CustomIn|RoutIn".equals(resStr));
+ }
+
public boolean testConfigurationChange() throws Exception
{
QName serviceName = new QName("http://clientConfig.jaxws.ws.test.jboss.org/", "EndpointImplService");
@@ -180,6 +199,38 @@
}
}
+ public boolean testCustomClientConfigurationUsingFeature() throws Exception
+ {
+ QName serviceName = new QName("http://clientConfig.jaxws.ws.test.jboss.org/", "EndpointImplService");
+ URL wsdlURL = new URL(address + "?wsdl");
+
+ final String testConfigName = "MyTestConfig";
+ try
+ {
+ //-- add test client configuration
+ TestUtils.addTestCaseClientConfiguration(testConfigName);
+ // --
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class, new ClientConfigFeature(null, testConfigName));
+
+ BindingProvider bp = (BindingProvider)port;
+ @SuppressWarnings("rawtypes")
+ List<Handler> hc = bp.getBinding().getHandlerChain();
+ hc.add(new UserHandler());
+ bp.getBinding().setHandlerChain(hc);
+
+ String resStr = port.echo("Kermit");
+ return ("Kermit|RoutOut|UserOut|endpoint|UserIn|RoutIn".equals(resStr));
+ }
+ finally
+ {
+ // -- remove test client configuration --
+ TestUtils.removeTestCaseClientConfiguration(testConfigName);
+ // --
+ }
+ }
+
@Override
public void setTargetEndpoint(String address)
{
12 years, 9 months
JBossWS SVN: r17258 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:19:52 -0500 (Fri, 25 Jan 2013)
New Revision: 17258
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java
Log:
[JBWS-3592] Adding testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2013-01-25 18:19:15 UTC (rev 17257)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2013-01-25 18:19:52 UTC (rev 17258)
@@ -56,6 +56,14 @@
assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFile"));
}
+ public void testCustomClientConfigurationFromFileUsingFeature() throws Exception {
+ assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeature());
+ }
+
+ public void testCustomClientConfigurationFromFileUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeature"));
+ }
+
/**
* Verifies a client configuration can be changed after another one has been set
*
@@ -89,6 +97,10 @@
assertEquals("1", runTestInContainer("testCustomClientConfiguration"));
}
+ public void testCustomClientConfigurationUsingFeatureInContainer() throws Exception {
+ assertEquals("1", runTestInContainer("testCustomClientConfigurationUsingFeature"));
+ }
+
// -------------------------
private Helper getHelper() {
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2013-01-25 18:19:15 UTC (rev 17257)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2013-01-25 18:19:52 UTC (rev 17258)
@@ -27,6 +27,7 @@
import javax.xml.ws.Service;
import org.apache.cxf.frontend.ClientProxy;
+import org.jboss.ws.api.configuration.ClientConfigFeature;
import org.jboss.ws.api.configuration.ClientConfigUtil;
import org.jboss.ws.api.configuration.ClientConfigurer;
import org.jboss.wsf.test.ClientHelper;
@@ -52,6 +53,14 @@
return ClientProxy.getClient(port).getEndpoint().get("propA").equals("fileValueA");
}
+ public boolean testCustomClientConfigurationFromFileUsingFeature() throws Exception
+ {
+ Service service = Service.create(new URL(address + "?wsdl"), serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class, new ClientConfigFeature("META-INF/jaxws-client-config.xml", "Custom Client Config", true));
+
+ return ClientProxy.getClient(port).getEndpoint().get("propA").equals("fileValueA");
+ }
+
public boolean testConfigurationChange() throws Exception
{
Service service = Service.create(new URL(address + "?wsdl"), serviceName);
@@ -139,6 +148,31 @@
}
}
+ public boolean testCustomClientConfigurationUsingFeature() throws Exception
+ {
+ final URL wsdlURL = new URL(address + "?wsdl");
+ final String testConfigName = "MyTestConfig";
+ try
+ {
+ //-- add test client configuration
+ TestUtils.addTestCaseClientConfiguration(testConfigName);
+ // --
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class, new ClientConfigFeature(null, testConfigName, true));
+ org.apache.cxf.endpoint.Endpoint ep = ClientProxy.getClient(port).getEndpoint();
+ ep.put("propZ", "valueZ");
+
+ return (ep.get("propT").equals("valueT") && ep.get("propZ").equals("valueZ"));
+ }
+ finally
+ {
+ // -- remove test client configuration --
+ TestUtils.removeTestCaseClientConfiguration(testConfigName);
+ // --
+ }
+ }
+
@Override
public void setTargetEndpoint(String address)
{
12 years, 9 months
JBossWS SVN: r17257 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:19:15 -0500 (Fri, 25 Jan 2013)
New Revision: 17257
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest api
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-01-25 18:19:04 UTC (rev 17256)
+++ stack/cxf/trunk/pom.xml 2013-01-25 18:19:15 UTC (rev 17257)
@@ -59,7 +59,7 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.1.Final</jbossws.api.version>
+ <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
<jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
12 years, 9 months
JBossWS SVN: r17256 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:19:04 -0500 (Fri, 25 Jan 2013)
New Revision: 17256
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
Log:
[JBWS-3591] support for AbstractClientFeature
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2013-01-25 18:17:59 UTC (rev 17255)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2013-01-25 18:19:04 UTC (rev 17256)
@@ -46,6 +46,7 @@
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.jboss.ws.api.configuration.AbstractClientFeature;
import org.jboss.ws.common.configuration.ConfigHelper;
import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.spi.SPIProvider;
@@ -497,6 +498,13 @@
}
}
}
+ if (features != null) {
+ for (WebServiceFeature f : features) {
+ if (f instanceof AbstractClientFeature) {
+ ((AbstractClientFeature)f).initialize(port);
+ }
+ }
+ }
return port;
}
12 years, 9 months
JBossWS SVN: r17255 - shared-testsuite/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:17:59 -0500 (Fri, 25 Jan 2013)
New Revision: 17255
Modified:
shared-testsuite/trunk/pom.xml
Log:
Use latest common
Modified: shared-testsuite/trunk/pom.xml
===================================================================
--- shared-testsuite/trunk/pom.xml 2013-01-25 18:17:24 UTC (rev 17254)
+++ shared-testsuite/trunk/pom.xml 2013-01-25 18:17:59 UTC (rev 17255)
@@ -23,7 +23,7 @@
</scm>
<properties>
- <jbossws.common.version>2.1.0.Final</jbossws.common.version>
+ <jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<junit.version>3.8.2</junit.version>
</properties>
12 years, 9 months
JBossWS SVN: r17254 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:17:24 -0500 (Fri, 25 Jan 2013)
New Revision: 17254
Modified:
common/trunk/pom.xml
Log:
Use latest spi
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2013-01-25 18:17:11 UTC (rev 17253)
+++ common/trunk/pom.xml 2013-01-25 18:17:24 UTC (rev 17254)
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.1.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
12 years, 9 months
JBossWS SVN: r17253 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:17:11 -0500 (Fri, 25 Jan 2013)
New Revision: 17253
Modified:
spi/trunk/pom.xml
Log:
Use latest jbws-api
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2013-01-25 18:16:53 UTC (rev 17252)
+++ spi/trunk/pom.xml 2013-01-25 18:17:11 UTC (rev 17253)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.1.Final</jbossws.api.version>
+ <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
<jms.api.version>1.0.0.Final</jms.api.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
<jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>
12 years, 9 months
JBossWS SVN: r17252 - api/trunk/src/main/java/org/jboss/ws/api/configuration.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:16:53 -0500 (Fri, 25 Jan 2013)
New Revision: 17252
Added:
api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigFeature.java
Log:
[JBWS-3592] Feature for setting client config
Added: api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigFeature.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigFeature.java (rev 0)
+++ api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigFeature.java 2013-01-25 18:16:53 UTC (rev 17252)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.api.configuration;
+
+import javax.xml.ws.BindingProvider;
+
+/**
+ * A JBoss client JAXWS feature that setup a JBossWS predefined client config
+ *
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ */
+public final class ClientConfigFeature extends AbstractClientFeature
+{
+ private ClientConfigurer configurer;
+
+ private String configFile;
+
+ private String configName;
+
+ private boolean configureProperties;
+
+ public ClientConfigFeature()
+ {
+ super(ClientConfigFeature.class.getName());
+ this.configurer = ClientConfigUtil.resolveClientConfigurer();
+ }
+
+ public ClientConfigFeature(String configFile, String configName) {
+ this(configFile, configName, false);
+ }
+
+ public ClientConfigFeature(String configFile, String configName, boolean configureProperties) {
+ this();
+ this.configFile = configFile;
+ this.configName = configName;
+ this.configureProperties = configureProperties;
+ }
+
+ public void initialize(Object obj)
+ {
+ super.initialize(obj);
+ if (configureProperties) {
+ configurer.setConfigProperties(obj, configFile, configName);
+ }
+ }
+
+ protected void initializeBindingProvider(BindingProvider bp)
+ {
+ configurer.setConfigHandlers(bp, configFile, configName);
+ }
+
+ public String getConfigFile()
+ {
+ return configFile;
+ }
+
+ public void setConfigFile(String configFile)
+ {
+ this.configFile = configFile;
+ }
+
+ public String getConfigName()
+ {
+ return configName;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+ public boolean isConfigureProperties()
+ {
+ return configureProperties;
+ }
+
+ public void setConfigureProperties(boolean configureProperties)
+ {
+ this.configureProperties = configureProperties;
+ }
+
+}
12 years, 9 months
JBossWS SVN: r17251 - api/trunk/src/main/java/org/jboss/ws/api/configuration.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-25 13:15:59 -0500 (Fri, 25 Jan 2013)
New Revision: 17251
Added:
api/trunk/src/main/java/org/jboss/ws/api/configuration/AbstractClientFeature.java
Log:
[JBWS-3591] Adding abstract feature for initializing ports
Added: api/trunk/src/main/java/org/jboss/ws/api/configuration/AbstractClientFeature.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/configuration/AbstractClientFeature.java (rev 0)
+++ api/trunk/src/main/java/org/jboss/ws/api/configuration/AbstractClientFeature.java 2013-01-25 18:15:59 UTC (rev 17251)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.api.configuration;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * Abstract JBoss client JAXWS feature
+ *
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ */
+public abstract class AbstractClientFeature extends WebServiceFeature
+{
+ private String id;
+
+ protected AbstractClientFeature(String id)
+ {
+ this.id = id;
+ }
+
+ /**
+ * Initializes the provided JAXWS client component; this is called by the
+ * the JBossWS impl of JAXWS Provider.
+ *
+ * @param obj
+ */
+ public void initialize(Object obj)
+ {
+ if (obj instanceof BindingProvider)
+ {
+ this.initializeBindingProvider((BindingProvider) obj);
+ }
+ }
+
+ /**
+ * Initializes the provided BindingProvider instance
+ *
+ * @param bp
+ */
+ protected void initializeBindingProvider(BindingProvider bp)
+ {
+
+ }
+
+ @Override
+ public String getID()
+ {
+ return id;
+ }
+}
12 years, 9 months
JBossWS SVN: r17250 - thirdparty/cxf/branches/cxf-2.4.9.jbossorg-1-JBPAPP-10590/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2013-01-25 11:26:48 -0500 (Fri, 25 Jan 2013)
New Revision: 17250
Modified:
thirdparty/cxf/branches/cxf-2.4.9.jbossorg-1-JBPAPP-10590/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Log:
[JBPAPP-10590] StackOverflowError when JAXBSchemaInitializer tries to process parametrized type Enum<E>
Modified: thirdparty/cxf/branches/cxf-2.4.9.jbossorg-1-JBPAPP-10590/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.9.jbossorg-1-JBPAPP-10590/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-01-25 12:13:49 UTC (rev 17249)
+++ thirdparty/cxf/branches/cxf-2.4.9.jbossorg-1-JBPAPP-10590/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-01-25 16:26:48 UTC (rev 17250)
@@ -219,8 +219,10 @@
}
} else if (cls instanceof ParameterizedType) {
addType(((ParameterizedType)cls).getRawType());
- for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
- addType(t2);
+ if (!((ParameterizedType)cls).getRawType().equals(Enum.class)) {
+ for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
+ addType(t2);
+ }
}
} else if (cls instanceof GenericArrayType) {
Class ct;
12 years, 9 months