Author: richard.opalka(a)jboss.com Date: 2012-10-11 05:45:29 -0400 (Thu, 11 Oct 2012) New Revision: 16853 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java Log: Backport available fixes Merged revisions 16691,16729-16730,16738 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16691 | alessio.soldano(a)jboss.com | 2012-09-03 17:36:42 +0200 (Mon, 03 Sep 2012) | 2 lines [JBWS-3543] Relaxing SubjectCreatingPolicyInterceptor reaction to missing SecurityContext ....... r16729 | alessio.soldano(a)jboss.com | 2012-09-14 18:16:51 +0200 (Fri, 14 Sep 2012) | 2 lines Minor changes to collections creations ....... r16730 | alessio.soldano(a)jboss.com | 2012-09-14 18:17:23 +0200 (Fri, 14 Sep 2012) | 2 lines [JBWS-3510] modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java ....... r16738 | jim.ma | 2012-09-19 09:52:10 +0200 (Wed, 19 Sep 2012) | 1 line [JBWS-3544]:xsd:import not working in WSDLs if EJB WebService deployed in EAR ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16782,16817 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2012-10-11 09:11:40 UTC (rev 16852) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2012-10-11 09:45:29 UTC (rev 16853) @@ -51,6 +51,7 @@ private File resourceDir; private File sourceDir; private PrintStream messageStream; + private String portAddress; public CXFProviderImpl() { @@ -95,6 +96,11 @@ { this.messageStream = messageStream; } + + public void setPortSoapAddress(String address) + { + this.portAddress = address; + } public void provide(String endpointClass) { @@ -170,6 +176,10 @@ args.add("-wsdl"); if (extension) args.add("-soap12"); + if (portAddress != null) { + args.add("-address"); + args.add(portAddress); + } } String cp = buildClasspathString(loader); Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java 2012-10-11 09:11:40 UTC (rev 16852) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java 2012-10-11 09:45:29 UTC (rev 16853) @@ -45,12 +45,13 @@ private static final ResourceBundle bundle = BundleUtils.getBundle(CXFInstanceProvider.class); private final ServerFactoryBean factory; - private final Map<String, Reference> cache = new HashMap<String, Reference>(); + private final Map<String, Reference> cache = new HashMap<String, Reference>(8); public CXFInstanceProvider(final ServerFactoryBean factory) { this.factory = factory; } + @SuppressWarnings("rawtypes") public synchronized Reference getInstance(final String className) { Reference instance = cache.get(className); if (instance == null) { Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2012-10-11 09:11:40 UTC (rev 16852) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2012-10-11 09:45:29 UTC (rev 16853) @@ -109,9 +109,7 @@ { if (getProperties() == null) { - Map<String, Object> props = new HashMap<String, Object>(); - props.putAll(epConfProps); - setProperties(props); + setProperties(new HashMap<String, Object>(epConfProps)); } else { Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2012-10-11 09:11:40 UTC (rev 16852) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2012-10-11 09:45:29 UTC (rev 16853) @@ -131,7 +131,7 @@ { enc = "utf-8"; } - FileOutputStream fos = new FileOutputStream(file); + FileOutputStream fos = new FileOutputStream(new File(file.toURI())); try { XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(fos, enc); Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2012-10-11 09:11:40 UTC (rev 16852) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2012-10-11 09:45:29 UTC (rev 16853) @@ -28,6 +28,7 @@ import java.io.Writer; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import org.jboss.wsf.spi.deployment.WSFDeploymentException; @@ -44,9 +45,9 @@ // The Required services. private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>(); // Optional additional beans. - private List<DDBean> beans = new ArrayList<DDBean>(); + private List<DDBean> beans = new LinkedList<DDBean>(); - private List<DDJmsAddressBean> addressBeans = new ArrayList<DDJmsAddressBean>(); + private List<DDJmsAddressBean> addressBeans = new LinkedList<DDJmsAddressBean>(); // The derived temp file private File tmpFile; Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-10-11 09:11:40 UTC (rev 16852) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-10-11 09:45:29 UTC (rev 16853) @@ -68,7 +68,8 @@ SecurityContext context = message.get(SecurityContext.class); if (context == null || context.getUserPrincipal() == null) { - reportSecurityException("User Principal is not available on the current message"); + LOG.error("User Principal is not available on the current message"); //TODO i18n + return; } SecurityToken token = message.get(SecurityToken.class);