JBossWS SVN: r17151 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-20 11:23:07 -0500 (Thu, 20 Dec 2012)
New Revision: 17151
Added:
common/branches/jbossws-common-2.1.1.Final/
Log:
Branching for releasing 2.1.1.Final
12 years, 1 month
JBossWS SVN: r17150 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-20 11:21:22 -0500 (Thu, 20 Dec 2012)
New Revision: 17150
Added:
spi/branches/jbossws-spi-2.1.1.Final/
Log:
Branching releasing 2.1.1.Final
12 years, 1 month
JBossWS SVN: r17149 - in container/jboss71/branches: jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/publish and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-12-20 06:44:19 -0500 (Thu, 20 Dec 2012)
New Revision: 17149
Modified:
container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java
container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java
container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
Log:
[JBWS-3568] endpoint short name is derived from URL pattern
Modified: container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java
===================================================================
--- container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java 2012-12-19 17:19:35 UTC (rev 17148)
+++ container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java 2012-12-20 11:44:19 UTC (rev 17149)
@@ -30,15 +30,17 @@
private final boolean isDeclared;
public POJOEndpoint(final String name, final String className, final String urlPattern) {
- super(name, className);
- this.urlPattern = urlPattern;
- isDeclared = true;
+ this(name, className, urlPattern, true);
}
public POJOEndpoint(final String className, final String urlPattern) {
- super(className, className);
+ this(className, className, urlPattern, false);
+ }
+
+ public POJOEndpoint(final String name, final String className, final String urlPattern, boolean isDeclared) {
+ super(name, className);
this.urlPattern = urlPattern;
- this.isDeclared = false;
+ this.isDeclared = isDeclared;
}
public String getUrlPattern() {
Modified: container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
===================================================================
--- container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2012-12-19 17:19:35 UTC (rev 17148)
+++ container/jboss71/branches/jbossws-jboss711/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2012-12-20 11:44:19 UTC (rev 17149)
@@ -22,6 +22,7 @@
package org.jboss.as.webservices.publish;
import java.util.Map;
+import java.util.StringTokenizer;
import org.jboss.as.controller.PathElement;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -41,21 +42,50 @@
private String deploymentName;
public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String,String> urlPatternToClassName, WebservicesMetaData metadata) {
+ this(loader, context, urlPatternToClassName, new JBossWebMetaData(), metadata);
+ }
+
+ public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String, String> urlPatternToClassName,
+ JBossWebMetaData jbossWebMetaData, WebservicesMetaData metadata) {
this.deploymentName = context + ".deployment";
- JBossWebMetaData jbossWebMetaData = new JBossWebMetaData();
JAXWSDeployment jaxwsDeployment = new JAXWSDeployment();
+ if (jbossWebMetaData == null) {
+ jbossWebMetaData = new JBossWebMetaData();
+ }
jbossWebMetaData.setContextRoot(context);
+ String endpointName = null;
+ String className = null;
for (String urlPattern : urlPatternToClassName.keySet()) {
- addEndpoint(jbossWebMetaData, jaxwsDeployment, urlPatternToClassName.get(urlPattern), urlPattern);
+ 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);
- this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ if (metadata != null) {
+ this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ }
}
- private void addEndpoint(JBossWebMetaData jbossWebMetaData, JAXWSDeployment jaxwsDeployment, String className, String urlPattern) {
+ private String getShortName(String className, String urlPattern) {
+ final StringTokenizer st = new StringTokenizer(urlPattern, "/*");
+ final StringBuilder sb = new StringBuilder();
+ String token = null;
+ boolean first = true;
+ while (st.hasMoreTokens()) {
+ token = st.nextToken();
+ if (token != null) {
+ if (!first) sb.append('.');
+ sb.append(token);
+ first = false;
+ }
+ }
+ return first ? className : sb.toString();
+ }
+
+ private void addEndpoint(JBossWebMetaData jbossWebMetaData, JAXWSDeployment jaxwsDeployment, String endpointName, String className, String urlPattern) {
if (urlPattern == null) {
urlPattern = "/*";
} else {
@@ -64,7 +94,7 @@
urlPattern = "/" + urlPattern;
}
}
- jaxwsDeployment.addEndpoint(new POJOEndpoint(className, urlPattern));
+ jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointName, className, urlPattern, false));
}
@Override
Modified: container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java
===================================================================
--- container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java 2012-12-19 17:19:35 UTC (rev 17148)
+++ container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java 2012-12-20 11:44:19 UTC (rev 17149)
@@ -30,15 +30,17 @@
private final boolean isDeclared;
public POJOEndpoint(final String name, final String className, final String urlPattern) {
- super(name, className);
- this.urlPattern = urlPattern;
- isDeclared = true;
+ this(name, className, urlPattern, true);
}
public POJOEndpoint(final String className, final String urlPattern) {
- super(className, className);
+ this(className, className, urlPattern, false);
+ }
+
+ public POJOEndpoint(final String name, final String className, final String urlPattern, boolean isDeclared) {
+ super(name, className);
this.urlPattern = urlPattern;
- this.isDeclared = false;
+ this.isDeclared = isDeclared;
}
public String getUrlPattern() {
Modified: container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
===================================================================
--- container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2012-12-19 17:19:35 UTC (rev 17148)
+++ container/jboss71/branches/jbossws-jboss712/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2012-12-20 11:44:19 UTC (rev 17149)
@@ -22,6 +22,7 @@
package org.jboss.as.webservices.publish;
import java.util.Map;
+import java.util.StringTokenizer;
import org.jboss.as.controller.PathElement;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -41,21 +42,50 @@
private String deploymentName;
public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String,String> urlPatternToClassName, WebservicesMetaData metadata) {
+ this(loader, context, urlPatternToClassName, new JBossWebMetaData(), metadata);
+ }
+
+ public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String, String> urlPatternToClassName,
+ JBossWebMetaData jbossWebMetaData, WebservicesMetaData metadata) {
this.deploymentName = context + ".deployment";
- JBossWebMetaData jbossWebMetaData = new JBossWebMetaData();
JAXWSDeployment jaxwsDeployment = new JAXWSDeployment();
+ if (jbossWebMetaData == null) {
+ jbossWebMetaData = new JBossWebMetaData();
+ }
jbossWebMetaData.setContextRoot(context);
+ String endpointName = null;
+ String className = null;
for (String urlPattern : urlPatternToClassName.keySet()) {
- addEndpoint(jbossWebMetaData, jaxwsDeployment, urlPatternToClassName.get(urlPattern), urlPattern);
+ 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);
- this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ if (metadata != null) {
+ this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ }
}
- private void addEndpoint(JBossWebMetaData jbossWebMetaData, JAXWSDeployment jaxwsDeployment, String className, String urlPattern) {
+ private String getShortName(String className, String urlPattern) {
+ final StringTokenizer st = new StringTokenizer(urlPattern, "/*");
+ final StringBuilder sb = new StringBuilder();
+ String token = null;
+ boolean first = true;
+ while (st.hasMoreTokens()) {
+ token = st.nextToken();
+ if (token != null) {
+ if (!first) sb.append('.');
+ sb.append(token);
+ first = false;
+ }
+ }
+ return first ? className : sb.toString();
+ }
+
+ private void addEndpoint(JBossWebMetaData jbossWebMetaData, JAXWSDeployment jaxwsDeployment, String endpointName, String className, String urlPattern) {
if (urlPattern == null) {
urlPattern = "/*";
} else {
@@ -64,7 +94,7 @@
urlPattern = "/" + urlPattern;
}
}
- jaxwsDeployment.addEndpoint(new POJOEndpoint(className, urlPattern));
+ jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointName, className, urlPattern, false));
}
@Override
Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java
===================================================================
--- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java 2012-12-19 17:19:35 UTC (rev 17148)
+++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/POJOEndpoint.java 2012-12-20 11:44:19 UTC (rev 17149)
@@ -30,15 +30,17 @@
private final boolean isDeclared;
public POJOEndpoint(final String name, final String className, final String urlPattern) {
- super(name, className);
- this.urlPattern = urlPattern;
- isDeclared = true;
+ this(name, className, urlPattern, true);
}
public POJOEndpoint(final String className, final String urlPattern) {
- super(className, className);
+ this(className, className, urlPattern, false);
+ }
+
+ public POJOEndpoint(final String name, final String className, final String urlPattern, boolean isDeclared) {
+ super(name, className);
this.urlPattern = urlPattern;
- this.isDeclared = false;
+ this.isDeclared = isDeclared;
}
public String getUrlPattern() {
Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java
===================================================================
--- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2012-12-19 17:19:35 UTC (rev 17148)
+++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/WSEndpointDeploymentUnit.java 2012-12-20 11:44:19 UTC (rev 17149)
@@ -22,6 +22,7 @@
package org.jboss.as.webservices.publish;
import java.util.Map;
+import java.util.StringTokenizer;
import org.jboss.as.controller.PathElement;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -41,21 +42,50 @@
private String deploymentName;
public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String,String> urlPatternToClassName, WebservicesMetaData metadata) {
+ this(loader, context, urlPatternToClassName, new JBossWebMetaData(), metadata);
+ }
+
+ public WSEndpointDeploymentUnit(ClassLoader loader, String context, Map<String, String> urlPatternToClassName,
+ JBossWebMetaData jbossWebMetaData, WebservicesMetaData metadata) {
this.deploymentName = context + ".deployment";
- JBossWebMetaData jbossWebMetaData = new JBossWebMetaData();
JAXWSDeployment jaxwsDeployment = new JAXWSDeployment();
+ if (jbossWebMetaData == null) {
+ jbossWebMetaData = new JBossWebMetaData();
+ }
jbossWebMetaData.setContextRoot(context);
+ String endpointName = null;
+ String className = null;
for (String urlPattern : urlPatternToClassName.keySet()) {
- addEndpoint(jbossWebMetaData, jaxwsDeployment, urlPatternToClassName.get(urlPattern), urlPattern);
+ 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);
- this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ if (metadata != null) {
+ this.putAttachment(WSAttachmentKeys.WEBSERVICES_METADATA_KEY, metadata);
+ }
}
- private void addEndpoint(JBossWebMetaData jbossWebMetaData, JAXWSDeployment jaxwsDeployment, String className, String urlPattern) {
+ private String getShortName(String className, String urlPattern) {
+ final StringTokenizer st = new StringTokenizer(urlPattern, "/*");
+ final StringBuilder sb = new StringBuilder();
+ String token = null;
+ boolean first = true;
+ while (st.hasMoreTokens()) {
+ token = st.nextToken();
+ if (token != null) {
+ if (!first) sb.append('.');
+ sb.append(token);
+ first = false;
+ }
+ }
+ return first ? className : sb.toString();
+ }
+
+ private void addEndpoint(JBossWebMetaData jbossWebMetaData, JAXWSDeployment jaxwsDeployment, String endpointName, String className, String urlPattern) {
if (urlPattern == null) {
urlPattern = "/*";
} else {
@@ -64,7 +94,7 @@
urlPattern = "/" + urlPattern;
}
}
- jaxwsDeployment.addEndpoint(new POJOEndpoint(className, urlPattern));
+ jaxwsDeployment.addEndpoint(new POJOEndpoint(endpointName, className, urlPattern, false));
}
@Override
12 years, 1 month
JBossWS SVN: r17148 - container/jboss71/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-19 12:19:35 -0500 (Wed, 19 Dec 2012)
New Revision: 17148
Removed:
container/jboss71/branches/jbossws-jboss713-JBWS3551/
Log:
Removing branch not used anymore
12 years, 1 month
JBossWS SVN: r17147 - container/jboss71/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-19 12:18:45 -0500 (Wed, 19 Dec 2012)
New Revision: 17147
Removed:
container/jboss71/branches/JBWS3551-jboss712/
Log:
Removing branch not used anymore
12 years, 1 month
JBossWS SVN: r17146 - shared-testsuite/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-19 12:17:03 -0500 (Wed, 19 Dec 2012)
New Revision: 17146
Removed:
shared-testsuite/branches/JBWS3551/
Log:
Removing branch not used anymore
12 years, 1 month
JBossWS SVN: r17145 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-19 12:15:36 -0500 (Wed, 19 Dec 2012)
New Revision: 17145
Removed:
stack/cxf/branches/JBWS3551/
Log:
removing branch not used anymore
12 years, 1 month
JBossWS SVN: r17144 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-19 12:13:42 -0500 (Wed, 19 Dec 2012)
New Revision: 17144
Removed:
common/branches/JBWS3551/
Log:
Removing branch not used anymore
12 years, 1 month
JBossWS SVN: r17143 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-12-19 12:12:53 -0500 (Wed, 19 Dec 2012)
New Revision: 17143
Removed:
spi/branches/JBWS3551/
Log:
Removing branch not used anymore
12 years, 1 month
JBossWS SVN: r17142 - stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-12-19 09:38:51 -0500 (Wed, 19 Dec 2012)
New Revision: 17142
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
Log:
minimize synchronized section code
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2012-12-19 14:07:26 UTC (rev 17141)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2012-12-19 14:38:51 UTC (rev 17142)
@@ -97,10 +97,10 @@
public synchronized HttpServerEngine createHttpServerEngine(String host, int port, String protocol)
throws IOException
{
+ LOG.fine("Creating HttpServer Engine for port " + port + ".");
HttpServerEngine ref = null;
synchronized(portMap)
{
- LOG.fine("Creating HttpServer Engine for port " + port + ".");
ref = retrieveHttpServerEngine(port);
if (null == ref)
{
12 years, 1 month