JBossWS SVN: r15072 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-11 04:36:03 -0400 (Tue, 11 Oct 2011)
New Revision: 15072
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
Log:
initialization flag is modifyable
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java 2011-10-11 07:11:06 UTC (rev 15071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java 2011-10-11 08:36:03 UTC (rev 15072)
@@ -31,4 +31,6 @@
boolean isInitialized();
+ void setInitialized();
+
}
14 years, 2 months
JBossWS SVN: r15071 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 03:11:06 -0400 (Tue, 11 Oct 2011)
New Revision: 15071
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3366] Fixing native core version from 710 in testsuite classpath
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-11 07:09:02 UTC (rev 15070)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-11 07:11:06 UTC (rev 15071)
@@ -1237,7 +1237,7 @@
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta2.jar</additionalClasspathElement>
<!-- JBossWS Native Core version overwritte by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
14 years, 2 months
JBossWS SVN: r15070 - in stack/cxf/trunk: modules/resources/src/main/resources/modules/org/jboss/as/webservices/server and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 03:09:02 -0400 (Tue, 11 Oct 2011)
New Revision: 15070
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3366] Merging changes from JBWS-3366 branch:
------------------------------------------------------------------------
r15047 | alessio.soldano(a)jboss.com | 2011-10-07 16:44:44 +0200 (Fri, 07 Oct 2011) | 2 lines
Adding jaxrpc-integration module
------------------------------------------------------------------------
r15046 | alessio.soldano(a)jboss.com | 2011-10-07 16:43:45 +0200 (Fri, 07 Oct 2011) | 2 lines
Fixing list of modules do undeploy
------------------------------------------------------------------------
r15044 | alessio.soldano(a)jboss.com | 2011-10-07 10:45:33 +0200 (Fri, 07 Oct 2011) | 3 lines
- Adding jaxrpc deployment aspects
- Fixing testsuite classpath / dependencies and enabling few jaxrpc tests (DII only)
------------------------------------------------------------------------
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
===================================================================
--- stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2011-10-07 14:44:44 UTC (rev 15047)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2010, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.webservices.server.jaxrpc-integration">
-
- <resources>
- </resources>
-
- <dependencies>
- <module name="javax.api" export="true"/>
- <module name="javax.xml.rpc.api" export="true"/>
- <module name="javax.wsdl4j.api" export="true"/>
- <module name="com.sun.xml.bind" services="export" export="true"/>
- <module name="org.jboss.ws.api" export="true"/>
- <module name="org.jboss.ws.spi" export="true"/>
- <module name="org.jboss.ws.common" services="import" export="true"/>
- <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/>
- <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true">
- <imports>
- <include path="META-INF"/>
- <include path="dtd"/>
- <include path="schema"/>
- </imports>
- <exports>
- <include path="META-INF"/>
- <include path="dtd"/>
- <include path="schema"/>
- </exports>
- </module>
- <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/>
- <module name="org.apache.xalan" services="export" export="true"/>
- <module name="org.apache.xerces" services="export" export="true"/>
- <module name="org.jboss.as.webservices" services="export" export="true"/>
- </dependencies>
-</module>
Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml (from rev 15047, stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml)
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.webservices.server.jaxrpc-integration">
+
+ <resources>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" export="true"/>
+ <module name="javax.xml.rpc.api" export="true"/>
+ <module name="javax.wsdl4j.api" export="true"/>
+ <module name="com.sun.xml.bind" services="export" export="true"/>
+ <module name="org.jboss.ws.api" export="true"/>
+ <module name="org.jboss.ws.spi" export="true"/>
+ <module name="org.jboss.ws.common" services="import" export="true"/>
+ <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/>
+ <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true">
+ <imports>
+ <include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
+ </imports>
+ <exports>
+ <include path="META-INF"/>
+ <include path="dtd"/>
+ <include path="schema"/>
+ </exports>
+ </module>
+ <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/>
+ <module name="org.apache.xalan" services="export" export="true"/>
+ <module name="org.apache.xerces" services="export" export="true"/>
+ <module name="org.jboss.as.webservices" services="export" export="true"/>
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-10-11 07:09:02 UTC (rev 15070)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/**, org/springframework/spring/**
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/springframework/spring/**
\ No newline at end of file
Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml (from rev 15047, stack/cxf/branches/JBWS-3366/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml)
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0">
+
+ <deploymentAspect class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides" class="java.lang.String">ContextProperties, StackDescriptor</property>
+ <property name="contextProperties" class="java.util.HashMap">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
+ </entry>
+ </map>
+ </property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
+ <property name="provides" class="java.lang.String">InitializedMetaDataModel</property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires" class="java.lang.String">ContainerMetaData</property>
+ <property name="provides" class="java.lang.String">StackEndpointHandler</property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
+ <property name="requires" class="java.lang.String">ContainerMetaData</property>
+ <property name="provides" class="java.lang.String">StackInstanceProvider</property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires" class="java.lang.String">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="provides" class="java.lang.String">PublishedContract</property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+ <deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
+ <property name="provides" class="java.lang.String">UnifiedMetaDataModel</property>
+ <property name="forJaxWs" class="boolean">false</property>
+ </deploymentAspect>
+
+</deploymentAspects>
+
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -41,9 +41,18 @@
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
<copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ />
+
+ <copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
+ />
</target>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -1151,6 +1151,57 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jboss.xb.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -1167,8 +1218,6 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
- <!-- AS7 compilation excludes -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
@@ -1186,8 +1235,11 @@
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
- <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
- <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
+ <!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
+ <!-- JBossWS Native Core version available on 710 -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar</additionalClasspathElement>
+ <!-- JBossWS Native Core version overwritte by jbossws-native stack install -->
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
<excludes>
<!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
@@ -1249,7 +1301,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
@@ -1275,6 +1326,20 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- appclient not available for JAXRPC clients -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/handler/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/message/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/oneway/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
<!-- Former JMS endpoint functionalities replaced by SOAP-over-JMS on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/pom.xml 2011-10-11 07:09:02 UTC (rev 15070)
@@ -62,7 +62,7 @@
<jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
<jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
- <jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
+ <jboss.xb.version>2.0.3.GA</jboss.xb.version>
<picketbox.version>3.0.0.Beta5</picketbox.version>
<jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserver-httpspi.version>
<httpserver.version>1.0.0.Beta1</httpserver.version>
14 years, 2 months
JBossWS SVN: r15069 - in container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices: util and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 02:58:56 -0400 (Tue, 11 Oct 2011)
New Revision: 15069
Modified:
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java
Log:
[JBWS-3366] Merging changes from 4.0.0.Beta1 tag:
- updating to latest spi
Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2011-10-11 06:50:41 UTC (rev 15068)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2011-10-11 06:58:56 UTC (rev 15069)
@@ -36,7 +36,7 @@
public class ServletDelegateFactoryImpl implements ServletDelegateFactory {
@Override
- public ServletDelegate newServletDelegate(String servletClassName) {
+ public ServletDelegate newServletDelegate(String servletClassName, boolean isJaxWs) {
try {
ClassLoader classLoader = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
Class<?> clazz = classLoader.loadClass(servletClassName);
Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java 2011-10-11 06:50:41 UTC (rev 15068)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java 2011-10-11 06:58:56 UTC (rev 15069)
@@ -61,4 +61,10 @@
ClassLoaderProvider.setDefaultProvider(new ModuleClassLoaderProvider());
}
+ @Override
+ public ClassLoader getServerJAXRPCIntegrationClassLoader()
+ {
+ throw new RuntimeException("JAXRPC Integration not available on AS 7.0.x");
+ }
+
}
14 years, 2 months
JBossWS SVN: r15068 - in spi/trunk/src/main/java/org/jboss/wsf/spi: deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 02:50:41 -0400 (Tue, 11 Oct 2011)
New Revision: 15068
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
Log:
[JBWS-3366] Merging changes from 2.0.0.Beta10 tag
- Adding jaxrpc integration classloader retrieval method in ClassLoaderProvider
- Adding flag for deployment/classloader type in ServletDelegateFactory
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-10-10 14:23:55 UTC (rev 15067)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-10-11 06:50:41 UTC (rev 15068)
@@ -46,6 +46,12 @@
{
return getContextClassLoader();
}
+
+ @Override
+ public ClassLoader getServerJAXRPCIntegrationClassLoader()
+ {
+ return getContextClassLoader();
+ }
};
public static void setDefaultProvider(ClassLoaderProvider p)
@@ -66,12 +72,19 @@
public abstract ClassLoader getWebServiceSubsystemClassLoader();
/**
- * Return the ClassLoader instance having visibility over the all server side ws libraries
+ * Return the ClassLoader instance having visibility over the all server side ws libraries (for JAXWS usage)
*
* @return
*/
public abstract ClassLoader getServerIntegrationClassLoader();
+ /**
+ * Return the ClassLoader instance having visibility over the all server side ws libraries (for JAXRPC usage)
+ *
+ * @return
+ */
+ public abstract ClassLoader getServerJAXRPCIntegrationClassLoader();
+
static ClassLoader getContextClassLoader()
{
if (System.getSecurityManager() == null)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-10-10 14:23:55 UTC (rev 15067)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-10-11 06:50:41 UTC (rev 15068)
@@ -30,5 +30,5 @@
*/
public interface ServletDelegateFactory
{
- public ServletDelegate newServletDelegate(String delegateClassName);
+ public ServletDelegate newServletDelegate(String delegateClassName, boolean isJaxWs);
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-10-10 14:23:55 UTC (rev 15067)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-10-11 06:50:41 UTC (rev 15068)
@@ -43,6 +43,7 @@
public class WSFServlet extends HttpServlet
{
public static final String STACK_SERVLET_DELEGATE_CLASS = "org.jboss.wsf.spi.deployment.stackServletDelegateClass";
+ public static final String INTEGRATION_CLASSLOADER = "org.jboss.wsf.spi.deployment.integrationClassLoader";
private ServletDelegate delegate = null;
@@ -73,7 +74,8 @@
ClassLoader cl = clProvider.getWebServiceSubsystemClassLoader();
ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl);
ServletDelegateFactory factory = sl.iterator().next();
- return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS));
+ boolean isJaxWs = DeploymentType.JAXWS.toString().equals(servletConfig.getInitParameter(INTEGRATION_CLASSLOADER));
+ return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS), isJaxWs);
}
@Override
14 years, 2 months
JBossWS SVN: r15067 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: transport and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-10 10:23:55 -0400 (Mon, 10 Oct 2011)
New Revision: 15067
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
Log:
switch to Reference instead of Object
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java 2011-10-10 14:19:58 UTC (rev 15066)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFInstanceProvider.java 2011-10-10 14:23:55 UTC (rev 15067)
@@ -32,7 +32,9 @@
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.deployment.ReferenceFactory;
import org.jboss.wsf.spi.deployment.InstanceProvider;
+import org.jboss.wsf.spi.deployment.Reference;
/**
* CXF instance provider.
@@ -43,18 +45,18 @@
private static final ResourceBundle bundle = BundleUtils.getBundle(CXFInstanceProvider.class);
private final ServerFactoryBean factory;
- private final Map<String, Object> cache = new HashMap<String, Object>();
+ private final Map<String, Reference> cache = new HashMap<String, Reference>();
public CXFInstanceProvider(final ServerFactoryBean factory) {
this.factory = factory;
}
- public synchronized Object getInstance(final String className) {
- Object instance = cache.get(className);
+ public synchronized Reference getInstance(final String className) {
+ Reference instance = cache.get(className);
if (instance == null) {
final Object serviceBean = factory.getServiceBean();
if (className.equals(factory.getServiceBean().getClass().getName())) {
- cache.put(className, instance = serviceBean);
+ cache.put(className, instance = ReferenceFactory.newUninitializedReference(serviceBean));
}
if (instance == null)
{
@@ -62,7 +64,7 @@
if (chain != null) {
for (Handler handler : chain) {
if (className.equals(handler.getClass().getName())) {
- cache.put(className, instance = handler);
+ cache.put(className, instance = ReferenceFactory.newUninitializedReference(handler));
}
}
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-10-10 14:19:58 UTC (rev 15066)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-10-10 14:23:55 UTC (rev 15067)
@@ -130,7 +130,7 @@
{
for (Handler handler : chain)
{
- final Object handlerInstance = endpoint.getInstanceProvider().getInstance(handler.getClass().getName());
+ final Object handlerInstance = endpoint.getInstanceProvider().getInstance(handler.getClass().getName()).getValue();
InjectionHelper.injectResources(handlerInstance, metadata, jndiContext);
InjectionHelper.callPostConstructMethod(handlerInstance);
}
@@ -145,7 +145,7 @@
{
if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null)
{
- final Object epInstance = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName());
+ final Object epInstance = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName()).getValue();
InjectionHelper.callPreDestroyMethod(epInstance);
}
}
14 years, 2 months
JBossWS SVN: r15066 - in stack/native/trunk/modules/core/src/main/java/org/jboss: ws/core/jaxws/handler and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-10 10:19:58 -0400 (Mon, 10 Oct 2011)
New Revision: 15066
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeInstanceProvider.java
Log:
switch to Reference instead of Object
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2011-10-10 14:19:58 UTC (rev 15066)
@@ -159,7 +159,7 @@
final Handler handler;
if (ep != null)
{
- handler = (Handler)ep.getInstanceProvider().getInstance(info.getHandlerClass().getName());
+ handler = (Handler)ep.getInstanceProvider().getInstance(info.getHandlerClass().getName()).getValue();
}
else
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2011-10-10 14:19:58 UTC (rev 15066)
@@ -50,6 +50,7 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Reference;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -168,7 +169,7 @@
try
{
// Load the handler class using the deployments top level CL
- Handler<?> handler = getInstance(classLoader, className);
+ Handler<?> handler = getInstance(classLoader, className, injections);
if (handler instanceof GenericHandler)
((GenericHandler)handler).setHandlerName(handlerName);
@@ -176,14 +177,6 @@
if (handler instanceof GenericSOAPHandler)
((GenericSOAPHandler<?>)handler).setHeaders(soapHeaders);
- if (injections != null)
- {
- Endpoint ep = EndpointAssociation.getEndpoint();
- Context ctx = ep == null ? null : ep.getJNDIContext();
- InjectionHelper.injectResources(handler, injections, ctx);
- }
- InjectionHelper.callPostConstructMethod(handler);
-
addHandler(jaxwsMetaData, handler, type);
}
catch (RuntimeException rte)
@@ -196,18 +189,26 @@
}
}
- private Handler<?> getInstance(final ClassLoader fallbackLoader, final String className) throws Exception
+ private Handler<?> getInstance(final ClassLoader fallbackLoader, final String className, InjectionsMetaData injections) throws Exception
{
final Endpoint ep = EndpointAssociation.getEndpoint();
final Handler<?> handler;
if (ep != null)
{
- handler = (Handler<?>)ep.getInstanceProvider().getInstance(className);
+ final Reference handlerReference = ep.getInstanceProvider().getInstance(className);
+ handler = (Handler<?>)handlerReference.getValue();
+ if (!handlerReference.isInitialized() && injections != null)
+ {
+ Context ctx = ep == null ? null : ep.getJNDIContext();
+ InjectionHelper.injectResources(handler, injections, ctx);
+ InjectionHelper.callPostConstructMethod(handler);
+ }
}
else
{
final Class<?> hClass = fallbackLoader.loadClass(className);
handler = (Handler<?>)hClass.newInstance();
+ InjectionHelper.callPostConstructMethod(handler);
}
return handler;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2011-10-10 14:19:58 UTC (rev 15066)
@@ -371,7 +371,7 @@
{
// create endpoint instance
final Class<?> endpointImplClass = endpoint.getTargetBeanClass();
- endpointImpl = endpoint.getInstanceProvider().getInstance(endpointImplClass.getName());
+ endpointImpl = endpoint.getInstanceProvider().getInstance(endpointImplClass.getName()).getValue();
endpoint.addAttachment(Object.class, endpointImpl);
}
catch (Exception ex)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeInstanceProvider.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeInstanceProvider.java 2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeInstanceProvider.java 2011-10-10 14:19:58 UTC (rev 15066)
@@ -28,7 +28,9 @@
import org.jboss.ws.WSException;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.deployment.ReferenceFactory;
import org.jboss.wsf.spi.deployment.InstanceProvider;
+import org.jboss.wsf.spi.deployment.Reference;
/**
* Native instance provider.
@@ -39,18 +41,18 @@
private static final ResourceBundle bundle = BundleUtils.getBundle(NativeInstanceProvider.class);
private final ClassLoader loader;
- private final Map<String, Object> cache = new HashMap<String, Object>();
+ private final Map<String, Reference> cache = new HashMap<String, Reference>();
NativeInstanceProvider(final ClassLoader loader)
{
this.loader = loader;
}
- public synchronized Object getInstance(final String className) {
- Object instance = cache.get(className);
+ public synchronized Reference getInstance(final String className) {
+ Reference instance = cache.get(className);
if (instance == null) {
try {
- instance = loader.loadClass(className).newInstance();
+ instance = ReferenceFactory.newUninitializedReference(loader.loadClass(className).newInstance());
cache.put(className, instance);
} catch (Exception e) {
throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", className), e);
14 years, 2 months
JBossWS SVN: r15065 - in common/trunk/src/main/java/org/jboss/ws/common: invocation and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-10 09:14:02 -0400 (Mon, 10 Oct 2011)
New Revision: 15065
Added:
common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFactory.java
Modified:
common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java
Log:
adding Reference abstraction
Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFactory.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFactory.java 2011-10-10 13:14:02 UTC (rev 15065)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ws.common.deployment;
+
+import org.jboss.wsf.spi.deployment.Reference;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class ReferenceFactory {
+
+ private ReferenceFactory() {
+ // forbidden instantiation
+ }
+
+ public static Reference newInitializedReference(final Reference reference) {
+ if (reference == null) throw new IllegalArgumentException();
+ return newInitializedReference(reference.getValue());
+ }
+
+ public static Reference newInitializedReference(final Object reference) {
+ if (reference == null) throw new IllegalArgumentException();
+ return newReference(reference, true);
+ }
+
+ public static Reference newUninitializedReference(final Reference reference) {
+ if (reference == null) throw new IllegalArgumentException();
+ return newUninitializedReference(reference.getValue());
+ }
+
+ public static Reference newUninitializedReference(final Object reference) {
+ if (reference == null) throw new IllegalArgumentException();
+ return newReference(reference, false);
+ }
+
+ private static Reference newReference(final Object reference, final boolean initialized) {
+ return new ReferenceImpl(reference, initialized);
+ }
+
+ private static final class ReferenceImpl implements Reference {
+
+ private final Object reference;
+ private final boolean initialized;
+
+ private ReferenceImpl(final Object reference, final boolean initialized) {
+ this.reference = reference;
+ this.initialized = initialized;
+ }
+
+ @Override
+ public Object getValue() {
+ return reference;
+ }
+
+ @Override
+ public boolean isInitialized() {
+ return initialized;
+ }
+
+ }
+
+}
Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java 2011-10-10 13:10:46 UTC (rev 15064)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java 2011-10-10 13:14:02 UTC (rev 15065)
@@ -27,6 +27,7 @@
import org.jboss.ws.common.injection.PreDestroyHolder;
import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Reference;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
@@ -61,16 +62,22 @@
final InjectionsMetaData injectionsMD = endpoint.getAttachment(InjectionsMetaData.class);
final Object _targetBean = this.getTargetBean(invocation);
// TODO: refactor injection to AS IL
- final Object targetBean = endpoint.getInstanceProvider().getInstance(_targetBean.getClass().getName());
+ final Reference reference = endpoint.getInstanceProvider().getInstance(_targetBean.getClass().getName());
+ final Object targetBean = reference.getValue();
- this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targetBean);
- if (injectionsMD != null)
+ if (!reference.isInitialized() && injectionsMD != null)
+ {
+ this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targetBean);
InjectionHelper.injectResources(targetBean, injectionsMD, endpoint.getJNDIContext());
+ }
- InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAwareWebServiceContext.getInstance());
+ if (!reference.isInitialized())
+ {
+ InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAwareWebServiceContext.getInstance());
- this.log.debug("Calling postConstruct method on JAXWS JSE endpoint: " + targetBean);
- InjectionHelper.callPostConstructMethod(targetBean);
+ this.log.debug("Calling postConstruct method on JAXWS JSE endpoint: " + targetBean);
+ InjectionHelper.callPostConstructMethod(targetBean);
+ }
endpoint.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
14 years, 2 months
JBossWS SVN: r15064 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-10-10 09:10:46 -0400 (Mon, 10 Oct 2011)
New Revision: 15064
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.java
Log:
adding Reference abstraction
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.java 2011-10-09 00:17:02 UTC (rev 15063)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.java 2011-10-10 13:10:46 UTC (rev 15064)
@@ -30,6 +30,6 @@
public interface InstanceProvider
{
- Object getInstance(String className);
+ Reference getInstance(String className);
}
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java 2011-10-10 13:10:46 UTC (rev 15064)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wsf.spi.deployment;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface Reference {
+
+ Object getValue();
+
+ boolean isInitialized();
+
+}
14 years, 2 months
JBossWS SVN: r15063 - stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 20:17:02 -0400 (Sat, 08 Oct 2011)
New Revision: 15063
Modified:
stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml
Log:
Fixing native core version from 710 in testsuite classpath
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml 2011-10-08 23:59:21 UTC (rev 15062)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml 2011-10-09 00:17:02 UTC (rev 15063)
@@ -1237,7 +1237,7 @@
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta2.jar</additionalClasspathElement>
<!-- JBossWS Native Core version overwritte by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
14 years, 2 months