Author: richard.opalka(a)jboss.com
Date: 2009-08-16 18:49:17 -0400 (Sun, 16 Aug 2009)
New Revision: 10539
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PublishLocationAdapter.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java
Log:
[JBWS-2320] svn merge -r 10475:10532
https://svn.jboss.org/repos/jbossws/spi/branches/ropalka
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2009-08-14 11:28:43
UTC (rev 10538)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2009-08-16 22:49:17
UTC (rev 10539)
@@ -55,9 +55,9 @@
void setContextRoot(String contextRoot);
/** Get the virtual hosts for this service */
- String[] getVirtualHosts();
+ List<String> getVirtualHosts();
/** Set the virtual hosts for this service */
- void setVirtualHosts(String[] virtualHosts);
+ void setVirtualHosts(List<String> virtualHosts);
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java 2009-08-14
11:28:43 UTC (rev 10538)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java 2009-08-16
22:49:17 UTC (rev 10539)
@@ -25,10 +25,8 @@
* Known invocation types.
*
* @author Heiko.Braun(a)jboss.com
- * Created: Jul 19, 2007
*/
public enum InvocationType
{
- JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_MDB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_MDB3,
- @Deprecated JAXWS_EJB21;
+ JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_MDB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_MDB3
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2009-08-14
11:28:43 UTC (rev 10538)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2009-08-16
22:49:17 UTC (rev 10539)
@@ -115,13 +115,12 @@
public String getWsdlPublishLocationByName(String name)
{
- String publishLocation = (publishLocationAdapter != null ?
publishLocationAdapter.getWsdlPublishLocationByName(name) : null);
- return publishLocation;
-
+ if (this.publishLocationAdapter != null)
+ {
+ return this.publishLocationAdapter.getWsdlPublishLocationByName(name);
+ }
+
+ return null;
}
- public interface PublishLocationAdapter
- {
- String getWsdlPublishLocationByName(String name);
- }
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java
===================================================================
---
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2009-08-14
11:28:43 UTC (rev 10538)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2009-08-16
22:49:17 UTC (rev 10539)
@@ -127,15 +127,12 @@
public String getWsdlPublishLocationByName(String name)
{
- String publishLocation = null;
- if (publishLocationAdapter != null)
- publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name);
- return publishLocation;
-
+ if (this.publishLocationAdapter != null)
+ {
+ return this.publishLocationAdapter.getWsdlPublishLocationByName(name);
+ }
+
+ return null;
}
- public interface PublishLocationAdapter
- {
- String getWsdlPublishLocationByName(String name);
- }
}
Copied:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PublishLocationAdapter.java (from
rev 10532,
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PublishLocationAdapter.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PublishLocationAdapter.java
(rev 0)
+++
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PublishLocationAdapter.java 2009-08-16
22:49:17 UTC (rev 10539)
@@ -0,0 +1,19 @@
+package org.jboss.wsf.spi.metadata.j2ee;
+
+/**
+ * WSDL publish location adapter.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface PublishLocationAdapter
+{
+
+ /**
+ * Gets WSDL publish location for specified endpoint name.
+ *
+ * @param endpointName endpoint name
+ * @return WSDL publish location
+ */
+ public String getWsdlPublishLocationByName(String endpointName);
+
+}
\ No newline at end of file