Author: jim.ma Date: 2013-04-08 05:10:21 -0400 (Mon, 08 Apr 2013) New Revision: 17465 Added: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java Log: [JBWS-3524]:fix the jboss712 IL Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java =================================================================== --- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:08:50 UTC (rev 17464) +++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:10:21 UTC (rev 17465) @@ -21,16 +21,17 @@ */ package org.jboss.as.webservices.deployers; +import org.jboss.as.ee.structure.JBossDescriptorPropertyReplacement; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; import org.jboss.as.server.deployment.module.ResourceRoot; +import org.jboss.as.webservices.metadata.JBossWebservicesPropertyReplaceFactory; import org.jboss.as.webservices.util.VirtualFileAdaptor; import org.jboss.as.webservices.util.WSAttachmentKeys; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; /** @@ -44,10 +45,14 @@ final DeploymentUnit unit = phaseContext.getDeploymentUnit(); final ResourceRoot deploymentRoot = unit.getAttachment(Attachments.DEPLOYMENT_ROOT); final UnifiedVirtualFile virtualFile = new VirtualFileAdaptor(deploymentRoot.getRoot()); - final JBossWebservicesMetaData jbossWebservicesMD = JBossWebservicesFactory.loadFromVFSRoot(virtualFile); + final JBossWebservicesPropertyReplaceFactory webservicesFactory = new JBossWebservicesPropertyReplaceFactory( + null, JBossDescriptorPropertyReplacement.propertyReplacer(unit)); + final JBossWebservicesMetaData jbossWebservicesMD = webservicesFactory.loadFromVFSRoot(virtualFile); if (jbossWebservicesMD != null) { unit.putAttachment(WSAttachmentKeys.JBOSS_WEBSERVICES_METADATA_KEY, jbossWebservicesMD); } + + } public void undeploy(final DeploymentUnit unit) { Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java =================================================================== --- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:08:50 UTC (rev 17464) +++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:10:21 UTC (rev 17465) @@ -21,16 +21,17 @@ */ package org.jboss.as.webservices.deployers; +import org.jboss.as.ee.structure.JBossDescriptorPropertyReplacement; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; import org.jboss.as.server.deployment.module.ResourceRoot; +import org.jboss.as.webservices.metadata.WebservicesPropertyReplaceFactory; import org.jboss.as.webservices.util.VirtualFileAdaptor; import org.jboss.as.webservices.util.WSAttachmentKeys; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -45,7 +46,9 @@ final DeploymentUnit unit = phaseContext.getDeploymentUnit(); final ResourceRoot deploymentRoot = unit.getAttachment(Attachments.DEPLOYMENT_ROOT); final UnifiedVirtualFile virtualFile = new VirtualFileAdaptor(deploymentRoot.getRoot()); - final WebservicesMetaData webservicesMD = WebservicesFactory.loadFromVFSRoot(virtualFile); + final WebservicesPropertyReplaceFactory webservicesFactory = new WebservicesPropertyReplaceFactory( + null, JBossDescriptorPropertyReplacement.propertyReplacer(unit)); + final WebservicesMetaData webservicesMD = webservicesFactory.loadFromVFSRoot(virtualFile); if (webservicesMD != null) { unit.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, webservicesMD); } Added: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java =================================================================== --- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java (rev 0) +++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java 2013-04-08 09:10:21 UTC (rev 17465) @@ -0,0 +1,56 @@ +/* + * 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.as.webservices.metadata; + +import static org.jboss.wsf.spi.util.StAXUtils.elementAsString; + +import java.net.URL; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.jboss.metadata.property.PropertyReplacer; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesFactory; + +/** + * @author <a href="mailto:ema@redhat.com">Jim Ma</a> + */ +public class JBossWebservicesPropertyReplaceFactory extends JBossWebservicesFactory { + + private PropertyReplacer replacer; + + + public JBossWebservicesPropertyReplaceFactory(final URL descriptorURL, final PropertyReplacer propertyReplacer) { + super(descriptorURL); + replacer = propertyReplacer; + } + + @Override + public String getElementText(XMLStreamReader reader) throws XMLStreamException { + String res = elementAsString(reader); + if (res != null && replacer != null) { + res = replacer.replaceProperties(res); + } + return res; + } + +} Property changes on: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java =================================================================== --- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java (rev 0) +++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java 2013-04-08 09:10:21 UTC (rev 17465) @@ -0,0 +1,56 @@ +/* + * 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.as.webservices.metadata; + +import static org.jboss.wsf.spi.util.StAXUtils.elementAsString; + +import java.net.URL; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.jboss.metadata.property.PropertyReplacer; +import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; + +/** + * @author <a href="mailto:ema@redhat.com">Jim Ma</a> + */ +public class WebservicesPropertyReplaceFactory extends WebservicesFactory { + + private PropertyReplacer replacer; + + + public WebservicesPropertyReplaceFactory(final URL descriptorURL, final PropertyReplacer propertyReplacer) { + super(descriptorURL); + replacer = propertyReplacer; + } + + @Override + public String getElementText(XMLStreamReader reader) throws XMLStreamException { + String res = elementAsString(reader); + if (res != null && replacer != null) { + res = replacer.replaceProperties(res); + } + return res; + } + +} Property changes on: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native