JBossWS SVN: r9770 - common/trunk/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-09 08:41:31 -0400 (Thu, 09 Apr 2009)
New Revision: 9770
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBWS-2598] fix
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-04-08 15:32:16 UTC (rev 9769)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-04-09 12:41:31 UTC (rev 9770)
@@ -25,6 +25,8 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Enumeration;
import java.util.Properties;
@@ -37,7 +39,7 @@
* Dynamically register the JBossWS entities.
*
* @author Thomas.Diesler(a)jboss.org
- * @since 02-Aug-2006
+ * @author Richard.Opalka(a)jboss.org
*/
public class JBossWSEntityResolver extends JBossEntityResolver
{
@@ -52,40 +54,54 @@
public JBossWSEntityResolver(final String entitiesResource)
{
super();
- // get stream
- InputStream is = this.getClass().getClassLoader().getResourceAsStream(entitiesResource);
- if (is == null)
- throw new IllegalArgumentException("Resource " + entitiesResource + " not found");
-
- // load props
- Properties props = new Properties();
- try
- {
- props.load(is);
- }
- catch (IOException ioe)
- {
- log.error("Cannot read resource: " + entitiesResource, ioe);
- }
- finally
- {
- try { is.close(); } catch (IOException ioe) {} // ignore
- }
-
- if (props.size() == 0)
- throw new IllegalArgumentException("Resource " + entitiesResource + " have no mappings defined");
-
+
+ // load entities
+ Properties props = loadEntitiesMappingFromClasspath(entitiesResource);
+ if (props.size() == 0)
+ throw new IllegalArgumentException("No entities mapping defined in resource file: " + entitiesResource);
+
// register entities
String key = null, val = null;
for (Enumeration<Object> keys = props.keys(); keys.hasMoreElements();)
{
key = (String)keys.nextElement();
val = props.getProperty(key);
+
registerEntity(key, val);
}
}
+ private Properties loadEntitiesMappingFromClasspath(final String entitiesResource)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Properties>()
+ {
+ public Properties run()
+ {
+ InputStream is = this.getClass().getClassLoader().getResourceAsStream(entitiesResource);
+ // get stream
+ if (is == null)
+ throw new IllegalArgumentException("Resource " + entitiesResource + " not found");
+ // load props
+ Properties props = new Properties();
+ try
+ {
+ props.load(is);
+ }
+ catch (IOException ioe)
+ {
+ log.error("Cannot read resource: " + entitiesResource, ioe);
+ }
+ finally
+ {
+ try { is.close(); } catch (IOException ioe) {} // ignore
+ }
+
+ return props;
+ }
+ });
+ }
+
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
{
if(log.isDebugEnabled()) log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]");
15 years, 9 months
JBossWS SVN: r9769 - stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:32:16 -0400 (Wed, 08 Apr 2009)
New Revision: 9769
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties
Log:
[JBPAPP-1869] Support for SOAP 1.2 in wsconsume.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties 2009-04-08 15:29:24 UTC (rev 9768)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties 2009-04-08 15:32:16 UTC (rev 9769)
@@ -24,7 +24,7 @@
wscommons-policy=1.0
# Dependend integration projects
-jbossws-spi=1.0.0.GA_CP01-brew
+jbossws-spi=1.0.0.GA_CP01_JBPAPP-1869
jbossws-common=1.0.0.GA_CP02-brew
jbossws-framework=2.0.1.GA_CP02-brew
jbossws-jboss40=2.0.1.GA
15 years, 9 months
JBossWS SVN: r9768 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869: src and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:29:24 -0400 (Wed, 08 Apr 2009)
New Revision: 9768
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/src/
stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties
Log:
[JBPAPP-1869] Support for SOAP 1.2 in wsconsume.
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/src
___________________________________________________________________
Name: svn:externals
- test-framework http://anonsvn.jboss.org/repos/jbossws/framework/tags/jbossws-framework-2...
+ test-framework https://svn.jboss.org/repos/jbossws/framework/branches/jbossws-framework-...
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2009-04-08 15:20:29 UTC (rev 9767)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2009-04-08 15:29:24 UTC (rev 9768)
@@ -41,6 +41,7 @@
{
private List<File> bindingFiles;
private File catalog;
+ private boolean extension;
private boolean generateSource;
private File outputDir = new File("output");
private File sourceDir;
@@ -63,6 +64,12 @@
}
@Override
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
+ @Override
public void setGenerateSource(boolean generateSource)
{
this.generateSource = generateSource;
@@ -128,6 +135,11 @@
args.add(catalog.getAbsolutePath());
}
+ if (extension)
+ {
+ args.add("-extension");
+ }
+
if (generateSource)
{
args.add("-keep");
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties 2009-04-08 15:20:29 UTC (rev 9767)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/version.properties 2009-04-08 15:29:24 UTC (rev 9768)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP04
-repository.id=2.0.1.SP2_CP04
+version.id=2.0.1.SP2_CP04_JBPAPP-1869
+repository.id=2.0.1.SP2_CP04_JBPAPP-1869
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
15 years, 9 months
JBossWS SVN: r9767 - in framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869: src/test/java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:20:29 -0400 (Wed, 08 Apr 2009)
New Revision: 9767
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties
Log:
[JBPAPP-1869] Support for SOAP 1.2 in wsconsume.
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-04-08 15:13:02 UTC (rev 9766)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-04-08 15:20:29 UTC (rev 9767)
@@ -21,23 +21,25 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
-import junit.framework.TestCase;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
+import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
-import java.lang.reflect.Method;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+import junit.framework.TestCase;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
/**
* Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be execurted below 'output/tests'.
+ * NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
@@ -276,6 +278,23 @@
}
+ /**
+ * Tests the SOAP 1.2 binding extension
+ *
+ */
+ public void testSOAP12Extension() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
+ consumer.setGenerateSource(true);
+ consumer.setExtension(true);
+ consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl");
+ File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java");
+ assertTrue("SEI not generated", sei.exists());
+ File service = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/TestService.java");
+ assertTrue("Service not generated", service.exists());
+ }
+
private void consumeWSDL() throws Exception
{
consumer.setOutputDirectory(outputDirectory);
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl (from rev 9490, framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl)
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl (rev 0)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl 2009-04-08 15:20:29 UTC (rev 9767)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService"
+ targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
+ <types/>
+ <message name="EndpointInterface_echo">
+ <part name="String_1" type="xsd:string"/>
+ </message>
+ <message name="EndpointInterface_echoResponse">
+ <part name="result" type="xsd:string"/>
+ </message>
+ <portType name="EndpointInterface">
+ <operation name="echo" parameterOrder="String_1">
+ <input message="tns:EndpointInterface_echo"/>
+ <output message="tns:EndpointInterface_echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="echo">
+ <soap12:operation soapAction=""/>
+ <input>
+ <soap12:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </input>
+ <output>
+ <soap12:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="TestService">
+ <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+ <soap12:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties 2009-04-08 15:13:02 UTC (rev 9766)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties 2009-04-08 15:20:29 UTC (rev 9767)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA_CP02
-repository.id=2.0.1.GA_CP02
+version.id=2.0.1.GA_CP02_JBPAPP-1869
+repository.id=2.0.1.GA_CP02_JBPAPP-1869
implementation.title=JBoss Web Services - Framework
implementation.url=http://www.jboss.org/products/jbossws
@@ -15,7 +15,7 @@
# Thirdparty library versions
jbossws-common=1.0.0.GA_CP02-brew
-jbossws-spi=1.0.0.GA_CP01-brew
+jbossws-spi=1.0.0.GA_CP01_JBPAPP-1869
dom4j=1.6.1
jboss-common-core=2.0.2.GA
15 years, 9 months
JBossWS SVN: r9766 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:13:02 -0400 (Wed, 08 Apr 2009)
New Revision: 9766
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/
Log:
[JBPAPP-1869] Branch for patch.
Copied: framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869 (from rev 9765, framework/tags/jbossws-framework-2.0.1.GA_CP02)
15 years, 9 months
JBossWS SVN: r9765 - in spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869: src/main/java/org/jboss/wsf/spi/tools and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:06:00 -0400 (Wed, 08 Apr 2009)
New Revision: 9765
Modified:
spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/version.properties
Log:
[JBPAPP-1869] Support for SOAP 1.2 in wsconsume.
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2009-04-08 15:03:23 UTC (rev 9764)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2009-04-08 15:06:00 UTC (rev 9765)
@@ -109,6 +109,13 @@
public abstract void setSourceDirectory(File directory);
/**
+ * Enables/Disables SOAP 1.2 binding extension
+ *
+ * @param extension whether or not to enable SOAP 1.2 binding extension
+ */
+ public abstract void setExtension(boolean extension);
+
+ /**
* Enables/Disables Java source generation.
*
* @param generateSource whether or not to generate Java source.
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2009-04-08 15:03:23 UTC (rev 9764)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2009-04-08 15:06:00 UTC (rev 9765)
@@ -53,6 +53,7 @@
* <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation</td><td>generated</td></tr>
* <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr>
* <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr>
+ * <tr><td>extension</td><td>Enable SOAP 1.2 binding extension.</td><td>false</td></tr>
* <tr><td>target</td><td>The JAX-WS specification target</td><td>2.0 | 2.1</td></tr>
* <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr>
* <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr>
@@ -88,6 +89,7 @@
private String wsdlLocation;
private String targetPackage;
private boolean keep;
+ private boolean extension;
private boolean verbose;
private boolean fork;
private boolean debug;
@@ -129,6 +131,11 @@
this.keep = keep;
}
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
public void setSourcedestdir(File sourcedestdir)
{
this.sourcedestdir = sourcedestdir;
@@ -178,6 +185,7 @@
{
WSContractConsumer importer = WSContractConsumer.newInstance();
importer.setGenerateSource(keep);
+ importer.setExtension(extension);
if (destdir != null)
importer.setOutputDirectory(destdir);
if (sourcedestdir != null)
@@ -261,6 +269,9 @@
if (keep)
command.createArgument().setValue("-k");
+
+ if (extension)
+ command.createArgument().setValue("-e");
for (File file : bindingFiles)
{
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2009-04-08 15:03:23 UTC (rev 9764)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2009-04-08 15:06:00 UTC (rev 9765)
@@ -51,6 +51,7 @@
* -q, --quiet Be somewhat more quiet
* -v, --verbose Show full exception stack traces
* -l, --load-consumer Load the consumer and exit (debug utility)
+ * -e, --extension Enable SOAP 1.2 binding extension
* </pre>
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
@@ -66,6 +67,7 @@
private boolean quiet = false;
private boolean verbose = false;
private boolean loadConsumer = false;
+ private boolean extension = false;
private File outputDir = new File("output");
private File sourceDir = null;
private String target = null;
@@ -81,7 +83,7 @@
private URL parseArguments(String[] args)
{
- String shortOpts = "b:c:p:w:o:s:t:khqvl";
+ String shortOpts = "b:c:p:w:o:s:t:khqvle";
LongOpt[] longOpts =
{
new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
@@ -95,6 +97,7 @@
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'),
new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'),
+ new LongOpt("extension", LongOpt.NO_ARGUMENT, null, 'e'),
new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'),
};
@@ -137,6 +140,9 @@
case 'l':
loadConsumer = true;
break;
+ case 'e':
+ extension = true;
+ break;
case 'h':
printHelp();
System.exit(0);
@@ -190,6 +196,7 @@
importer.setGenerateSource(generateSource);
importer.setOutputDirectory(outputDir);
+ importer.setExtension(extension);
if (sourceDir != null)
importer.setSourceDirectory(sourceDir);
@@ -254,6 +261,7 @@
out.println(" -q, --quiet Be somewhat more quiet");
out.println(" -v, --verbose Show full exception stack traces");
out.println(" -l, --load-consumer Load the consumer and exit (debug utility)");
+ out.println(" -e, --extension Enable SOAP 1.2 binding extension");
out.flush();
}
}
Modified: spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/version.properties
===================================================================
--- spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/version.properties 2009-04-08 15:03:23 UTC (rev 9764)
+++ spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/version.properties 2009-04-08 15:06:00 UTC (rev 9765)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.0.GA_CP01
-repository.id=1.0.0.GA_CP01
+version.id=1.0.0.GA_CP01_JBPAPP-1869
+repository.id=1.0.0.GA_CP01_JBPAPP-1869
implementation.title=JBoss Web Services - SPI
implementation.url=http://www.jboss.org/products/jbossws
15 years, 9 months
JBossWS SVN: r9764 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:03:23 -0400 (Wed, 08 Apr 2009)
New Revision: 9764
Added:
spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869/
Log:
[JBPAPP-1869] Branch for patch.
Copied: spi/branches/jbossws-spi-1.0.0.GA_CP01_JBPAPP-1869 (from rev 9763, spi/tags/jbossws-spi-1.0.0.GA_CP01)
15 years, 9 months
JBossWS SVN: r9763 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 09:10:15 -0400 (Wed, 08 Apr 2009)
New Revision: 9763
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869/
Log:
[JBPAPP-1869] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1869 (from rev 9762, stack/native/tags/jbossws-native-2.0.1.SP2_CP04)
15 years, 9 months
JBossWS SVN: r9762 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-08 08:34:55 -0400 (Wed, 08 Apr 2009)
New Revision: 9762
Modified:
framework/trunk/hudson/jboss/bin/runjboss.sh
Log:
[JBAS-6744] Fixing jbossws hudson regression
Modified: framework/trunk/hudson/jboss/bin/runjboss.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/runjboss.sh 2009-04-08 12:32:16 UTC (rev 9761)
+++ framework/trunk/hudson/jboss/bin/runjboss.sh 2009-04-08 12:34:55 UTC (rev 9762)
@@ -111,6 +111,9 @@
# Setup JBoss sepecific properties
JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
+# This should be removed when JBoss configuration XML files can be validated JBAS-6744
+JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
+
# Setup the java endorsed dirs
JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
15 years, 9 months
JBossWS SVN: r9761 - in container/jboss50/branches: jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-08 08:32:16 -0400 (Wed, 08 Apr 2009)
New Revision: 9761
Modified:
container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2074] more work on dynamic endpoint
Modified: container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 11:07:16 UTC (rev 9760)
+++ container/jboss50/branches/jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 12:32:16 UTC (rev 9761)
@@ -55,16 +55,15 @@
{
super.create(dep);
- DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
- if (unit == null)
- throw new IllegalStateException();
+ JBossWebMetaData webMD = dep.getAttachment(JBossWebMetaData.class);
+ if (webMD == null)
+ throw new IllegalStateException("JBossWebMetaData not found");
List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
DeploymentType deploymentType = dep.getType();
if (deploymentType == DeploymentType.JAXWS_JSE)
{
- JBossWebMetaData webMD = unit.getAttachment(JBossWebMetaData.class);
injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
}
else if (deploymentType == DeploymentType.JAXWS_EJB3)
Modified: container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 11:07:16 UTC (rev 9760)
+++ container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 12:32:16 UTC (rev 9761)
@@ -198,7 +198,7 @@
</bean>
<bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
+ <property name="requires">WebMetaData</property>
<property name="provides">InjectionMetaData</property>
</bean>
@@ -252,6 +252,7 @@
<bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect">
<property name="requires">ContextProperties, StackDescriptor</property>
+ <property name="provides">WebMetaData</property>
<property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
</bean>
@@ -345,6 +346,7 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSDynamicEndpointDeploymentAspect"/>
+ <inject bean="WSInjectionMetaDataDeploymentAspect"/>
<inject bean="WSEndpointAPIDeploymentAspect"/>
<inject bean="WSVirtualHostDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
Modified: container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 11:07:16 UTC (rev 9760)
+++ container/jboss50/branches/jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/InjectionMetaDataDeploymentAspect.java 2009-04-08 12:32:16 UTC (rev 9761)
@@ -55,16 +55,15 @@
{
super.create(dep);
- DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
- if (unit == null)
- throw new IllegalStateException();
+ JBossWebMetaData webMD = dep.getAttachment(JBossWebMetaData.class);
+ if (webMD == null)
+ throw new IllegalStateException("JBossWebMetaData not found");
List<InjectionMetaData> injectionMD = new LinkedList<InjectionMetaData>();
DeploymentType deploymentType = dep.getType();
if (deploymentType == DeploymentType.JAXWS_JSE)
{
- JBossWebMetaData webMD = unit.getAttachment(JBossWebMetaData.class);
injectionMD.addAll(buildInjectionMetaData(webMD.getEnvironmentEntries()));
}
else if (deploymentType == DeploymentType.JAXWS_EJB3)
Modified: container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 11:07:16 UTC (rev 9760)
+++ container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-08 12:32:16 UTC (rev 9761)
@@ -198,7 +198,7 @@
</bean>
<bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
+ <property name="requires">WebMetaData</property>
<property name="provides">InjectionMetaData</property>
</bean>
@@ -252,6 +252,7 @@
<bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect">
<property name="requires">ContextProperties, StackDescriptor</property>
+ <property name="provides">WebMetaData</property>
<property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
</bean>
@@ -345,6 +346,7 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSDynamicEndpointDeploymentAspect"/>
+ <inject bean="WSInjectionMetaDataDeploymentAspect"/>
<inject bean="WSEndpointAPIDeploymentAspect"/>
<inject bean="WSVirtualHostDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
15 years, 9 months