JBossWS SVN: r8411 - stack/native/trunk/modules/core/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-09 09:52:24 -0400 (Thu, 09 Oct 2008)
New Revision: 8411
Modified:
stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] temporary hot fix, see [JBWS-2340] FYI
Modified: stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-09 13:41:49 UTC (rev 8410)
+++ stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-10-09 13:52:24 UTC (rev 8411)
@@ -103,7 +103,7 @@
<!-- This is hacky DA because endpoint servlet DAs depend on deployers DAs. But servlet DAs and deployers DAs are not in the same DA chain -->
<bean name="WSNativeDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect">
- <property name="provides">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros,StackEndpointHandler</property>
+ <property name="provides">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,StackEndpointHandler</property>
</bean>
<!--
@@ -126,7 +126,6 @@
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
<inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
</property>
<depends>WSDeploymentAspectInstallerJSE</depends>
@@ -140,7 +139,6 @@
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
<inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
</property>
<depends>WSDeploymentAspectInstallerEJB</depends>
@@ -154,7 +152,6 @@
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
<inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
</property>
<depends>WSDeploymentAspectInstallerEndpointAPI</depends>
@@ -172,6 +169,7 @@
<inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
<inject bean="WSNativeRMDeploymentAspect"/>
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
</property>
</bean>
17 years, 2 months
JBossWS SVN: r8410 - stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-09 09:41:49 -0400 (Thu, 09 Oct 2008)
New Revision: 8410
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276/version.properties
Log:
[JBPAPP-1276] Set patch version.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276/version.properties 2008-10-09 13:15:50 UTC (rev 8409)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276/version.properties 2008-10-09 13:41:49 UTC (rev 8410)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_JBPAPP-1216
-repository.id=2.0.1.SP2_JBPAPP-1216
+version.id=2.0.1.SP2_JBPAPP-1276
+repository.id=2.0.1.SP2_JBPAPP-1276
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
17 years, 2 months
JBossWS SVN: r8409 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-09 09:15:50 -0400 (Thu, 09 Oct 2008)
New Revision: 8409
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276/
Log:
[JBPAPP-1276] Create patch branch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1276 (from rev 8408, stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-1216)
17 years, 2 months
JBossWS SVN: r8408 - stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-09 07:01:27 -0400 (Thu, 09 Oct 2008)
New Revision: 8408
Modified:
stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
Log:
[JBWS-2129] Invoking wrapper generation only when required
Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-09 08:15:27 UTC (rev 8407)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-09 11:01:27 UTC (rev 8408)
@@ -27,7 +27,6 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -37,6 +36,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding.Use;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -79,6 +82,7 @@
* @author WS Development Team
* @author Kohsuke Kawaguchi
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.org
* @since 10-May-2007
*/
public class DeploymentDescriptorParserExt<A>
@@ -304,9 +308,12 @@
Invoker invoker = createInvoker(implementorClass);
//Generate wrappers
- WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out);
- ClassLoader newClassLoader = wrapperGenerator.generate(implementationName, classLoader, archiveFile.toURL());
- Thread.currentThread().setContextClassLoader(newClassLoader);
+ if (isWrapperGenerationRequired(implementorClass))
+ {
+ WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out);
+ ClassLoader newClassLoader = wrapperGenerator.generate(implementationName, classLoader, archiveFile.toURL());
+ Thread.currentThread().setContextClassLoader(newClassLoader);
+ }
WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
@@ -318,6 +325,20 @@
}
return adapters;
}
+
+ private boolean isWrapperGenerationRequired(Class<?> endpoint)
+ {
+ WebService webServiceAnnotation = endpoint.getAnnotation(WebService.class);
+ if (webServiceAnnotation == null)
+ return false;
+ String wsdlLocation = webServiceAnnotation.wsdlLocation();
+ if (wsdlLocation != null && !"".equals(wsdlLocation))
+ return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport
+ javax.jws.soap.SOAPBinding soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ if (soapBinding == null)
+ return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped
+ return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
+ }
protected Invoker createInvoker(Class<?> implementorClass)
{
17 years, 2 months
JBossWS SVN: r8407 - in container/jboss50: trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-09 04:15:27 -0400 (Thu, 09 Oct 2008)
New Revision: 8407
Modified:
container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] always start endpoint servlets when web application is deployed
Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-09 01:41:31 UTC (rev 8406)
+++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-09 08:15:27 UTC (rev 8407)
@@ -117,6 +117,16 @@
initParams = new ArrayList<ParamValueMetaData>();
servlet.setInitParam(initParams);
}
+
+ if (servlet.getLoadOnStartup() <= 0)
+ {
+ // [JBWS-2246] hack. We need to start all webservice endpoint servlets because of
+ // wsdl-publish-location feature. This feature generates wsdl to specified file
+ // location on the FS. Without starting the servlets the WSDL will not be published
+ // because publish wsdl deployment aspect is now called in endpoint init servlet
+ // lifecycle method and not in the deployers chain as it was in AS 4.x series.
+ servlet.setLoadOnStartup(1);
+ }
String linkName = servlet.getServletName();
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-09 01:41:31 UTC (rev 8406)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-09 08:15:27 UTC (rev 8407)
@@ -117,6 +117,16 @@
initParams = new ArrayList<ParamValueMetaData>();
servlet.setInitParam(initParams);
}
+
+ if (servlet.getLoadOnStartup() <= 0)
+ {
+ // [JBWS-2246] hack. We need to start all webservice endpoint servlets because of
+ // wsdl-publish-location feature. This feature generates wsdl to specified file
+ // location on the FS. Without starting the servlets the WSDL will not be published
+ // because publish wsdl deployment aspect is now called in endpoint init servlet
+ // lifecycle method and not in the deployers chain as it was in AS 4.x series.
+ servlet.setLoadOnStartup(1);
+ }
String linkName = servlet.getServletName();
17 years, 2 months
JBossWS SVN: r8406 - stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-08 21:41:31 -0400 (Wed, 08 Oct 2008)
New Revision: 8406
Modified:
stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Log:
[JBWS-2129] Further fixes...
Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-09 01:07:44 UTC (rev 8405)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-09 01:41:31 UTC (rev 8406)
@@ -73,7 +73,6 @@
args.add("-d");
args.add(tempDir.getAbsolutePath());
args.add("-verbose");
- args.add(tempDir.getAbsolutePath());
args.add(endpoint);
try
{
@@ -129,7 +128,9 @@
File tempJBossWSDir = new File(getServerConfig().getServerTempDir(), "jbossws");
if (!tempJBossWSDir.exists())
tempJBossWSDir.mkdir();
- String archivePath = archiveUrl.toString();
+ String archivePath = archiveUrl.getPath();
+ if (archivePath.endsWith(File.separator))
+ archivePath = archivePath.substring(0, archivePath.length() - 1);
String archiveName = archivePath.substring(archivePath.lastIndexOf(File.separator));
File tempDir = new File(tempJBossWSDir, archiveName + "-" + new Date().getTime());
if (!tempDir.exists())
@@ -162,7 +163,7 @@
}
urls.addAll(innerUrlList);
}
- else //jar
+ else if (archiveUrl.toString().endsWith(".jar"))
{
if (new File(archiveUrl.getPath()).exists())
{
@@ -175,6 +176,17 @@
urls.add(dest.toURL());
}
}
+ else if (archiveUrl.toString().endsWith(".war/"))
+ {
+ File webInf = new File(archiveUrl.getFile(), "WEB-INF");
+ if (webInf.exists())
+ {
+ urls.add(webInf.toURL());
+ urls.add(new File(webInf, "classes").toURL());
+ }
+ }
+ else
+ throw new WebServiceException("Unsupported deployment archive: " + archiveUrl);
}
catch (Exception e)
{
17 years, 2 months
JBossWS SVN: r8405 - stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-08 21:07:44 -0400 (Wed, 08 Oct 2008)
New Revision: 8405
Modified:
stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java
Log:
Adding getHomeDir
Modified: stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java
===================================================================
--- stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java 2008-10-09 00:55:29 UTC (rev 8404)
+++ stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/StandaloneServerConfig.java 2008-10-09 01:07:44 UTC (rev 8405)
@@ -41,6 +41,11 @@
{
return "3.0.0";
}
+
+ public File getHomeDir()
+ {
+ return new File("/tmp"); // TODO: change to default
+ }
public File getServerTempDir()
{
17 years, 2 months
JBossWS SVN: r8404 - stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-08 20:55:29 -0400 (Wed, 08 Oct 2008)
New Revision: 8404
Modified:
stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Log:
[JBWS-2129] Some fix to the generator
Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-09 00:52:37 UTC (rev 8403)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-09 00:55:29 UTC (rev 8404)
@@ -22,9 +22,6 @@
package org.jboss.wsf.stack.metro;
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.net.URLClassLoader;
@@ -33,9 +30,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
import javax.xml.ws.WebServiceException;
@@ -78,9 +72,7 @@
args.add(getClasspath(classLoader, archiveUrl));
args.add("-d");
args.add(tempDir.getAbsolutePath());
- args.add("-keep"); //TODO!!! sources should not be needed
args.add("-verbose");
- args.add("-s"); //TODO!!! sources should not be needed
args.add(tempDir.getAbsolutePath());
args.add(endpoint);
try
@@ -113,13 +105,13 @@
{
StringBuffer sb = new StringBuffer();
ServerConfig cfg = getServerConfig();
- File clientDir = new File(cfg.getServerTempDir(), "/../../../client/"); //TODO!!!!
- String[] libs = clientDir.list();
+ File clientDir = new File(cfg.getHomeDir(), "client");
+ File[] libs = clientDir.listFiles();
if (libs != null && libs.length > 0)
{
- for (String lib : libs)
+ for (File lib : libs)
{
- sb.append(lib).append(File.pathSeparator);
+ sb.append(lib.getAbsolutePath()).append(File.pathSeparator);
}
sb.delete(sb.length() - 1, sb.length());
}
@@ -127,7 +119,7 @@
for (URL url : urls)
{
sb.append(File.pathSeparator);
- sb.append(url.toString());
+ sb.append(url.getPath());
}
return sb.toString();
}
@@ -148,17 +140,6 @@
private URL[] getURLs(ClassLoader classLoader, URL archiveUrl)
{
List<URL> urls = new LinkedList<URL>();
-
-// //This does not work when deploying through the jbossws testsuite (i.e. not dropping the archive to the deploy dir)
-// if (classLoader instanceof URLClassLoader)
-// {
-// urls.addAll(Arrays.asList(((URLClassLoader)classLoader).getURLs()));
-// }
-// else
-// {
-// urls.add(archiveFile.toURL());
-// }
-
try
{
if (archiveUrl.toString().endsWith(".war"))
17 years, 2 months
JBossWS SVN: r8403 - common/trunk/src/main/java/org/jboss/wsf/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-08 20:52:37 -0400 (Wed, 08 Oct 2008)
New Revision: 8403
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
Log:
Adding getHomeDir to server config
Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2008-10-09 00:51:52 UTC (rev 8402)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2008-10-09 00:52:37 UTC (rev 8403)
@@ -113,22 +113,36 @@
try
{
ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
- return tmpdir;
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
+ return dir;
}
catch (JMException e)
{
return null;
}
}
+
+ public File getHomeDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
public File getServerDataDir()
{
try
{
ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
- return tmpdir;
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
+ return dir;
}
catch (JMException e)
{
17 years, 2 months
JBossWS SVN: r8402 - spi/trunk/src/main/java/org/jboss/wsf/spi/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-08 20:51:52 -0400 (Wed, 08 Oct 2008)
New Revision: 8402
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
Log:
Adding getHomeDir to server config
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2008-10-09 00:19:56 UTC (rev 8401)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2008-10-09 00:51:52 UTC (rev 8402)
@@ -42,6 +42,8 @@
String getImplementationVersion();
+ File getHomeDir();
+
File getServerTempDir();
File getServerDataDir();
17 years, 2 months