JBossWS SVN: r12533 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 10:14:42 -0400 (Tue, 29 Jun 2010)
New Revision: 12533
Modified:
spi/trunk/pom.xml
Log:
Updating build version
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2010-06-29 13:52:22 UTC (rev 12532)
+++ spi/trunk/pom.xml 2010-06-29 14:14:42 UTC (rev 12533)
@@ -7,7 +7,7 @@
<packaging>jar</packaging>
<description>JBossWS SPI</description>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
13 years, 9 months
JBossWS SVN: r12532 - common/trunk/src/main/java/org/jboss/wsf/common/integration.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 09:52:22 -0400 (Tue, 29 Jun 2010)
New Revision: 12532
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java
Log:
[JBWS-3073] Adding constant
Modified: common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java 2010-06-29 13:51:30 UTC (rev 12531)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java 2010-06-29 13:52:22 UTC (rev 12532)
@@ -40,6 +40,11 @@
public static final String STACK_TRANSPORT_CLASS = "stack.transport.class";
/**
+ * Stack specific transport class provider configuration property.
+ */
+ public static final String STACK_TRANSPORT_CLASS_PROVIDER = "stack.transport.class.provider";
+
+ /**
* JBoss WS config name property.
*/
public static final String JBOSSWS_CONFIG_NAME = "jbossws-config-name";
13 years, 9 months
JBossWS SVN: r12531 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 09:51:30 -0400 (Tue, 29 Jun 2010)
New Revision: 12531
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
Log:
[JBWS-3073] Adding ServletClassProvider interface
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2010-06-29 13:51:30 UTC (rev 12531)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, 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;
+
+/**
+ * Provides the name of the servlet class to be used for generating
+ * the ws endpoint deployment.
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public interface ServletClassProvider
+{
+ public String getServletClassName();
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 9 months
JBossWS SVN: r12530 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 06:14:14 -0400 (Tue, 29 Jun 2010)
New Revision: 12530
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-3001][JBWS-2410] Moving jbws2268 testcase to framework
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-06-29 10:08:48 UTC (rev 12529)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-06-29 10:14:14 UTC (rev 12530)
@@ -467,14 +467,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2268 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2268/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws2268/*TestCase.class"/>
- </classes>
- </war>
-
<!-- jaxws-jbws2285 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2285.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
13 years, 9 months
JBossWS SVN: r12529 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 06:08:48 -0400 (Tue, 29 Jun 2010)
New Revision: 12529
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-2410] excluding test
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 10:06:23 UTC (rev 12528)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 10:08:48 UTC (rev 12529)
@@ -43,6 +43,9 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
+# [JBWS-2410] Implement @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 10:06:23 UTC (rev 12528)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 10:08:48 UTC (rev 12529)
@@ -43,6 +43,9 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
+# [JBWS-2410] Implement @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-29 10:06:23 UTC (rev 12528)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-29 10:08:48 UTC (rev 12529)
@@ -43,6 +43,9 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
+# [JBWS-2410] Implement @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 10:06:23 UTC (rev 12528)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 10:08:48 UTC (rev 12529)
@@ -43,6 +43,9 @@
# [JBWS-2400] Rewrite large attachment testcase
org/jboss/test/ws/jaxws/jbws2000/**
+# [JBWS-2410] Implement @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-2462] Address rewrite test fails in Metro integration
org/jboss/test/ws/jaxws/jbws2150/**
13 years, 9 months
JBossWS SVN: r12528 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 06:06:23 -0400 (Tue, 29 Jun 2010)
New Revision: 12528
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3001] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 10:02:52 UTC (rev 12527)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-29 10:06:23 UTC (rev 12528)
@@ -53,6 +53,9 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
# on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 10:02:52 UTC (rev 12527)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-29 10:06:23 UTC (rev 12528)
@@ -53,6 +53,9 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
# on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-29 10:02:52 UTC (rev 12527)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-29 10:06:23 UTC (rev 12528)
@@ -47,5 +47,8 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 10:02:52 UTC (rev 12527)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-29 10:06:23 UTC (rev 12528)
@@ -47,5 +47,8 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints
+org/jboss/test/ws/jaxws/jbws2268/**
+
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
13 years, 9 months
JBossWS SVN: r12527 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-29 06:02:52 -0400 (Tue, 29 Jun 2010)
New Revision: 12527
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws2268/
framework/trunk/testsuite/test/resources/jaxws/jbws2268/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2268/WEB-INF/web.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2410][JBWS-3001] Moving jbws2268 testcase to framework
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-06-28 10:34:03 UTC (rev 12526)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-06-29 10:02:52 UTC (rev 12527)
@@ -662,6 +662,14 @@
</metainf>
</jar>
+ <!-- jaxws-jbws2268 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2268/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2268/*TestCase.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws2278 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2278.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2278/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java 2010-06-29 10:02:52 UTC (rev 12527)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, 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.test.ws.jaxws.jbws2268;
+
+import java.io.File;
+import java.io.FileWriter;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint Implementation
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(
+ serviceName = "EndpointService",
+ targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2268",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2268.EndpointInterface"
+)
+public final class EndpointImpl
+{
+
+ private StringBuilder builder = new StringBuilder();
+ private File file;
+
+ public EndpointImpl()
+ {
+ super();
+ }
+
+ @PostConstruct
+ protected void init()
+ {
+ this.builder.append("init() ");
+ }
+
+ @WebMethod
+ public boolean setFile(String targetFile)
+ {
+ this.file = new File(targetFile);
+ return this.file.exists();
+ }
+
+ @PreDestroy
+ protected void destroy()
+ {
+ this.builder.append("destroy()");
+ this.writeTestLog();
+ }
+
+ private void writeTestLog()
+ {
+ try
+ {
+ FileWriter fw = new FileWriter(this.file);
+ fw.write(this.builder.toString());
+ fw.close();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java 2010-06-29 10:02:52 UTC (rev 12527)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, 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.test.ws.jaxws.jbws2268;
+
+import javax.jws.WebService;
+
+/**
+ * Endpoint Interface
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2268")
+public interface EndpointInterface
+{
+ boolean setFile(String targetFile);
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2010-06-29 10:02:52 UTC (rev 12527)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, 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.test.ws.jaxws.jbws2268;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2268] Implement @PostConstruct and @Predestroy annotations support for POJO based endpoints
+ * @author richard.opalka(a)jboss.com
+ */
+public final class JBWS2268TestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2268TestCase.class, "");
+ }
+
+ private EndpointInterface getProxy() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws2268", "EndpointService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2268?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ return (EndpointInterface)service.getPort(EndpointInterface.class);
+ }
+
+ private File createLogFile() throws Exception
+ {
+ File workDir = getResourceFile("target");
+ assertTrue("Work dir doesn't exist", workDir.exists());
+ String fileName = System.identityHashCode(this) + ".log";
+ File retVal = new File(workDir, fileName);
+ retVal.createNewFile();
+ return retVal;
+ }
+
+ public void testJavaxAnnotationsSupport() throws Exception
+ {
+ File logFile = createLogFile();
+
+ deploy("jaxws-jbws2268.war");
+ try
+ {
+ assertTrue(getProxy().setFile(logFile.getAbsolutePath()));
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2268.war");
+ assertPostConstructAndPreDestroyLogs(logFile);
+ }
+ }
+
+ private void assertPostConstructAndPreDestroyLogs(File logFile) throws Exception
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ IOUtils.copyStream(baos, new FileInputStream(logFile));
+ assertEquals("init() destroy()", baos.toString().trim());
+ logFile.delete();
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2268/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2268/WEB-INF/web.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2268/WEB-INF/web.xml 2010-06-29 10:02:52 UTC (rev 12527)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>EndpointImpl</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2268.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EndpointImpl</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2268/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 9 months
JBossWS SVN: r12526 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: configuration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-28 06:34:03 -0400 (Mon, 28 Jun 2010)
New Revision: 12526
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java
Log:
[JBWS-3002] Use the service bean created by CXF
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-28 10:31:23 UTC (rev 12525)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-28 10:34:03 UTC (rev 12526)
@@ -88,7 +88,13 @@
public abstract class AbstractInvoker implements Invoker
{
private static final Object[] NO_ARGS = new Object[]{};
+ private Object targetBean;
+ public void setTargetBean(Object targetBean)
+ {
+ this.targetBean = targetBean;
+ }
+
public Object invoke(Exchange exchange, Object o)
{
// set up the webservice request context
@@ -145,7 +151,7 @@
InvocationContext invContext = inv.getInvocationContext();
invContext.addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
invContext.addAttachment(MessageContext.class, ctx);
- invContext.setTargetBean(ep.getAttachment(Object.class)); //JBWS-2486 - JBWS-3002
+ invContext.setTargetBean(targetBean != null ? targetBean : ep.getAttachment(Object.class)); //JBWS-2486 - JBWS-3002
inv.setJavaMethod(m);
inv.setArgs(params);
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java 2010-06-28 10:31:23 UTC (rev 12525)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java 2010-06-28 10:34:03 UTC (rev 12526)
@@ -21,6 +21,9 @@
*/
package org.jboss.wsf.stack.cxf.configuration;
+import org.apache.cxf.frontend.ServerFactoryBean;
+import org.apache.cxf.service.invoker.Invoker;
+import org.jboss.wsf.stack.cxf.AbstractInvoker;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
import org.jboss.wsf.stack.cxf.deployment.EndpointImpl;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
@@ -50,6 +53,10 @@
{
configureEndpoint((EndpointImpl)beanInstance);
}
+ else if (beanInstance instanceof ServerFactoryBean)
+ {
+ configureServerFactory((ServerFactoryBean)beanInstance);
+ }
super.customConfigure(beanInstance);
}
@@ -62,6 +69,16 @@
}
}
+ protected synchronized void configureServerFactory(ServerFactoryBean factory)
+ {
+ //propagate serviceBean object (the endpoint target) from the factory to the jbossws custom invoker
+ Invoker invoker = factory.getInvoker();
+ if (invoker instanceof AbstractInvoker)
+ {
+ ((AbstractInvoker)invoker).setTargetBean(factory.getServiceBean());
+ }
+ }
+
public void setWsdlPublisher(WSDLFilePublisher wsdlPublisher)
{
this.wsdlPublisher = wsdlPublisher;
13 years, 9 months
JBossWS SVN: r12525 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-28 06:31:23 -0400 (Mon, 28 Jun 2010)
New Revision: 12525
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
Log:
Correcting comment
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java 2010-06-25 15:53:09 UTC (rev 12524)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EndpointAssociationInterceptor.java 2010-06-28 10:31:23 UTC (rev 12525)
@@ -32,7 +32,7 @@
/**
* A RECEIVE phase interceptor that sets the @see{org.jboss.wsf.spi.deployment.Endpoint}
* associated to the current message exchange. This is performed early in the chain,
- * before any thread pool comes into the game, preventing the EndpointAssociation
+ * before any thread pool comes into the game, allowing the EndpointAssociation
* threadlocal to retrieve the correct Endpoint instance.
*
* @author alessio.soldano(a)jboss.com
13 years, 9 months
JBossWS SVN: r12524 - in framework/trunk/hudson/hudson-home/users: sergeyb and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-25 11:53:09 -0400 (Fri, 25 Jun 2010)
New Revision: 12524
Added:
framework/trunk/hudson/hudson-home/users/sergeyb/
framework/trunk/hudson/hudson-home/users/sergeyb/config.xml
Log:
Adding Sergey to email notifications
Added: framework/trunk/hudson/hudson-home/users/sergeyb/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/users/sergeyb/config.xml (rev 0)
+++ framework/trunk/hudson/hudson-home/users/sergeyb/config.xml 2010-06-25 15:53:09 UTC (rev 12524)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<user>
+ <fullName>config.xml</fullName>
+ <description>Sergey Beryozkin</description>
+ <properties>
+ <hudson.tasks.Mailer_-UserProperty>
+ <emailAddress>sberyozk(a)redhat.com</emailAddress>
+ </hudson.tasks.Mailer_-UserProperty>
+ </properties>
+</user>
Property changes on: framework/trunk/hudson/hudson-home/users/sergeyb/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 10 months