JBossWS SVN: r6706 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-04-25 11:15:27 -0400 (Fri, 25 Apr 2008)
New Revision: 6706
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/
Log:
[JBPAPP-809] Branch to patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809 (from rev 6705, stack/native/tags/jbossws-native-2.0.1.SP2)
17 years, 8 months
JBossWS SVN: r6705 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 10:49:10 -0400 (Fri, 25 Apr 2008)
New Revision: 6705
Modified:
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
required attribute defaultconf not set
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:36:01 UTC (rev 6704)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:49:10 UTC (rev 6705)
@@ -384,7 +384,6 @@
</macrodef>
<macrodef name="macro-undeploy-deployer">
- <attribute name="defaultconf"/>
<attribute name="targetdir"/>
<sequential>
<property name="jboss.server.home" value="@{targetdir}/../.."/>
17 years, 8 months
JBossWS SVN: r6704 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 10:36:01 -0400 (Fri, 25 Apr 2008)
New Revision: 6704
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Undeploy integration from as50 deployer
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-04-25 14:24:11 UTC (rev 6703)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-04-25 14:36:01 UTC (rev 6704)
@@ -150,6 +150,7 @@
<target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/>
<delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
</target>
@@ -173,6 +174,7 @@
<target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/>
<delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
</target>
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:24:11 UTC (rev 6703)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:36:01 UTC (rev 6704)
@@ -364,9 +364,6 @@
<!-- delete stale container integration jars -->
<delete>
- <fileset dir="${jboss.server.home}/deployers/jbossws.deployer">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
<fileset dir="${jboss.server.home}/lib">
<include name="jbossws-jboss*.jar"/>
</fileset>
@@ -386,4 +383,17 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-deployer">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <delete>
+ <fileset dir="${jboss.server.home}/deployers/jbossws.deployer">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
</project>
\ No newline at end of file
17 years, 8 months
JBossWS SVN: r6703 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 10:24:11 -0400 (Fri, 25 Apr 2008)
New Revision: 6703
Modified:
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Delete two digit container integration
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:08:28 UTC (rev 6702)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:24:11 UTC (rev 6703)
@@ -146,11 +146,6 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <delete>
- <fileset dir="@{targetdir}">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
@@ -211,11 +206,6 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <delete>
- <fileset dir="@{targetdir}">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
@@ -235,11 +225,6 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <delete>
- <fileset dir="@{targetdir}">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
@@ -372,14 +357,32 @@
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
- <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/>
- <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/>
- <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/>
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+ <!-- delete stale container integration jars -->
<delete>
- <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/>
+ <fileset dir="${jboss.server.home}/deployers/jbossws.deployer">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.server.home}/lib">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
</delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
<delete dir="@{targetdir}"/>
+
</sequential>
</macrodef>
17 years, 8 months
JBossWS SVN: r6702 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 10:08:28 -0400 (Fri, 25 Apr 2008)
New Revision: 6702
Modified:
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Delete two digit container integration
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 13:24:27 UTC (rev 6701)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 14:08:28 UTC (rev 6702)
@@ -14,9 +14,9 @@
<project>
<!--
- These patterns should be common for all supported containers.
- All jars must also be declared in component-info.xml to ensure
- that the AS build uses the same version.
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
-->
<patternset id="jbossws.bin.patternset">
<include name="**/wsconsume.bat"/>
@@ -113,7 +113,7 @@
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
</fileset>
</copy>
</sequential>
@@ -135,51 +135,56 @@
</copy>
</sequential>
</macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deployers -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deployers50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-deployer-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deploy -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deploy50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-(a){jbossid}-container.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <delete>
+ <fileset dir="@{targetdir}">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-(a){jbossid}-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -206,6 +211,11 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
+ <delete>
+ <fileset dir="@{targetdir}">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
@@ -225,6 +235,11 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
+ <delete>
+ <fileset dir="@{targetdir}">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
@@ -246,7 +261,7 @@
</copy>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
@@ -328,7 +343,8 @@
<macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"
+ jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
17 years, 8 months
JBossWS SVN: r6701 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 09:24:27 -0400 (Fri, 25 Apr 2008)
New Revision: 6701
Modified:
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
Log:
cleanup
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 13:15:58 UTC (rev 6700)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 13:24:27 UTC (rev 6701)
@@ -336,9 +336,9 @@
<macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
17 years, 8 months
JBossWS SVN: r6700 - in stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro: log and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-25 09:15:58 -0400 (Fri, 25 Apr 2008)
New Revision: 6700
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
Log:
refactoring + removing @NotNull annotation
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-25 12:18:47 UTC (rev 6699)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-04-25 13:15:58 UTC (rev 6700)
@@ -49,7 +49,6 @@
import org.xml.sax.EntityResolver;
-import com.sun.istack.NotNull;
import com.sun.xml.ws.api.BindingID;
import com.sun.xml.ws.api.WSBinding;
import com.sun.xml.ws.api.server.Container;
@@ -76,10 +75,7 @@
/**
* A copy of DeploymentDescriptorParser
- *
- *
* @see com.sun.xml.ws.transport.http.servlet.WSServletContextListener
- *
* @author WS Development Team
* @author Kohsuke Kawaguchi
* @author Thomas.Diesler(a)jboss.org
@@ -87,6 +83,24 @@
*/
public class DeploymentDescriptorParserExt<A>
{
+ private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http");
+
+ public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime";
+ public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl";
+ public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints");
+ public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint");
+ public static final String ATTR_VERSION = "version";
+ public static final String ATTR_NAME = "name";
+ public static final String ATTR_IMPLEMENTATION = "implementation";
+ public static final String ATTR_WSDL = "wsdl";
+ public static final String ATTR_SERVICE = "service";
+ public static final String ATTR_PORT = "port";
+ public static final String ATTR_URL_PATTERN = "url-pattern";
+ public static final String ATTR_ENABLE_MTOM = "enable-mtom";
+ public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value";
+ public static final String ATTR_BINDING = "binding";
+ public static final String ATTRVALUE_VERSION_1_0 = "2.0";
+
private final Container container;
private final ClassLoader classLoader;
private final ResourceLoader loader;
@@ -156,8 +170,7 @@
* Parses the {@code sun-jaxws.xml} file and configures
* a set of {@link HttpAdapter}s.
*/
- public @NotNull
- List<A> parse(String systemId, InputStream is)
+ public List<A> parse(String systemId, InputStream is)
{
XMLStreamReader reader = null;
try
@@ -194,8 +207,7 @@
* Parses the {@code sun-jaxws.xml} file and configures
* a set of {@link HttpAdapter}s.
*/
- public @NotNull
- List<A> parse(File f) throws IOException
+ public List<A> parse(File f) throws IOException
{
FileInputStream in = new FileInputStream(f);
try
@@ -259,10 +271,10 @@
}
String implementationName = getMandatoryNonEmptyAttribute(reader, attrs, ATTR_IMPLEMENTATION);
- Class<?> implementorClass = getImplementorClass(implementationName, reader);
+ Class<?> implementorClass = getImplementorClass(implementationName, reader, this.classLoader);
EndpointFactory.verifyImplementorClass(implementorClass);
- SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass);
+ SDDocumentSource primaryWSDL = getPrimaryWSDL(reader, attrs, implementorClass, this.classLoader, this.docs);
QName serviceName = getQNameAttribute(attrs, ATTR_SERVICE);
if (serviceName == null)
@@ -284,12 +296,12 @@
// TODO use 'docs' as the metadata. If wsdl is non-null it's the primary.
- boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName);
+ boolean handlersSetInDD = setHandlersAndRoles(binding, reader, serviceName, portName, this.classLoader);
ensureNoContent(reader);
Invoker invoker = createInvoker(implementorClass);
WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
- serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(), false);
+ serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
}
else
@@ -317,7 +329,7 @@
* @return
* is returned with only MTOMFeature set resolving the various precendece rules
*/
- private static WSBinding createBinding(String ddBindingId, Class implClass, String mtomEnabled, String mtomThreshold)
+ private static WSBinding createBinding(String ddBindingId, Class<?> implClass, String mtomEnabled, String mtomThreshold)
{
// Features specified through DD
WebServiceFeatureList features;
@@ -373,9 +385,7 @@
*
* @return returns corresponding API's binding ID or the same lexical
*/
- public static @NotNull
- String getBindingIdForToken(@NotNull
- String lexical)
+ private static String getBindingIdForToken(String lexical)
{
if (lexical.equals("##SOAP11_HTTP"))
{
@@ -407,9 +417,15 @@
* @return
* The pointed WSDL, if any. Otherwise null.
*/
- private SDDocumentSource getPrimaryWSDL(XMLStreamReader xsr, Attributes attrs, Class<?> implementorClass)
+ private static SDDocumentSource getPrimaryWSDL
+ (
+ XMLStreamReader xsr,
+ Attributes attrs,
+ Class<?> implementorClass,
+ ClassLoader loader,
+ Map<String, SDDocumentSource> docs
+ )
{
-
String wsdlFile = getAttribute(attrs, ATTR_WSDL);
if (wsdlFile == null)
{
@@ -418,21 +434,7 @@
if (wsdlFile != null)
{
- /*if (!wsdlFile.startsWith(JAXWS_WSDL_DD_DIR))
- {
- logger.warning("Ignoring wrong wsdl=" + wsdlFile + ". It should start with " + JAXWS_WSDL_DD_DIR + ". Going to generate and publish a new WSDL.");
- return null;
- }*/
-
- URL wsdl;
- try
- {
- wsdl = loader.getResource(wsdlFile);
- }
- catch (MalformedURLException e)
- {
- throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), e, xsr);
- }
+ URL wsdl = loader.getResource(wsdlFile);
if (wsdl == null)
{
throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_WSDL_NOT_FOUND(wsdlFile), xsr);
@@ -452,7 +454,7 @@
/**
* Creates an {@link EntityResolver} that consults {@code /WEB-INF/jax-ws-catalog.xml}.
*/
- private EntityResolver createEntityResolver()
+ private static EntityResolver createEntityResolver(ResourceLoader loader)
{
try
{
@@ -464,7 +466,7 @@
}
}
- protected String getAttribute(Attributes attrs, String name)
+ private static String getAttribute(Attributes attrs, String name)
{
String value = attrs.getValue(name);
if (value != null)
@@ -474,7 +476,7 @@
return value;
}
- protected QName getQNameAttribute(Attributes attrs, String name)
+ private static QName getQNameAttribute(Attributes attrs, String name)
{
String value = getAttribute(attrs, name);
if (value == null || value.equals(""))
@@ -487,7 +489,8 @@
}
}
- protected String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name)
+ /*
+ private static String getNonEmptyAttribute(XMLStreamReader reader, Attributes attrs, String name)
{
String value = getAttribute(attrs, name);
if (value != null && value.equals(""))
@@ -497,7 +500,7 @@
return value;
}
- protected String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name)
+ private static String getMandatoryAttribute(XMLStreamReader reader, Attributes attrs, String name)
{
String value = getAttribute(attrs, name);
if (value == null)
@@ -505,9 +508,9 @@
failWithLocalName("runtime.parser.missing.attribute", reader, name);
}
return value;
- }
+ }*/
- protected String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name)
+ private static String getMandatoryNonEmptyAttribute(XMLStreamReader reader, Attributes attributes, String name)
{
String value = getAttribute(attributes, name);
if (value == null)
@@ -524,20 +527,16 @@
/**
* Parses the handler and role information and sets it
* on the {@link WSBinding}.
- * @return true if <handler-chains> element present in DD
- * false otherwise.
+ * @return true if <handler-chains> element present in DD false otherwise.
*/
- protected boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName)
+ private static boolean setHandlersAndRoles(WSBinding binding, XMLStreamReader reader, QName serviceName, QName portName, ClassLoader classLoader)
{
-
if (XMLStreamReaderUtil.nextElementContent(reader) == XMLStreamConstants.END_ELEMENT || !reader.getName().equals(HandlerChainsModel.QNAME_HANDLER_CHAINS))
{
-
return false;
}
HandlerAnnotationInfo handlerInfo = HandlerChainsModel.parseHandlerFile(reader, classLoader, serviceName, portName, binding);
-
binding.setHandlerChain(handlerInfo.getHandlers());
if (binding instanceof SOAPBinding)
{
@@ -549,7 +548,7 @@
return true;
}
- protected static void ensureNoContent(XMLStreamReader reader)
+ private static void ensureNoContent(XMLStreamReader reader)
{
if (reader.getEventType() != XMLStreamConstants.END_ELEMENT)
{
@@ -557,47 +556,32 @@
}
}
- protected static void fail(String key, XMLStreamReader reader)
+ private static void fail(String key, XMLStreamReader reader)
{
logger.log(Level.SEVERE, key + reader.getLocation().getLineNumber());
throw new ServerRtException(key, Integer.toString(reader.getLocation().getLineNumber()));
}
- protected static void failWithFullName(String key, XMLStreamReader reader)
+ private static void failWithFullName(String key, XMLStreamReader reader)
{
throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getName());
}
- protected static void failWithLocalName(String key, XMLStreamReader reader)
+ private static void failWithLocalName(String key, XMLStreamReader reader)
{
throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName());
}
- protected static void failWithLocalName(String key, XMLStreamReader reader, String arg)
+ private static void failWithLocalName(String key, XMLStreamReader reader, String arg)
{
throw new ServerRtException(key, reader.getLocation().getLineNumber(), reader.getLocalName(), arg);
}
- protected Class loadClass(String name)
- {
- try
- {
- return Class.forName(name, true, classLoader);
- }
- catch (ClassNotFoundException e)
- {
- logger.log(Level.SEVERE, e.getMessage(), e);
- throw new ServerRtException("runtime.parser.classNotFound", name);
- }
- }
-
/**
* Loads the class of the given name.
- *
- * @param xsr
- * Used to report the source location information if there's any error.
+ * @param reader used to report the source location information if there's any error
*/
- private Class getImplementorClass(String name, XMLStreamReader xsr)
+ private static Class<?> getImplementorClass(String name, XMLStreamReader reader, ClassLoader classLoader)
{
try
{
@@ -606,28 +590,7 @@
catch (ClassNotFoundException e)
{
logger.log(Level.SEVERE, e.getMessage(), e);
- throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, xsr);
+ throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, reader);
}
}
-
- public static final String NS_RUNTIME = "http://java.sun.com/xml/ns/jax-ws/ri/runtime";
-
- public static final String JAXWS_WSDL_DD_DIR = "WEB-INF/wsdl";
-
- public static final QName QNAME_ENDPOINTS = new QName(NS_RUNTIME, "endpoints");
- public static final QName QNAME_ENDPOINT = new QName(NS_RUNTIME, "endpoint");
-
- public static final String ATTR_VERSION = "version";
- public static final String ATTR_NAME = "name";
- public static final String ATTR_IMPLEMENTATION = "implementation";
- public static final String ATTR_WSDL = "wsdl";
- public static final String ATTR_SERVICE = "service";
- public static final String ATTR_PORT = "port";
- public static final String ATTR_URL_PATTERN = "url-pattern";
- public static final String ATTR_ENABLE_MTOM = "enable-mtom";
- public static final String ATTR_MTOM_THRESHOLD_VALUE = "mtom-threshold-value";
- public static final String ATTR_BINDING = "binding";
-
- public static final String ATTRVALUE_VERSION_1_0 = "2.0";
- private static final Logger logger = Logger.getLogger(com.sun.xml.ws.util.Constants.LoggingDomain + ".server.http");
}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java 2008-04-25 12:18:47 UTC (rev 6699)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/log/MessageLogPipelineHook.java 2008-04-25 13:15:58 UTC (rev 6700)
@@ -24,7 +24,6 @@
import com.sun.xml.ws.api.server.ServerPipelineHook;
import com.sun.xml.ws.api.pipe.Pipe;
import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext;
-import com.sun.istack.NotNull;
/**
* @author Heiko.Braun(a)jboss.com
@@ -32,10 +31,7 @@
*/
public class MessageLogPipelineHook extends ServerPipelineHook
{
-
- public
- @NotNull
- Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, @NotNull Pipe tail)
+ public Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, Pipe tail)
{
return new DumpPipe("Message Log", System.out, tail);
}
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-25 12:18:47 UTC (rev 6699)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-25 13:15:58 UTC (rev 6700)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.stack.metro.metadata;
-import com.sun.istack.NotNull;
import com.sun.xml.ws.api.server.BoundEndpoint;
import com.sun.xml.ws.api.server.Container;
import com.sun.xml.ws.api.server.Module;
@@ -185,8 +184,7 @@
{
private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();
- public @NotNull
- List<BoundEndpoint> getBoundEndpoints()
+ public List<BoundEndpoint> getBoundEndpoints()
{
return endpoints;
}
17 years, 8 months
JBossWS SVN: r6699 - in stack/cxf/trunk/modules/testsuite: framework-tests and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 08:18:47 -0400 (Fri, 25 Apr 2008)
New Revision: 6699
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
Log:
# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-25 12:17:06 UTC (rev 6698)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-25 12:18:47 UTC (rev 6699)
@@ -108,3 +108,11 @@
# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks
org/jboss/test/ws/jaxws/wsrm/**
+
+# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
+org/jboss/test/ws/jaxws/samples/advanced/retail/**
+org/jboss/test/ws/jaxws/samples/context/**
+org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/swaref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/webservice/**
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-25 12:17:06 UTC (rev 6698)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-25 12:18:47 UTC (rev 6699)
@@ -287,6 +287,14 @@
<!-- [CXF-1522] NPE in ServiceUtils -->
<exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+
+ <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory -->
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude>
</testExcludes>
</configuration>
</plugin>
17 years, 8 months
JBossWS SVN: r6698 - stack/metro/trunk/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 08:17:06 -0400 (Fri, 25 Apr 2008)
New Revision: 6698
Modified:
stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 12:16:08 UTC (rev 6697)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 12:17:06 UTC (rev 6698)
@@ -84,5 +84,11 @@
# [JBAS-5359] mapped-name is required for context of deployment
org/jboss/test/ws/jaxws/jbws1611/**
+# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
+org/jboss/test/ws/jaxws/samples/advanced/retail/**
+org/jboss/test/ws/jaxws/samples/context/**
+org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/swaref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/webservice/**
-
17 years, 8 months
JBossWS SVN: r6697 - stack/native/trunk/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-25 08:16:08 -0400 (Fri, 25 Apr 2008)
New Revision: 6697
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 11:53:56 UTC (rev 6696)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 12:16:08 UTC (rev 6697)
@@ -55,3 +55,10 @@
# [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
org/jboss/test/ws/jaxrpc/jbws720/**
+# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
+org/jboss/test/ws/jaxws/samples/advanced/retail/**
+org/jboss/test/ws/jaxws/samples/context/**
+org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/swaref/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/webservice/**
17 years, 8 months