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);