JBossWS SVN: r17474 - in container/jboss71/branches/jbossws-jboss713: tests-integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 08:31:33 -0400 (Mon, 08 Apr 2013)
New Revision: 17474
Modified:
container/jboss71/branches/jbossws-jboss713/server-integration/pom.xml
container/jboss71/branches/jbossws-jboss713/tests-integration/pom.xml
Log:
Fixing child pom versions too
Modified: container/jboss71/branches/jbossws-jboss713/server-integration/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss713/server-integration/pom.xml 2013-04-08 12:29:38 UTC (rev 17473)
+++ container/jboss71/branches/jbossws-jboss713/server-integration/pom.xml 2013-04-08 12:31:33 UTC (rev 17474)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss713-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/jboss71/branches/jbossws-jboss713/tests-integration/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss713/tests-integration/pom.xml 2013-04-08 12:29:38 UTC (rev 17473)
+++ container/jboss71/branches/jbossws-jboss713/tests-integration/pom.xml 2013-04-08 12:31:33 UTC (rev 17474)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss713-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
11 years
JBossWS SVN: r17473 - in container/jboss71/branches/jbossws-jboss712: tests-integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 08:29:38 -0400 (Mon, 08 Apr 2013)
New Revision: 17473
Modified:
container/jboss71/branches/jbossws-jboss712/server-integration/pom.xml
container/jboss71/branches/jbossws-jboss712/tests-integration/pom.xml
Log:
Fixing child pom versions too
Modified: container/jboss71/branches/jbossws-jboss712/server-integration/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss712/server-integration/pom.xml 2013-04-08 09:36:49 UTC (rev 17472)
+++ container/jboss71/branches/jbossws-jboss712/server-integration/pom.xml 2013-04-08 12:29:38 UTC (rev 17473)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss712-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: container/jboss71/branches/jbossws-jboss712/tests-integration/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss712/tests-integration/pom.xml 2013-04-08 09:36:49 UTC (rev 17472)
+++ container/jboss71/branches/jbossws-jboss712/tests-integration/pom.xml 2013-04-08 12:29:38 UTC (rev 17473)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss712-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
11 years
JBossWS SVN: r17472 - in common/branches/jbossws-common-2.1.x: src/main/java/org/jboss/ws/common/deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:36:49 -0400 (Mon, 08 Apr 2013)
New Revision: 17472
Modified:
common/branches/jbossws-common-2.1.x/pom.xml
common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java
common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/WebservicesDescriptorParserImpl.java
Log:
Revert the previous commit, this will be reviewed later for eap6 branch
Modified: common/branches/jbossws-common-2.1.x/pom.xml
===================================================================
--- common/branches/jbossws-common-2.1.x/pom.xml 2013-04-08 09:36:18 UTC (rev 17471)
+++ common/branches/jbossws-common-2.1.x/pom.xml 2013-04-08 09:36:49 UTC (rev 17472)
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.1.3-SNAPSHOT</jbossws.spi.version>
+ <jbossws.spi.version>2.1.2-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>
Modified: common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java
===================================================================
--- common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java 2013-04-08 09:36:18 UTC (rev 17471)
+++ common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java 2013-04-08 09:36:49 UTC (rev 17472)
@@ -54,7 +54,7 @@
@Override
public JBossWebservicesMetaData parse(URL url)
{
- return new JBossWebservicesFactory(url).load(url);
+ return JBossWebservicesFactory.load(url);
}
}
Modified: common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/WebservicesDescriptorParserImpl.java
===================================================================
--- common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/WebservicesDescriptorParserImpl.java 2013-04-08 09:36:18 UTC (rev 17471)
+++ common/branches/jbossws-common-2.1.x/src/main/java/org/jboss/ws/common/deployment/WebservicesDescriptorParserImpl.java 2013-04-08 09:36:49 UTC (rev 17472)
@@ -55,6 +55,6 @@
@Override
public WebservicesMetaData parse(URL url)
{
- return new WebservicesFactory(url).load(url);
+ return WebservicesFactory.load(url);
}
}
11 years
JBossWS SVN: r17471 - in spi/branches/jbossws-spi-2.1.x/src: test/java/org/jboss/test/wsf/spi/metadata/webservices and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:36:18 -0400 (Mon, 08 Apr 2013)
New Revision: 17471
Modified:
spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java
spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java
Log:
Revert the previous commit, this will be reviewed later
Modified: spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
===================================================================
--- spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2013-04-08 09:27:42 UTC (rev 17470)
+++ spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2013-04-08 09:36:18 UTC (rev 17471)
@@ -83,7 +83,7 @@
* @param root virtual file root
* @return JBossWebservicesMetaData or <code>null</code> if it cannot be found
*/
- public JBossWebservicesMetaData loadFromVFSRoot(final UnifiedVirtualFile root) {
+ public static JBossWebservicesMetaData loadFromVFSRoot(final UnifiedVirtualFile root) {
JBossWebservicesMetaData webservices = null;
UnifiedVirtualFile wsdd = root.findChildFailSafe("META-INF/jboss-webservices.xml");
@@ -101,7 +101,7 @@
return webservices;
}
- public JBossWebservicesMetaData load(final URL wsddUrl) {
+ public static JBossWebservicesMetaData load(final URL wsddUrl) {
InputStream is = null;
try {
is = wsddUrl.openStream();
@@ -118,11 +118,11 @@
}
}
- public JBossWebservicesMetaData parse(final InputStream is) {
+ public static JBossWebservicesMetaData parse(final InputStream is) {
return parse(is, null);
}
- public JBossWebservicesMetaData parse(final InputStream is, final URL descriptorURL) {
+ public static JBossWebservicesMetaData parse(final InputStream is, final URL descriptorURL) {
try {
final XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is);
return parse(xmlr, descriptorURL);
@@ -131,11 +131,11 @@
}
}
- public JBossWebservicesMetaData parse(final XMLStreamReader reader) throws XMLStreamException {
+ public static JBossWebservicesMetaData parse(final XMLStreamReader reader) throws XMLStreamException {
return parse(reader, null);
}
- private JBossWebservicesMetaData parse(final XMLStreamReader reader, final URL descriptorURL)
+ private static JBossWebservicesMetaData parse(final XMLStreamReader reader, final URL descriptorURL)
throws XMLStreamException {
int iterate;
try {
@@ -154,7 +154,8 @@
if (match(reader, JBOSSEE_NS, WEBSERVICES)) {
String nsUri = reader.getNamespaceURI();
- metadata = parseWebservices(reader, nsUri, descriptorURL);
+ JBossWebservicesFactory factory = new JBossWebservicesFactory(descriptorURL);
+ metadata = factory.parseWebservices(reader, nsUri, descriptorURL);
} else {
throw MESSAGES.unexpectedElement(descriptorURL != null ? descriptorURL.toString() : "jboss-webservices.xml", reader.getLocalName());
}
@@ -177,11 +178,11 @@
}
case XMLStreamConstants.START_ELEMENT: {
if (match(reader, nsUri, CONTEXT_ROOT)) {
- metadata.setContextRoot(getElementText(reader));
+ metadata.setContextRoot(elementAsString(reader));
} else if (match(reader, nsUri, CONFIG_NAME)) {
- metadata.setConfigName(getElementText(reader));
+ metadata.setConfigName(elementAsString(reader));
} else if (match(reader, nsUri, CONFIG_FILE)) {
- metadata.setConfigFile(getElementText(reader));
+ metadata.setConfigFile(elementAsString(reader));
} else if (match(reader, nsUri, PROPERTY)) {
parseProperty(reader, nsUri, metadata);
} else if (match(reader, nsUri, PORT_COMPONENT)) {
@@ -210,15 +211,15 @@
}
case XMLStreamConstants.START_ELEMENT: {
if (match(reader, nsUri, EJB_NAME)) {
- pc.setEjbName(getElementText(reader));
+ pc.setEjbName(elementAsString(reader));
} else if (match(reader, nsUri, PORT_COMPONENT_NAME)) {
- pc.setPortComponentName(getElementText(reader));
+ pc.setPortComponentName(elementAsString(reader));
} else if (match(reader, nsUri, PORT_COMPONENT_URI)) {
- pc.setPortComponentURI(getElementText(reader));
+ pc.setPortComponentURI(elementAsString(reader));
} else if (match(reader, nsUri, AUTH_METHOD)) {
- pc.setAuthMethod(getElementText(reader));
+ pc.setAuthMethod(elementAsString(reader));
} else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) {
- pc.setTransportGuarantee(getElementText(reader));
+ pc.setTransportGuarantee(elementAsString(reader));
} else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) {
pc.setSecureWSDLAccess(elementAsBoolean(reader));
} else {
@@ -244,9 +245,9 @@
}
case XMLStreamConstants.START_ELEMENT: {
if (match(reader, nsUri, WEBSERVICE_DESCRIPTION_NAME)) {
- description.setWebserviceDescriptionName(getElementText(reader));
+ description.setWebserviceDescriptionName(elementAsString(reader));
} else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) {
- description.setWsdlPublishLocation(getElementText(reader));
+ description.setWsdlPublishLocation(elementAsString(reader));
} else {
throw MESSAGES.unexpectedElement(getDescriptorForLogs(), reader.getLocalName());
}
@@ -281,10 +282,10 @@
}
case XMLStreamConstants.START_ELEMENT : {
if (match(reader, nsUri, NAME)) {
- name = getElementText(reader);
+ name = elementAsString(reader);
}
else if (match(reader, nsUri, VALUE)) {
- value = getElementText(reader);
+ value = elementAsString(reader);
}
else
{
@@ -296,10 +297,6 @@
throw MESSAGES.reachedEndOfXMLDocUnexpectedly(getDescriptorForLogs());
}
- protected String getElementText(XMLStreamReader reader) throws XMLStreamException {
- return elementAsString(reader);
- }
-
private String getDescriptorForLogs() {
return descriptorURL != null ? descriptorURL.toString() : "jboss-webservices.xml";
}
Modified: spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java
===================================================================
--- spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2013-04-08 09:27:42 UTC (rev 17470)
+++ spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2013-04-08 09:36:18 UTC (rev 17471)
@@ -92,7 +92,7 @@
* @param root virtual file root
* @return WebservicesMetaData or <code>null</code> if it cannot be found
*/
- public WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root)
+ public static WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root)
{
WebservicesMetaData webservices = null;
@@ -113,7 +113,7 @@
return webservices;
}
- public WebservicesMetaData load(URL wsddUrl)
+ public static WebservicesMetaData load(URL wsddUrl)
{
InputStream is = null;
try
@@ -136,12 +136,12 @@
}
}
- public WebservicesMetaData parse(InputStream is)
+ public static WebservicesMetaData parse(InputStream is)
{
return parse(is, null);
}
- public WebservicesMetaData parse(InputStream is, URL descriptorURL)
+ public static WebservicesMetaData parse(InputStream is, URL descriptorURL)
{
try
{
@@ -154,12 +154,12 @@
}
}
- public WebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException
+ public static WebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException
{
return parse(reader, null);
}
- private WebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException
+ private static WebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException
{
int iterate;
try
@@ -183,7 +183,8 @@
if (match(reader, JAVAEE_NS, WEBSERVICES) || match(reader, J2EE_NS, WEBSERVICES))
{
String nsUri = reader.getNamespaceURI();
- metadata = parseWebservices(reader, nsUri, descriptorURL);
+ WebservicesFactory factory = new WebservicesFactory(descriptorURL);
+ metadata = factory.parseWebservices(reader, nsUri, descriptorURL);
}
else
{
@@ -216,7 +217,7 @@
metadata.addWebserviceDescription(parseWebserviceDescription(reader, nsUri, metadata));
} else if (match(reader, nsUri, "description") || match(reader, nsUri, "display-name")) {
//skip to parse
- getElementText(reader);
+ elementAsString(reader);
} else if (match(reader, nsUri, "icon")) {
//skip icon
while (reader.hasNext() && !(reader.nextTag() == XMLStreamConstants.END_ELEMENT && match(reader, nsUri, "icon"))) {
@@ -253,13 +254,13 @@
}
case XMLStreamConstants.START_ELEMENT : {
if (match(reader, nsUri, WEBSERVICE_DESCRIPTION_NAME)) {
- description.setWebserviceDescriptionName(getElementText(reader));
+ description.setWebserviceDescriptionName(elementAsString(reader));
}
else if (match(reader, nsUri, WSDL_FILE)) {
- description.setWsdlFile(getElementText(reader));
+ description.setWsdlFile(elementAsString(reader));
}
else if (match(reader, nsUri, JAXRPC_MAPPING_FILE)) {
- description.setJaxrpcMappingFile(getElementText(reader));
+ description.setJaxrpcMappingFile(elementAsString(reader));
}
else if (match(reader, nsUri, PORT_COMPONENT)) {
description.addPortComponent(parsePortComponent(reader, nsUri, description));
@@ -293,11 +294,11 @@
}
case XMLStreamConstants.START_ELEMENT : {
if (match(reader, nsUri, PORT_COMPONENT_NAME)) {
- pc.setPortComponentName(getElementText(reader));
+ pc.setPortComponentName(elementAsString(reader));
}
else if (match(reader, nsUri, "description") || match(reader, nsUri, "display-name")) {
//skip to parse
- getElementText(reader);
+ elementAsString(reader);
} else if (match(reader, nsUri, "icon")) {
//skip icon
while (reader.hasNext() && !(reader.nextTag() == XMLStreamConstants.END_ELEMENT && match(reader, nsUri, "icon"))) {
@@ -323,10 +324,10 @@
parseRespectBinding(reader, nsUri, pc);
}
else if (match(reader, nsUri, PROTOCOL_BINDING)) {
- pc.setProtocolBinding(getElementText(reader));
+ pc.setProtocolBinding(elementAsString(reader));
}
else if (match(reader, nsUri, SERVICE_ENDPOINT_INTERFACE)) {
- pc.setServiceEndpointInterface(getElementText(reader));
+ pc.setServiceEndpointInterface(elementAsString(reader));
}
else if (match(reader, nsUri, SERVICE_IMPL_BEAN)) {
parseServiceImplBean(reader, nsUri, pc);
@@ -347,10 +348,6 @@
throw MESSAGES.reachedEndOfXMLDocUnexpectedly(getDescriptorForLogs());
}
- protected String getElementText(XMLStreamReader reader) throws XMLStreamException {
- return elementAsString(reader);
- }
-
private void parseAddressing(XMLStreamReader reader, String nsUri, PortComponentMetaData pc) throws XMLStreamException
{
while (reader.hasNext())
@@ -375,7 +372,7 @@
pc.setAddressingRequired(elementAsBoolean(reader));
}
else if (match(reader, nsUri, ADDRESSING_RESPONSES)) {
- pc.setAddressingResponses(getElementText(reader));
+ pc.setAddressingResponses(elementAsString(reader));
}
else
{
@@ -435,10 +432,10 @@
}
case XMLStreamConstants.START_ELEMENT : {
if (match(reader, nsUri, SERVLET_LINK)) {
- pc.setServletLink(getElementText(reader));
+ pc.setServletLink(elementAsString(reader));
}
else if (match(reader, nsUri, EJB_LINK)) {
- pc.setEjbLink(getElementText(reader));
+ pc.setEjbLink(elementAsString(reader));
}
else
{
Modified: spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java
===================================================================
--- spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java 2013-04-08 09:27:42 UTC (rev 17470)
+++ spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java 2013-04-08 09:36:18 UTC (rev 17471)
@@ -53,7 +53,7 @@
File file = new File("src/test/resources/metadata/webservices/test-webservices.xml");
InputStream is = new FileInputStream(file);
URL url = file.toURI().toURL();
- WebservicesMetaData metadata = new WebservicesFactory(url).parse(is, url);
+ WebservicesMetaData metadata = WebservicesFactory.parse(is, url);
assertEquals(url, metadata.getDescriptorURL());
assertEquals(2, metadata.getWebserviceDescriptions().length);
testDescription1(metadata.getWebserviceDescriptions()[0], metadata);
11 years
JBossWS SVN: r17470 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:27:42 -0400 (Mon, 08 Apr 2013)
New Revision: 17470
Modified:
stack/cxf/trunk/pom.xml
Log:
Update the ASIL version
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-04-08 09:26:37 UTC (rev 17469)
+++ stack/cxf/trunk/pom.xml 2013-04-08 09:27:42 UTC (rev 17470)
@@ -64,8 +64,8 @@
<jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss712.version>4.1.1.Final</jbossws.jboss712.version>
- <jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version>
+ <jbossws.jboss712.version>4.2.0-SNAPSHOT</jbossws.jboss712.version>
+ <jbossws.jboss713.version>4.2.0-SNAPSHOT</jbossws.jboss713.version>
<jbossws.jboss720.version>4.2.0-SNAPSHOT</jbossws.jboss720.version>
<jbossws.native.version>4.1.1.Final</jbossws.native.version>
<jboss712.version>7.1.2.Final</jboss712.version>
11 years
JBossWS SVN: r17469 - container/jboss71/branches/jbossws-jboss712.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:26:37 -0400 (Mon, 08 Apr 2013)
New Revision: 17469
Modified:
container/jboss71/branches/jbossws-jboss712/pom.xml
Log:
Update to the next dev version
Modified: container/jboss71/branches/jbossws-jboss712/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss712/pom.xml 2013-04-08 09:21:45 UTC (rev 17468)
+++ container/jboss71/branches/jbossws-jboss712/pom.xml 2013-04-08 09:26:37 UTC (rev 17469)
@@ -35,7 +35,7 @@
<description>JBossWS JBoss AS 7.1.2.Final Integration Parent</description>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss712-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
11 years
JBossWS SVN: r17468 - container/jboss71/branches/jbossws-jboss713.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:21:45 -0400 (Mon, 08 Apr 2013)
New Revision: 17468
Modified:
container/jboss71/branches/jbossws-jboss713/pom.xml
Log:
Move to the next dev cycle
Modified: container/jboss71/branches/jbossws-jboss713/pom.xml
===================================================================
--- container/jboss71/branches/jbossws-jboss713/pom.xml 2013-04-08 09:15:42 UTC (rev 17467)
+++ container/jboss71/branches/jbossws-jboss713/pom.xml 2013-04-08 09:21:45 UTC (rev 17468)
@@ -35,7 +35,7 @@
<description>JBossWS JBoss AS 7.1.3.Final Integration Parent</description>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss713-parent</artifactId>
- <version>4.1.1-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
11 years
JBossWS SVN: r17467 - in container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices: metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:15:42 -0400 (Mon, 08 Apr 2013)
New Revision: 17467
Added:
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java
Modified:
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java
Log:
[JBWS-3524]:fix the ASIL
Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:14:02 UTC (rev 17466)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/JBossWebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:15:42 UTC (rev 17467)
@@ -26,15 +26,16 @@
import java.io.IOException;
import java.net.URL;
+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.WSAttachmentKeys;
import org.jboss.vfs.VirtualFile;
-import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesFactory;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
/**
@@ -50,7 +51,9 @@
final URL jbossWebservicesDescriptorURL = getJBossWebServicesDescriptorURL(deploymentRoot);
if (jbossWebservicesDescriptorURL != null) {
- final JBossWebservicesMetaData jbossWebservicesMD = JBossWebservicesFactory.load(jbossWebservicesDescriptorURL);
+ final JBossWebservicesPropertyReplaceFactory webservicesFactory = new JBossWebservicesPropertyReplaceFactory(
+ jbossWebservicesDescriptorURL, JBossDescriptorPropertyReplacement.propertyReplacer(unit));
+ final JBossWebservicesMetaData jbossWebservicesMD = webservicesFactory.load(jbossWebservicesDescriptorURL);
unit.putAttachment(WSAttachmentKeys.JBOSS_WEBSERVICES_METADATA_KEY, jbossWebservicesMD);
}
}
Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:14:02 UTC (rev 17466)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/WebservicesDescriptorDeploymentProcessor.java 2013-04-08 09:15:42 UTC (rev 17467)
@@ -26,15 +26,16 @@
import java.io.IOException;
import java.net.URL;
+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.WSAttachmentKeys;
import org.jboss.vfs.VirtualFile;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
@@ -51,7 +52,9 @@
final URL webservicesDescriptorURL = getWebServicesDescriptorURL(deploymentRoot);
if (webservicesDescriptorURL != null) {
- final WebservicesMetaData webservicesMD = WebservicesFactory.load(webservicesDescriptorURL);
+ final WebservicesPropertyReplaceFactory webservicesFactory = new WebservicesPropertyReplaceFactory(
+ webservicesDescriptorURL, JBossDescriptorPropertyReplacement.propertyReplacer(unit));
+ final WebservicesMetaData webservicesMD = webservicesFactory.load(webservicesDescriptorURL);
unit.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, webservicesMD);
}
}
Added: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java (rev 0)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java 2013-04-08 09:15:42 UTC (rev 17467)
@@ -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/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/JBossWebservicesPropertyReplaceFactory.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java (rev 0)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java 2013-04-08 09:15:42 UTC (rev 17467)
@@ -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/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/metadata/WebservicesPropertyReplaceFactory.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
11 years
JBossWS SVN: r17466 - in container/jboss72/branches/jbossws-jboss720: server-integration/src/main/java/org/jboss/as/webservices/publish and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-08 05:14:02 -0400 (Mon, 08 Apr 2013)
New Revision: 17466
Modified:
container/jboss72/branches/jbossws-jboss720/pom.xml
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointPublishService.java
Log:
[JBWS-3611]:fix the ASIL and upgrade the spi and common
Modified: container/jboss72/branches/jbossws-jboss720/pom.xml
===================================================================
--- container/jboss72/branches/jbossws-jboss720/pom.xml 2013-04-08 09:10:21 UTC (rev 17465)
+++ container/jboss72/branches/jbossws-jboss720/pom.xml 2013-04-08 09:14:02 UTC (rev 17466)
@@ -51,8 +51,8 @@
<properties>
<jbossws.api.version>1.0.1.Final</jbossws.api.version>
- <jbossws.spi.version>2.1.1.Final</jbossws.spi.version>
- <jbossws.common.version>2.1.1.Final</jbossws.common.version>
+ <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
<jboss.msc.version>1.0.4.GA</jboss.msc.version>
<jboss.version>7.2.0.Final</jboss.version>
<jboss.jaxws.api.version>2.0.1.Final</jboss.jaxws.api.version>
Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-04-08 09:10:21 UTC (rev 17465)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-04-08 09:14:02 UTC (rev 17466)
@@ -60,6 +60,7 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.EndpointState;
import org.jboss.wsf.spi.deployment.WSFServlet;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
import org.jboss.wsf.spi.publish.Context;
import org.jboss.wsf.spi.publish.EndpointPublisher;
@@ -87,18 +88,24 @@
@Override
public Context publish(String context, ClassLoader loader, Map<String, String> urlPatternToClassNameMap) throws Exception {
- return publish(getBaseTarget(), context, loader, urlPatternToClassNameMap, null, null);
+ return publish(getBaseTarget(), context, loader, urlPatternToClassNameMap, null, null, null);
}
@Override
public Context publish(String context, ClassLoader loader, Map<String, String> urlPatternToClassNameMap, WebservicesMetaData metadata) throws Exception {
- return publish(getBaseTarget(), context, loader, urlPatternToClassNameMap, null, metadata);
+ return publish(getBaseTarget(), context, loader, urlPatternToClassNameMap, null, metadata, null);
}
+ @Override
+ public Context publish(String context, ClassLoader loader, Map<String, String> urlPatternToClassNameMap,
+ WebservicesMetaData metadata, JBossWebservicesMetaData jbwsMetadata) throws Exception {
+ return publish(getBaseTarget(), context, loader, urlPatternToClassNameMap, null, metadata, jbwsMetadata);
+ }
+
public Context publish(ServiceTarget target, String context, ClassLoader loader,
- Map<String, String> urlPatternToClassNameMap, JBossWebMetaData jbwmd, WebservicesMetaData metadata)
+ Map<String, String> urlPatternToClassNameMap, JBossWebMetaData jbwmd, WebservicesMetaData metadata, JBossWebservicesMetaData jbwsMetadata)
throws Exception {
- WSEndpointDeploymentUnit unit = new WSEndpointDeploymentUnit(loader, context, urlPatternToClassNameMap, jbwmd, metadata);
+ WSEndpointDeploymentUnit unit = new WSEndpointDeploymentUnit(loader, context, urlPatternToClassNameMap, jbwmd, metadata, jbwsMetadata);
return new Context(context, publish(target, unit));
}
Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2013-04-08 09:10:21 UTC (rev 17465)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2013-04-08 09:14:02 UTC (rev 17466)
@@ -35,6 +35,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.msc.service.ServiceName;
import org.jboss.msc.service.ServiceRegistry;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
public class WSEndpointDeploymentUnit extends SimpleAttachable implements DeploymentUnit {
@@ -42,32 +43,35 @@
private String deploymentName;
public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String,String> urlPatternToClassName, WebservicesMetaData metadata) {
- this(loader, context, urlPatternToClassName, new JBossWebMetaData(), metadata);
- }
+ this(loader, context, urlPatternToClassName, new JBossWebMetaData(), metadata, null);
+ }
- public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String, String> urlPatternToClassName,
- JBossWebMetaData jbossWebMetaData, WebservicesMetaData metadata) {
- this.deploymentName = context + ".deployment";
+ public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String, String> urlPatternToClassName,
+ JBossWebMetaData jbossWebMetaData, WebservicesMetaData metadata, JBossWebservicesMetaData jbwsMetaData) {
+ this.deploymentName = context + ".deployment";
- JAXWSDeployment jaxwsDeployment = new JAXWSDeployment();
- if (jbossWebMetaData == null) {
- jbossWebMetaData = new JBossWebMetaData();
- }
- jbossWebMetaData.setContextRoot(context);
- String endpointName = null;
- String className = null;
- for (String urlPattern : urlPatternToClassName.keySet()) {
- className = urlPatternToClassName.get(urlPattern);
- endpointName = getShortName(className, urlPattern);
- addEndpoint(jbossWebMetaData, jaxwsDeployment, endpointName, className, urlPattern);
- }
- this.putAttachment(WSAttachmentKeys.CLASSLOADER_KEY, loader);
- this.putAttachment(WSAttachmentKeys.JAXWS_ENDPOINTS_KEY, jaxwsDeployment);
- this.putAttachment(WSAttachmentKeys.JBOSSWEB_METADATA_KEY, jbossWebMetaData);
- if (metadata != null) {
- this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
- }
- }
+ JAXWSDeployment jaxwsDeployment = new JAXWSDeployment();
+ if (jbossWebMetaData == null) {
+ jbossWebMetaData = new JBossWebMetaData();
+ }
+ jbossWebMetaData.setContextRoot(context);
+ String endpointName = null;
+ String className = null;
+ for (String urlPattern : urlPatternToClassName.keySet()) {
+ className = urlPatternToClassName.get(urlPattern);
+ endpointName = getShortName(className, urlPattern);
+ addEndpoint(jbossWebMetaData, jaxwsDeployment, endpointName, className, urlPattern);
+ }
+ this.putAttachment(WSAttachmentKeys.CLASSLOADER_KEY, loader);
+ this.putAttachment(WSAttachmentKeys.JAXWS_ENDPOINTS_KEY, jaxwsDeployment);
+ this.putAttachment(WSAttachmentKeys.JBOSSWEB_METADATA_KEY, jbossWebMetaData);
+ if (metadata != null) {
+ this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ }
+ if (jbwsMetaData != null) {
+ this.putAttachment(WSAttachmentKeys.JBOSS_WEBSERVICES_METADATA_KEY, jbwsMetaData);
+ }
+ }
private String getShortName(String className, String urlPattern) {
final StringTokenizer st = new StringTokenizer(urlPattern, "/*");
@@ -95,6 +99,7 @@
}
}
jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointName, className, null, urlPattern, false));
+
}
@Override
Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointPublishService.java
===================================================================
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointPublishService.java 2013-04-08 09:10:21 UTC (rev 17465)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointPublishService.java 2013-04-08 09:14:02 UTC (rev 17466)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
+ * Copyright 2011, Red Hat, Inc., and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -40,6 +40,7 @@
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;
import org.jboss.msc.value.InjectedValue;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
import org.jboss.wsf.spi.publish.Context;
@@ -59,18 +60,20 @@
private final Map<String,String> urlPatternToClassName;
private final JBossWebMetaData jbwmd;
private final WebservicesMetaData wsmd;
+ private final JBossWebservicesMetaData jbwsmd;
private final InjectedValue<VirtualHost> hostInjector = new InjectedValue<VirtualHost>();
-
+
private EndpointPublishService(final String context, final ClassLoader loader,
- final Map<String,String> urlPatternToClassName, JBossWebMetaData jbwmd, WebservicesMetaData wsmd) {
- this.name = WSServices.ENDPOINT_PUBLISH_SERVICE.append(context);
- this.loader = loader;
- this.context = context;
- this.urlPatternToClassName = urlPatternToClassName;
- this.jbwmd = jbwmd;
- this.wsmd = wsmd;
- }
+ final Map<String,String> urlPatternToClassName, JBossWebMetaData jbwmd, WebservicesMetaData wsmd, JBossWebservicesMetaData jbwsmd) {
+ this.name = WSServices.ENDPOINT_PUBLISH_SERVICE.append(context);
+ this.loader = loader;
+ this.context = context;
+ this.urlPatternToClassName = urlPatternToClassName;
+ this.jbwmd = jbwmd;
+ this.wsmd = wsmd;
+ this.jbwsmd = jbwsmd;
+ }
@Override
public Context getValue() {
@@ -90,7 +93,7 @@
ROOT_LOGGER.starting(name);
try {
EndpointPublisherImpl publisher = new EndpointPublisherImpl(hostInjector.getValue().getHost(), true);
- wsctx = publisher.publish(ctx.getChildTarget(), context, loader, urlPatternToClassName, jbwmd, wsmd);
+ wsctx = publisher.publish(ctx.getChildTarget(), context, loader, urlPatternToClassName, jbwmd, wsmd, jbwsmd);
} catch (Exception e) {
throw new StartException(e);
}
@@ -107,33 +110,29 @@
}
}
- public static ServiceBuilder<Context> createServiceBuilder(final ServiceTarget serviceTarget, final String context,
- final ClassLoader loader, final String hostName, final Map<String,String> urlPatternToClassName) {
- return createServiceBuilder(serviceTarget, context, loader, hostName, urlPatternToClassName, null, null);
- }
+ public static ServiceBuilder<Context> createServiceBuilder(final ServiceTarget serviceTarget, final String context, final ClassLoader loader, final String hostName,
+ final Map<String, String> urlPatternToClassName)
+ {
+ return createServiceBuilder(serviceTarget, context, loader, hostName, urlPatternToClassName, null, null, null);
+ }
- public static ServiceBuilder<Context> createServiceBuilder(final ServiceTarget serviceTarget, final String context,
- final ClassLoader loader, final String hostName, final Map<String, String> urlPatternToClassName,
- JBossWebMetaData jbwmd, WebservicesMetaData wsmd) {
- final EndpointPublishService service = new EndpointPublishService(context, loader, urlPatternToClassName, jbwmd, wsmd);
- final ServiceBuilder<Context> builder = serviceTarget.addService(service.getName(), service);
- builder.addDependency(DependencyType.REQUIRED, WSServices.CONFIG_SERVICE);
- builder.addDependency(DependencyType.REQUIRED, WSServices.REGISTRY_SERVICE);
- builder.addDependency(WebSubsystemServices.JBOSS_WEB_HOST.append(hostName), VirtualHost.class,
- service.getHostInjector());
- return builder;
- }
+ public static ServiceBuilder<Context> createServiceBuilder(final ServiceTarget serviceTarget, final String context, final ClassLoader loader, final String hostName,
+ final Map<String, String> urlPatternToClassName, JBossWebMetaData jbwmd, WebservicesMetaData wsmd, JBossWebservicesMetaData jbwsmd)
+ {
+ final EndpointPublishService service = new EndpointPublishService(context, loader, urlPatternToClassName, jbwmd, wsmd, jbwsmd);
+ final ServiceBuilder<Context> builder = serviceTarget.addService(service.getName(), service);
+ builder.addDependency(DependencyType.REQUIRED, WSServices.CONFIG_SERVICE);
+ builder.addDependency(DependencyType.REQUIRED, WSServices.REGISTRY_SERVICE);
+ builder.addDependency(WebSubsystemServices.JBOSS_WEB_HOST.append(hostName), VirtualHost.class, service.getHostInjector());
+ return builder;
+ }
- public static void install(final ServiceTarget serviceTarget, final String context, final ClassLoader loader,
- final String hostName, final Map<String,String> urlPatternToClassName) {
- install(serviceTarget, context, loader, hostName, urlPatternToClassName, null, null);
- }
+ public static void install(final ServiceTarget serviceTarget, final String context, final ClassLoader loader, final String hostName,
+ final Map<String, String> urlPatternToClassName)
+ {
+ ServiceBuilder<Context> builder = createServiceBuilder(serviceTarget, context, loader, hostName, urlPatternToClassName);
+ builder.setInitialMode(Mode.ACTIVE);
+ builder.install();
+ }
- public static void install(final ServiceTarget serviceTarget, final String context, final ClassLoader loader,
- final String hostName, final Map<String,String> urlPatternToClassName, JBossWebMetaData jbwmd, WebservicesMetaData wsmd) {
- ServiceBuilder<Context> builder = createServiceBuilder(serviceTarget, context, loader, hostName, urlPatternToClassName, jbwmd, wsmd);
- builder.setInitialMode(Mode.ACTIVE);
- builder.install();
- }
-
}
11 years
JBossWS SVN: r17465 - in container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices: metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
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
11 years