JBossWS SVN: r6314 - in stack/native/trunk: src/test/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-10 04:54:06 -0400 (Thu, 10 Apr 2008)
New Revision: 6314
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
stack/native/trunk/version.properties
Log:
[JBAS-5384] Fix JBossWS regression for CR1
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-10 08:34:54 UTC (rev 6313)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-10 08:54:06 UTC (rev 6314)
@@ -2,10 +2,6 @@
# $Id$
#
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-
# Fix BPEL before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
@@ -15,10 +11,8 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
-
# [JBAS-5055] Failed to load users/passwords/role files
+org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
@@ -27,9 +21,6 @@
# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
-# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment
-org/jboss/test/ws/jaxws/endpoint/**
-
# [JBWS-2107] Resolve dependency on @SecurityDomain
org/jboss/test/ws/jaxws/webserviceref/Secure**
org/jboss/test/ws/jaxws/samples/dar/**
@@ -38,3 +29,33 @@
# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
org/jboss/test/ws/interop/**
+
+# [EJBTHREE-1150] WebServiceContext injection requires mapped-name
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*
+
+# [JBAS-5389] EJB3 ClientLauncher not available
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBAS-5259] mapped-name is required for context of deployment
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerlifecycle/**
+org/jboss/test/ws/jaxws/jbws1611/**
+org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/namespace/**
+org/jboss/test/ws/jaxws/samples/wsaddressing/**
+org/jboss/test/ws/jaxws/samples/wssecurity/**
+
+# [JBAS-5386] ClassNotFoundException: org.jboss.deployment.security.WarPolicyConfigurationFacade
+org/jboss/test/ws/jaxrpc/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1762/**
+
+# [JBAS-5387] EJB21 name not bound
+org/jboss/test/ws/jaxrpc/jbws331/**
+
+# [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
+org/jboss/test/ws/jaxrpc/jbws720/**
+
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-04-10 08:34:54 UTC (rev 6313)
+++ stack/native/trunk/version.properties 2008-04-10 08:54:06 UTC (rev 6314)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-3.0
-version.id=3.0.2-jbossws-2.0.5.DEV
+version.id=3.0.2-native-2.0.5.DEV
repository.id=snapshot
implementation.title=JBoss Web Services - Native
16 years, 9 months
- 1
- 0
JBossWS SVN: r6313 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-10 04:34:54 -0400 (Thu, 10 Apr 2008)
New Revision: 6313
Modified:
stack/cxf/trunk/version.properties
Log:
sun-jaxb=2.1.6
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-04-10 06:52:09 UTC (rev 6312)
+++ stack/cxf/trunk/version.properties 2008-04-10 08:34:54 UTC (rev 6313)
@@ -46,7 +46,7 @@
jboss-security-spi=2.0.0.Beta
stax-api=1.0.1
sun-jaf=1.1
-sun-jaxb=2.1.4
+sun-jaxb=2.1.6
sun-jaxrpc=1.1
sun-servlet=2.5
woodstox=3.2.4
16 years, 9 months
- 1
- 0
JBossWS SVN: r6312 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws/wsrm/services and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-10 02:52:09 -0400 (Thu, 10 Apr 2008)
New Revision: 6312
Added:
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml
Removed:
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
Log:
[JBWS-2097] refactoring - now all WS-RM endpoints are only JAX-WS based services - there is no dependency on jboss proprietary classes since now
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-10 06:52:09 UTC (rev 6312)
@@ -455,6 +455,9 @@
<zipfileset
dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl"
prefix="WEB-INF/wsdl"/>
+ <zipfileset
+ file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml"
+ prefix="META-INF"/>
</war>
<war warfile="${tests.output.dir}/libs/jaxws-secured-wsrm.war"
@@ -478,6 +481,9 @@
<zipfileset
dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/wsdl"
prefix="WEB-INF/wsdl"/>
+ <zipfileset
+ file="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml"
+ prefix="META-INF"/>
</war>
<war warfile="${tests.output.dir}/libs/jaxws-wsrm-one-way-emulator.war"
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.wsrm.services;
import javax.jws.Oneway;
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.wsrm.services;
import javax.jws.Oneway;
@@ -2,6 +23,2 @@
import javax.jws.WebService;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
-
import java.util.Arrays;
@@ -16,30 +33,23 @@
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface"
)
-@EndpointConfig
-(
- configName = "Standard WSRM Endpoint",
- configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
-)
public class OneWayServiceImpl implements OneWayServiceIface
{
- private Logger log = Logger.getLogger(OneWayServiceImpl.class);
-
@Oneway
public void method1()
{
- log.info("method1()");
+ System.out.println("method1()");
}
@Oneway
public void method2(String s)
{
- log.info("method2(" + s + ")");
+ System.out.println("method2(" + s + ")");
}
@Oneway
public void method3(String[] sa)
{
- log.info("method3(" + Arrays.asList(sa) + ")");
+ System.out.println("method3(" + Arrays.asList(sa) + ")");
}
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -1,10 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.wsrm.services;
import java.util.concurrent.Future;
-
import javax.jws.WebMethod;
import javax.jws.WebService;
-
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.wsrm.services;
import javax.jws.WebMethod;
@@ -3,7 +24,4 @@
import javax.jws.WebService;
-import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
-
@WebService
(
@@ -14,19 +32,12 @@
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface"
)
-@EndpointConfig
-(
- configName = "Standard WSRM Endpoint",
- configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
-)
public class ReqResServiceImpl
{
- private static Logger log = Logger.getLogger(ReqResServiceImpl.class);
-
@WebMethod
public String echo(String s)
{
- log.info("echo(" + s + ")");
+ System.out.println("echo(" + s + ")");
return s;
}
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -22,13 +22,9 @@
package org.jboss.test.ws.jaxws.wsrm.services;
import java.util.Arrays;
-
import javax.jws.Oneway;
import javax.jws.WebService;
-import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
-
@WebService
(
name = "SecuredOneWay",
@@ -37,30 +33,23 @@
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface"
)
-@EndpointConfig
-(
- configName = "Secured WSRM Endpoint",
- configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
-)
public class SecuredOneWayServiceImpl implements SecuredOneWayServiceIface
{
- private Logger log = Logger.getLogger(SecuredOneWayServiceImpl.class);
-
@Oneway
public void method1()
{
- log.info("method1()");
+ System.out.println("method1()");
}
@Oneway
public void method2(String s)
{
- log.info("method2(" + s + ")");
+ System.out.println("method2(" + s + ")");
}
@Oneway
public void method3(String[] sa)
{
- log.info("method3(" + Arrays.asList(sa) + ")");
+ System.out.println("method3(" + Arrays.asList(sa) + ")");
}
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -22,7 +22,6 @@
package org.jboss.test.ws.jaxws.wsrm.services;
import java.util.concurrent.Future;
-
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.ws.AsyncHandler;
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2008-04-10 06:52:09 UTC (rev 6312)
@@ -24,9 +24,6 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
-import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
-
@WebService
(
name = "SecuredReqRes",
@@ -35,19 +32,12 @@
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface"
)
-@EndpointConfig
-(
- configName = "Secured WSRM Endpoint",
- configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
-)
public class SecuredReqResServiceImpl
{
- private static Logger log = Logger.getLogger(SecuredReqResServiceImpl.class);
-
@WebMethod
public String echo(String s)
{
- log.info("echo(" + s + ")");
+ System.out.println("echo(" + s + ")");
return s;
}
}
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml 2008-04-10 06:52:09 UTC (rev 6312)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jaxws-config
+ xmlns="urn:jboss:jaxws-config:2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <endpoint-config>
+ <config-name>Standard Endpoint</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSRM Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSSecurity Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </endpoint-config>
+
+</jaxws-config>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml 2008-04-10 06:52:09 UTC (rev 6312)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jaxws-config
+ xmlns="urn:jboss:jaxws-config:2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <endpoint-config>
+ <config-name>Standard Endpoint</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSRM Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </endpoint-config>
+
+</jaxws-config>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2008-04-10 06:28:20 UTC (rev 6311)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2008-04-10 06:52:09 UTC (rev 6312)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jaxws-config
- xmlns="urn:jboss:jaxws-config:2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
-
- <endpoint-config>
- <config-name>Standard WSRM Endpoint</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
- </javaee:handler>
- <javaee:handler>
- <javaee:handler-name>WSRM Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </endpoint-config>
-
- <endpoint-config>
- <config-name>Secured WSRM Endpoint</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
- </javaee:handler>
- <javaee:handler>
- <javaee:handler-name>WSRM Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class>
- </javaee:handler>
- <javaee:handler>
- <javaee:handler-name>WSSecurity Handler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </endpoint-config>
-
-</jaxws-config>
16 years, 9 months
- 1
- 0
JBossWS SVN: r6311 - stack/native/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-10 02:28:20 -0400 (Thu, 10 Apr 2008)
New Revision: 6311
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss422.txt
stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
Reopen: [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-10 06:06:49 UTC (rev 6310)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-10 06:28:20 UTC (rev 6311)
@@ -25,3 +25,6 @@
# [JBWS-1911] Support the JMS transport with JAX-WS
org/jboss/test/ws/jaxws/samples/jmstransport/**
+# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
+org/jboss/test/ws/interop/**
+
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-10 06:06:49 UTC (rev 6310)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-10 06:28:20 UTC (rev 6311)
@@ -8,3 +8,6 @@
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
+
+# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
+org/jboss/test/ws/interop/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-10 06:06:49 UTC (rev 6310)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-10 06:28:20 UTC (rev 6311)
@@ -26,3 +26,6 @@
org/jboss/test/ws/jaxws/samples/dar/**
org/jboss/test/ws/jaxws/samples/news/**
org/jboss/test/ws/jaxws/jbws1840/**
+
+# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
+org/jboss/test/ws/interop/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-10 06:06:49 UTC (rev 6310)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-10 06:28:20 UTC (rev 6311)
@@ -35,3 +35,6 @@
org/jboss/test/ws/jaxws/samples/dar/**
org/jboss/test/ws/jaxws/samples/news/**
org/jboss/test/ws/jaxws/jbws1840/**
+
+# [JBWS-1526] Automated testing and availablity checks of public endpoints (interop)
+org/jboss/test/ws/interop/**
16 years, 9 months
- 1
- 0
JBossWS SVN: r6310 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-10 02:06:49 -0400 (Thu, 10 Apr 2008)
New Revision: 6310
Modified:
stack/native/trunk/version.properties
Log:
sun-jaxb=2.1.6
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-04-09 15:50:05 UTC (rev 6309)
+++ stack/native/trunk/version.properties 2008-04-10 06:06:49 UTC (rev 6310)
@@ -18,7 +18,7 @@
ibm-wsdl4j=1.6.2
jbpm-bpel=1.1.0.Beta5
stax-api=1.0
-sun-jaxb=2.1.4
+sun-jaxb=2.1.6
sun-jaxws=2.1.1
woodstox=3.1.1
wscommons-policy=1.0
16 years, 9 months
- 1
- 0
JBossWS SVN: r6309 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-09 11:50:05 -0400 (Wed, 09 Apr 2008)
New Revision: 6309
Added:
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl
Removed:
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
Log:
[JBWS-2097] refactoring - removing dependency on jboss policy specific classes and using contract based approach
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-09 15:50:05 UTC (rev 6309)
@@ -450,9 +450,11 @@
<include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
- <include name="wsrm-exactly-once-in-order-policy.xml"/>
<include name="wsrm-jaxws-endpoint-config.xml"/>
</webinf>
+ <zipfileset
+ dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl"
+ prefix="WEB-INF/wsdl"/>
</war>
<war warfile="${tests.output.dir}/libs/jaxws-secured-wsrm.war"
@@ -464,7 +466,6 @@
<include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
- <include name="wsrm-exactly-once-in-order-policy.xml"/>
<include name="wsrm-jaxws-endpoint-config.xml"/>
</webinf>
<webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/WEB-INF">
@@ -474,6 +475,9 @@
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
+ <zipfileset
+ dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/wsdl"
+ prefix="WEB-INF/wsdl"/>
</war>
<war warfile="${tests.output.dir}/libs/jaxws-wsrm-one-way-emulator.war"
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -50,7 +50,7 @@
{
super.setUp();
- QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "OneWayService");
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "OneWayService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (OneWayServiceIface)service.getPort(OneWayServiceIface.class);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -50,7 +50,7 @@
{
super.setUp();
- QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "SecuredOneWayService");
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SecuredOneWayService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (SecuredOneWayServiceIface)service.getPort(SecuredOneWayServiceIface.class);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -73,7 +73,7 @@
if (proxy == null)
{
- QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "ReqResService");
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ReqResService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
service.setExecutor(testExecutor);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -72,7 +72,7 @@
if (proxy == null)
{
- QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "SecuredReqResService");
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SecuredReqResService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
service.setExecutor(testExecutor);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -4,6 +4,9 @@
import javax.jws.WebService;
@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
public interface OneWayServiceIface
{
@Oneway
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -5,9 +5,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.extensions.policy.PolicyScopeLevel;
-import org.jboss.ws.extensions.policy.annotation.Policy;
-import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
import java.util.Arrays;
@@ -15,17 +12,10 @@
(
name = "OneWay",
serviceName = "OneWayService",
- targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ wsdlLocation = "WEB-INF/wsdl/OneWayService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface"
)
-@PolicyAttachment
-(
- @Policy
- (
- policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
- scope = PolicyScopeLevel.WSDL_BINDING
- )
-)
@EndpointConfig
(
configName = "Standard WSRM Endpoint",
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -9,6 +9,9 @@
import javax.xml.ws.Response;
@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
public interface ReqResServiceIface
{
@WebMethod(operationName = "echo")
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -5,25 +5,15 @@
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.extensions.policy.PolicyScopeLevel;
-import org.jboss.ws.extensions.policy.annotation.Policy;
-import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
@WebService
(
name = "ReqRes",
serviceName = "ReqResService",
- targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ wsdlLocation = "WEB-INF/wsdl/ReqResService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface"
)
-@PolicyAttachment
-(
- @Policy
- (
- policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
- scope = PolicyScopeLevel.WSDL_BINDING
- )
-)
@EndpointConfig
(
configName = "Standard WSRM Endpoint",
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -25,6 +25,9 @@
import javax.jws.WebService;
@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
public interface SecuredOneWayServiceIface
{
@Oneway
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -28,25 +28,15 @@
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.extensions.policy.PolicyScopeLevel;
-import org.jboss.ws.extensions.policy.annotation.Policy;
-import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
@WebService
(
name = "SecuredOneWay",
serviceName = "SecuredOneWayService",
- targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ wsdlLocation = "WEB-INF/wsdl/SecuredOneWayService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface"
)
-@PolicyAttachment
-(
- @Policy
- (
- policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
- scope = PolicyScopeLevel.WSDL_BINDING
- )
-)
@EndpointConfig
(
configName = "Secured WSRM Endpoint",
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -29,6 +29,9 @@
import javax.xml.ws.Response;
@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
public interface SecuredReqResServiceIface
{
@WebMethod(operationName = "echo")
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2008-04-09 15:50:05 UTC (rev 6309)
@@ -26,25 +26,15 @@
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.extensions.policy.PolicyScopeLevel;
-import org.jboss.ws.extensions.policy.annotation.Policy;
-import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
@WebService
(
name = "SecuredReqRes",
serviceName = "SecuredReqResService",
- targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ wsdlLocation = "WEB-INF/wsdl/SecuredReqResService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface"
)
-@PolicyAttachment
-(
- @Policy
- (
- policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
- scope = PolicyScopeLevel.WSDL_BINDING
- )
-)
@EndpointConfig
(
configName = "Secured WSRM Endpoint",
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl 2008-04-09 15:50:05 UTC (rev 6309)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ name="SecuredOneWayService"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:ns1="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <wsp:UsingPolicy/>
+ <wsp:Policy
+ wsu:Id="wsrm11policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702">
+ <wsp:Policy>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsrmp:ExactlyOnce/>
+ <wsrmp:InOrder/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ </wsrmp:DeliveryAssurance>
+ </wsp:All>
+ </wsp:Policy>
+ <types>
+ <xs:schema
+ version="1.0"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="method1" type="tns:method1"/>
+ <xs:element name="method2" type="tns:method2"/>
+ <xs:element name="method3" type="tns:method3"/>
+ <xs:complexType name="method1">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="method2">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="method3">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="SecuredOneWayServiceIface_method2">
+ <part name="method2" element="ns1:method2">
+ </part>
+ </message>
+ <message name="SecuredOneWayServiceIface_method1">
+ <part name="method1" element="ns1:method1">
+ </part>
+ </message>
+ <message name="SecuredOneWayServiceIface_method3">
+ <part name="method3" element="ns1:method3">
+ </part>
+ </message>
+ <portType name="SecuredOneWayServiceIface">
+ <operation name="method1">
+ <input message="ns1:SecuredOneWayServiceIface_method1">
+ </input>
+ </operation>
+ <operation name="method2">
+ <input message="ns1:SecuredOneWayServiceIface_method2">
+ </input>
+ </operation>
+ <operation name="method3">
+ <input message="ns1:SecuredOneWayServiceIface_method3">
+ </input>
+ </operation>
+ </portType>
+ <binding name="SecuredOneWayServiceIfaceBinding" type="ns1:SecuredOneWayServiceIface">
+ <wsp:PolicyReference URI="#wsrm11policy"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="method1">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="method2">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="method3">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ </binding>
+ <service name="SecuredOneWayService">
+ <port name="SecuredOneWayPort" binding="ns1:SecuredOneWayServiceIfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredOneWayService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl 2008-04-09 15:50:05 UTC (rev 6309)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ name="SecuredReqResService"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:ns1="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <wsp:UsingPolicy/>
+ <wsp:Policy
+ wsu:Id="wsrm11policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702">
+ <wsp:Policy>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsrmp:ExactlyOnce/>
+ <wsrmp:InOrder/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ </wsrmp:DeliveryAssurance>
+ </wsp:All>
+ </wsp:Policy>
+ <types>
+ <xs:schema
+ version="1.0"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="echo" type="tns:echo"/>
+ <xs:element name="echoResponse" type="tns:echoResponse"/>
+ <xs:complexType name="echo">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="echoResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="SecuredReqResServiceIface_echo">
+ <part name="echo" element="ns1:echo">
+ </part>
+ </message>
+ <message name="SecuredReqResServiceIface_echoResponse">
+ <part name="echoResponse" element="ns1:echoResponse">
+ </part>
+ </message>
+ <portType name="SecuredReqResServiceIface">
+ <operation name="echo" parameterOrder="echo">
+ <input message="ns1:SecuredReqResServiceIface_echo">
+ </input>
+ <output message="ns1:SecuredReqResServiceIface_echoResponse">
+ </output>
+ </operation>
+ </portType>
+ <binding name="SecuredReqResServiceIfaceBinding" type="ns1:SecuredReqResServiceIface">
+ <wsp:PolicyReference URI="#wsrm11policy"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="SecuredReqResService">
+ <port name="SecuredReqResPort" binding="ns1:SecuredReqResServiceIfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/wsdl/SecuredReqResService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl 2008-04-09 15:50:05 UTC (rev 6309)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ name="OneWayService"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:ns1="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <wsp:UsingPolicy/>
+ <wsp:Policy
+ wsu:Id="wsrm11policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702">
+ <wsp:Policy>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsrmp:ExactlyOnce/>
+ <wsrmp:InOrder/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ </wsrmp:DeliveryAssurance>
+ </wsp:All>
+ </wsp:Policy>
+ <types>
+ <xs:schema
+ version="1.0"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="method1" type="tns:method1"/>
+ <xs:element name="method2" type="tns:method2"/>
+ <xs:element name="method3" type="tns:method3"/>
+ <xs:complexType name="method1">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="method2">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="method3">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="OneWayServiceIface_method3">
+ <part name="method3" element="ns1:method3">
+ </part>
+ </message>
+ <message name="OneWayServiceIface_method1">
+ <part name="method1" element="ns1:method1">
+ </part>
+ </message>
+ <message name="OneWayServiceIface_method2">
+ <part name="method2" element="ns1:method2">
+ </part>
+ </message>
+ <portType name="OneWayServiceIface">
+ <operation name="method1">
+ <input message="ns1:OneWayServiceIface_method1">
+ </input>
+ </operation>
+ <operation name="method2">
+ <input message="ns1:OneWayServiceIface_method2">
+ </input>
+ </operation>
+ <operation name="method3">
+ <input message="ns1:OneWayServiceIface_method3">
+ </input>
+ </operation>
+ </portType>
+ <binding name="OneWayServiceIfaceBinding" type="ns1:OneWayServiceIface">
+ <wsp:PolicyReference URI="#wsrm11policy"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="method1">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="method2">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ <operation name="method3">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ </operation>
+ </binding>
+ <service name="OneWayService">
+ <port name="OneWayPort" binding="ns1:OneWayServiceIfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/OneWayService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl 2008-04-09 15:50:05 UTC (rev 6309)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ name="ReqResService"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:ns1="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <wsp:UsingPolicy/>
+ <wsp:Policy
+ wsu:Id="wsrm11policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsp:All>
+ <wsrmp:DeliveryAssurance xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702">
+ <wsp:Policy>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsrmp:ExactlyOnce/>
+ <wsrmp:InOrder/>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ </wsrmp:DeliveryAssurance>
+ </wsp:All>
+ </wsp:Policy>
+ <types>
+ <xs:schema
+ version="1.0"
+ targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="echo" type="tns:echo"/>
+ <xs:element name="echoResponse" type="tns:echoResponse"/>
+ <xs:complexType name="echo">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="echoResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="ReqResServiceIface_echo">
+ <part name="echo" element="ns1:echo">
+ </part>
+ </message>
+ <message name="ReqResServiceIface_echoResponse">
+ <part name="echoResponse" element="ns1:echoResponse">
+ </part>
+ </message>
+ <portType name="ReqResServiceIface">
+ <operation name="echo" parameterOrder="echo">
+ <input message="ns1:ReqResServiceIface_echo">
+ </input>
+ <output message="ns1:ReqResServiceIface_echoResponse">
+ </output>
+ </operation>
+ </portType>
+ <binding name="ReqResServiceIfaceBinding" type="ns1:ReqResServiceIface">
+ <wsp:PolicyReference URI="#wsrm11policy"/>
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="ReqResService">
+ <port name="ReqResPort" binding="ns1:ReqResServiceIfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/wsdl/ReqResService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml 2008-04-09 15:29:39 UTC (rev 6308)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml 2008-04-09 15:50:05 UTC (rev 6309)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy
- wsu:Id="exactly_one_in_order_rm_delivery"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
- <wsrmp:DeliveryAssurance>
- <wsp:Policy>
- <wsrmp:ExactlyOnce/>
- <wsrmp:InOrder/>
- </wsp:Policy>
- </wsrmp:DeliveryAssurance>
-</wsp:Policy>
16 years, 9 months
- 1
- 0
JBossWS SVN: r6308 - in container/jboss42/branches: jbossws-jboss422 and 19 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-09 11:29:39 -0400 (Wed, 09 Apr 2008)
New Revision: 6308
Added:
container/jboss42/branches/jbossws-jboss422/
container/jboss42/branches/jbossws-jboss422/ant-import/
container/jboss42/branches/jbossws-jboss422/ant-import/build-release.xml
container/jboss42/branches/jbossws-jboss422/ant-import/build-setup.xml
container/jboss42/branches/jbossws-jboss422/ant-import/build-thirdparty.xml
container/jboss42/branches/jbossws-jboss422/ant.properties
container/jboss42/branches/jbossws-jboss422/ant.properties.example
container/jboss42/branches/jbossws-jboss422/build.xml
container/jboss42/branches/jbossws-jboss422/src/
container/jboss42/branches/jbossws-jboss422/src/etc/
container/jboss42/branches/jbossws-jboss422/src/etc/component-info.xml
container/jboss42/branches/jbossws-jboss422/src/etc/default.mf
container/jboss42/branches/jbossws-jboss422/src/main/
container/jboss42/branches/jbossws-jboss422/src/main/etc/
container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml
container/jboss42/branches/jbossws-jboss422/src/main/etc/default.mf
container/jboss42/branches/jbossws-jboss422/src/main/java/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/serviceref/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/transport/
container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/transport/BareTransportManagerFactory.java
container/jboss42/branches/jbossws-jboss422/src/main/resources/
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/META-INF/
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml
container/jboss42/branches/jbossws-jboss422/version.properties
container/jboss42/branches/jbossws-jboss422/version.properties.md5
Log:
Created from: https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA
Added: container/jboss42/branches/jbossws-jboss422/ant-import/build-release.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/ant-import/build-release.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/ant-import/build-release.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- Release to jboss.local.repository -->
+ <target name="release" depends="jars"
+ description="Release to jboss.local.repository">
+
+ <!-- jboss/jbossws-jboss42 -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
+ <fileset dir="${jbws42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss42-src.zip"/>
+ <include name="jbossws-jboss42-resources.zip"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <filterset>
+ <filtersfile file="${jbws42.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
+ </target>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss422/ant-import/build-release.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/ant-import/build-setup.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/ant-import/build-setup.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/ant-import/build-setup.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="jbws42.dir" value="${basedir}"/>
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${jbws42.dir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${jbws42.dir}/ant.properties"/>
+ <property file="${jbws42.dir}/version.properties"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-client.jar"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: container/jboss42/branches/jbossws-jboss422/ant-import/build-setup.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/ant-import/build-thirdparty.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/ant-import/build-thirdparty.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/ant-import/build-thirdparty.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ <target name="thirdparty-init" depends="prepare">
+
+ <property name="thirdparty.dir" value="${jbws42.dir}/thirdparty"/>
+ <checksum file="${jbws42.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+ <condition property="force.thirdparty">
+ <or>
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ <isset property="force.thirdparty.get"/>
+ </or>
+ </condition>
+ <echo message="checksum.ok = ${checksum.ok}"/>
+ </target>
+
+ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries">
+
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+
+ <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
+ <checksum file="${jbws42.dir}/version.properties" fileext=".md5"/>
+ </target>
+
+ <target name="thirdparty-classpath" depends="thirdparty-get">
+
+ <!-- The compile classpath for jboss42 integration -->
+ <path id="jbws42.integration.classpath">
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${jboss42.lib}/jboss-common.jar"/>
+ <pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
+ <pathelement location="${jboss42.lib}/jboss-system.jar"/>
+ <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss42.server.lib}/dom4j.jar"/>
+ <pathelement location="${jboss42.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss42.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss42.server.lib}/servlet-api.jar"/>
+ <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
+ <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
+ <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
+ </path>
+
+ </target>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss422/ant-import/build-thirdparty.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/ant.properties
===================================================================
--- container/jboss42/branches/jbossws-jboss422/ant.properties (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/ant.properties 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,26 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# JBoss Home
+jboss42.home=/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA/
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBoss Repository
+jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository
+#jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Added: container/jboss42/branches/jbossws-jboss422/ant.properties.example
===================================================================
--- container/jboss42/branches/jbossws-jboss422/ant.properties.example (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/ant.properties.example 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,26 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# JBoss Home
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Added: container/jboss42/branches/jbossws-jboss422/build.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/build.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/build.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS-JBoss42">
+
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="jbws42.dir" value="${int.jboss42.dir}"/>
+ <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/>
+ <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/>
+ <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/>
+ <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/>
+ <property name="jbws42.output.dir" value="${jbws42.dir}/output"/>
+ <property name="jbws42.output.apidocs.dir" value="${jbws42.output.dir}/apidocs"/>
+ <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/>
+ <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/>
+ <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare,thirdparty-get">
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
+
+ <!-- Compile integration java sources -->
+ <target name="compile-classes" depends="init">
+ <mkdir dir="${jbws42.output.classes.dir}"/>
+ <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/**"/>
+ <include name="org/jboss/wsf/container/jboss42/**"/>
+ <exclude name="org/jboss/wsf/container/jboss42/jms/**"/>
+ <classpath refid="jbws42.integration.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${jbws42.output.etc.dir}"/>
+ <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="true">
+ <fileset dir="${jbws42.etc.dir}">
+ <include name="default.mf"/>
+ </fileset>
+ <filterset>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filtersfile file="${jbws42.dir}/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+
+ <!-- Build jbossws-jboss42.jar -->
+ <mkdir dir="${jbws42.output.lib.dir}"/>
+ <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf">
+ <fileset dir="${jbws42.output.classes.dir}">
+ <include name="org/jboss/ws/integration/**"/>
+ <include name="org/jboss/wsf/container/jboss42/**"/>
+ </fileset>
+ <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-jboss42-resources.zip -->
+ <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-resources.zip" >
+ <fileset dir="${jbws42.resources.dir}"/>
+ </zip>
+
+ <!-- Build jbossws-jboss42-src.zip -->
+ <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" >
+ <fileset dir="${jbws42.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+ <mkdir dir="${jbws42.output.apidocs.dir}"/>
+ <javadoc destdir="${jbws42.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath>
+ <path refid="jbws42.integration.classpath"/>
+ </classpath>
+ <packageset dir="${jbws42.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/wsf/**"/>
+ </packageset>
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ </javadoc>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${jbws42.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ <delete dir="${jbws42.dir}/thirdparty"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="main">
+ </target>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss422/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/etc/component-info.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/etc/component-info.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/etc/component-info.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,28 @@
+<project name="jboss/jbossws-jboss50">
+
+ <component id="jboss/jbossws-jboss50"
+ description="JBossWS container integration layer"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-jboss50.jar"/>
+ <artifact id="jbossws-jboss50-deployer.zip"/>
+ <artifact id="jbossws-jboss50-src.zip"/>
+
+ <import componentref="jboss/jbossws-common">
+ <compatible version="@jbossws-common@"/>
+ </import>
+ <import componentref="jboss/jbossws-framework">
+ <compatible version="@jbossws-framework@"/>
+ </import>
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@jbossws-spi@"/>
+ </import>
+
+ <export>
+ <include input="jbossws-jboss50.jar"/>
+ </export>
+
+ </component>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss422/src/etc/component-info.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/etc/default.mf
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/etc/default.mf (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/etc/default.mf 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.2
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (build=(a)build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Added: container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,27 @@
+<project name="jboss/jbossws-jboss42">
+
+ <component id="jboss/jbossws-jboss42"
+ description="JBossWS container integration layer"
+ version="@repository.id@"
+ licenseType="lgpl">
+
+ <artifact id="jbossws-jboss42.jar"/>
+ <artifact id="jbossws-jboss42-src.zip"/>
+
+ <import componentref="jboss/jbossws-common">
+ <compatible version="@jbossws-common@"/>
+ </import>
+ <import componentref="jboss/jbossws-framework">
+ <compatible version="@jbossws-framework@"/>
+ </import>
+ <import componentref="jboss/jbossws-spi">
+ <compatible version="@jbossws-spi@"/>
+ </import>
+
+ <export>
+ <include input="jbossws-jboss42.jar"/>
+ </export>
+
+ </component>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/etc/component-info.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/etc/default.mf
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/etc/default.mf (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/etc/default.mf 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.2
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (build=(a)build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,199 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.deployment.*;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.util.List;
+
+/**
+ * An abstract web service deployer.
+ * Lazily adds deployer hooks to the deployment interceptors.
+ * Otherwise the dependency management at boot time doesn't work.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractDeployerHook implements DeployerHook
+{
+ // provide logging
+ protected final Logger log = Logger.getLogger(getClass());
+
+ private WSFRuntime runtime;
+ private DeploymentModelFactory deploymentModelFactory;
+
+ private List<ObjectName> phaseOneInterceptors;
+ private List<ObjectName> phaseTwoInterceptors;
+
+ /**
+ * MC injected
+ * @param runtime
+ */
+ public void setRuntime(WSFRuntime runtime)
+ {
+ this.runtime = runtime;
+ }
+
+ public WSFRuntime getRuntime()
+ {
+ return this.runtime;
+ }
+
+ public DeploymentModelFactory getDeploymentModelFactory()
+ {
+ if(null == deploymentModelFactory)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+ }
+
+ return deploymentModelFactory;
+ }
+
+ public ArchiveDeployment newDeployment(DeploymentInfo di)
+ {
+ try
+ {
+ DeploymentModelFactory factory = getDeploymentModelFactory();
+ ArchiveDeployment dep = (ArchiveDeployment)factory.newDeployment(di.shortName, di.annotationsCl);
+ if (di.parent != null)
+ {
+ DeploymentInfo parentInfo = di.parent;
+ ArchiveDeployment parentDep = (ArchiveDeployment)factory.newDeployment(parentInfo.shortName, parentInfo.annotationsCl);
+ dep.setParent(parentDep);
+ }
+ return dep;
+ }
+ catch (Exception ex)
+ {
+ throw new WSFDeploymentException("Cannot load spi.deployment.Deployment class", ex);
+ }
+ }
+
+ public Endpoint newEndpoint(String targetBean)
+ {
+ try
+ {
+ return getDeploymentModelFactory().newEndpoint(targetBean);
+ }
+ catch (Exception ex)
+ {
+ throw new WSFDeploymentException("Cannot load spi.deployment.Endpoint class", ex);
+ }
+ }
+
+ public void setPhaseOneInterceptors(List<ObjectName> phaseOneInterceptors)
+ {
+ this.phaseOneInterceptors = phaseOneInterceptors;
+ }
+
+ public void setPhaseTwoInterceptors(List<ObjectName> phaseTwoInterceptors)
+ {
+ this.phaseTwoInterceptors = phaseTwoInterceptors;
+ }
+
+ /** Return true if this deployment should be ignored
+ */
+ public boolean ignoreDeployment(DeploymentInfo unit)
+ {
+ return false;
+ }
+
+ /** Add the hooks to the interceptors
+ */
+ public void start()
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ try
+ {
+ if (phaseOneInterceptors != null)
+ {
+ for (ObjectName oname : phaseOneInterceptors)
+ {
+ DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server);
+ interceptor.addPhaseOneHook(this);
+ }
+ }
+
+ if (phaseTwoInterceptors != null)
+ {
+ for (ObjectName oname : phaseTwoInterceptors)
+ {
+ DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server);
+ interceptor.addPhaseTwoHook(this);
+ }
+ }
+ }
+ catch (MBeanProxyCreationException e)
+ {
+ throw new WSFDeploymentException(e);
+ }
+ }
+
+ /** Add the hooks to the interceptors
+ */
+ public void stop()
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ try
+ {
+ if (phaseOneInterceptors != null)
+ {
+ for (ObjectName oname : phaseOneInterceptors)
+ {
+ DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server);
+ interceptor.removePhaseOneHook(this);
+ }
+ }
+
+ if (phaseTwoInterceptors != null)
+ {
+ for (ObjectName oname : phaseTwoInterceptors)
+ {
+ DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server);
+ interceptor.removePhaseTwoHook(this);
+ }
+ }
+ }
+ catch (MBeanProxyCreationException e)
+ {
+ throw new WSFDeploymentException(e);
+ }
+ }
+
+ /** Get the deployment type this deployer can handle
+ */
+ public abstract Deployment.DeploymentType getDeploymentType();
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+
+//$Id$
+
+/**
+ * An abstract deployer for EJB Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
+{
+
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.WebMetaData;
+
+//$Id$
+
+/**
+ * An abstract deployer for JSE Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook
+{
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ if ((unit.metaData instanceof WebMetaData) == false)
+ return false;
+
+ return true;
+ }
+
+ static class Servlet
+ {
+ String servletName;
+ String servletClass;
+ public Servlet(String servletName, String servletClass)
+ {
+ this.servletName = servletName;
+ this.servletClass = servletClass;
+ }
+ public String getServletClass()
+ {
+ return servletClass;
+ }
+ public String getServletName()
+ {
+ return servletName;
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractInvocationHandler extends InvocationHandler
+{
+ protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ {
+ String methodName = seiMethod.getName();
+ Class[] paramTypes = seiMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++)
+ {
+ Class paramType = paramTypes[i];
+ if (JavaUtils.isPrimitive(paramType) == false)
+ {
+ String paramTypeName = paramType.getName();
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ paramTypes[i] = paramType;
+ }
+ }
+
+ Method implMethod = implClass.getMethod(methodName, paramTypes);
+ return implMethod;
+ }
+}
\ No newline at end of file
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,158 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.w3c.dom.Element;
+
+/**
+ * An abstract web service deployer.
+ *
+ * deploy(unit)
+ * if(isWebServiceDeployment)
+ * dep = createDeployment(unit)
+ * deploy(dep)
+ *
+ * undeploy(unit)
+ * dep = getDeployment(unit)
+ * undeploy(dep)
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class ArchiveDeployerHook extends AbstractDeployerHook
+{
+ /** Get the deployemnt type this deployer can handle
+ */
+ public abstract DeploymentType getDeploymentType();
+
+ /** Depending on the type of deployment, this method should return true
+ * if the deployment contains web service endpoints.
+ */
+ public abstract boolean isWebServiceDeployment(DeploymentInfo unit);
+
+ /** Create the Deployment for a given DeploymentInfo
+ */
+ public abstract Deployment createDeployment(DeploymentInfo unit);
+
+ /** Get the Deployment for a given DeploymentInfo
+ */
+ public Deployment getDeployment(DeploymentInfo unit)
+ {
+ Deployment dep = (Deployment)unit.context.get(Deployment.class);
+ return (dep != null && dep.getType() == getDeploymentType() ? dep : null);
+ }
+
+ public void deploy(DeploymentInfo unit) throws DeploymentException
+ {
+ if (ignoreDeployment(unit))
+ return;
+
+ if (isWebServiceDeployment(unit))
+ {
+ log.debug("deploy: " + unit.shortName);
+ Deployment dep = getDeployment(unit);
+ if (dep == null)
+ {
+ dep = createDeployment(unit);
+ dep.addAttachment(DeploymentInfo.class, unit);
+ }
+
+ getRuntime().create(dep);
+
+ unit.context.put(Deployment.class, dep);
+ }
+ }
+
+ public void undeploy(DeploymentInfo unit)
+ {
+ if (ignoreDeployment(unit))
+ return;
+
+ Deployment dep = getDeployment(unit);
+ if (dep != null)
+ {
+ log.debug("undeploy: " + unit.shortName);
+ getRuntime().stop(dep);
+ getRuntime().destroy(dep);
+ }
+ }
+
+ /** Unmrashall the webservices.xml if there is one
+ */
+ protected WebservicesMetaData getWebservicesMetaData(DeploymentInfo unit, String wsFile)
+ {
+ WebservicesMetaData wsMetaData = (WebservicesMetaData)unit.context.get(WebservicesMetaData.class);
+ UnifiedVirtualFile vfWebservices = getWebservicesFile(unit, wsFile);
+ if (wsMetaData == null && vfWebservices != null)
+ {
+ try
+ {
+ URL wsURL = vfWebservices.toURL();
+ Element root = DOMUtils.parse(wsURL.openStream());
+ String namespaceURI = root.getNamespaceURI();
+ if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee"))
+ {
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ ObjectModelFactory factory = new WebservicesFactory(wsURL);
+ wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null);
+ unit.context.put(WebservicesMetaData.class, wsMetaData);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new WSFDeploymentException(ex);
+ }
+ }
+ return wsMetaData;
+ }
+
+ private UnifiedVirtualFile getWebservicesFile(DeploymentInfo unit, String wsFile)
+ {
+ try
+ {
+ UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(unit.localCl);
+ return (wsFile != null ? vfsRoot.findChild(wsFile) : null);
+ }
+ catch (IOException e)
+ {
+ return null;
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,116 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Build container independent deployment info.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class ContainerMetaDataAdapter
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class);
+
+ private EJBArchiveMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3;
+ private EJBArchiveMetaDataAdapter applicationMetaDataAdapterEJB21;
+ private JSEArchiveMetaDataAdapter webMetaDataAdapter;
+
+ public void setApplicationMetaDataAdapterEJB21(EJBArchiveMetaDataAdapter adapter)
+ {
+ this.applicationMetaDataAdapterEJB21 = adapter;
+ }
+
+ public void setApplicationMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter)
+ {
+ this.applicationMetaDataAdapterEJB3 = adapter;
+ }
+
+ public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter)
+ {
+ this.webMetaDataAdapter = adapter;
+ }
+
+ public void buildContainerMetaData(Deployment dep, DeploymentInfo di)
+ {
+ dep.addAttachment(DeploymentInfo.class, di);
+ dep.setProperty(EJBArchiveMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject);
+
+ if (di.metaData instanceof WebMetaData)
+ {
+ JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, di);
+ if (webMetaData != null)
+ dep.addAttachment(JSEArchiveMetaData.class, webMetaData);
+
+ dep.setProperty("org.jboss.ws.webapp.url", getDeploymentURL(di));
+ }
+ else if (dep.getType() == DeploymentType.JAXWS_EJB3)
+ {
+ EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep);
+ if (appMetaData != null)
+ dep.addAttachment(EJBArchiveMetaData.class, appMetaData);
+ }
+ else if (di.metaData instanceof ApplicationMetaData)
+ {
+ EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, di);
+ if (appMetaData != null)
+ dep.addAttachment(EJBArchiveMetaData.class, appMetaData);
+ }
+ }
+
+ private URL getDeploymentURL(DeploymentInfo di)
+ {
+ URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url);
+ if ("file".equals(deploymentURL.getProtocol()))
+ {
+ String path = deploymentURL.getPath();
+ if (new File(path).isFile())
+ {
+ try
+ {
+ deploymentURL = new URL("jar:file:" + path + "!/");
+ }
+ catch (MalformedURLException e)
+ {
+ // ignore
+ }
+ }
+ }
+ return deploymentURL;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * A deployer that builds the UnifiedDeploymentInfo
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class ContainerMetaDataDeploymentAspect extends DeploymentAspect
+{
+ private ContainerMetaDataAdapter metaDataAdapter;
+
+ public void setMetaDataAdapter(ContainerMetaDataAdapter adapter)
+ {
+ this.metaDataAdapter = adapter;
+ }
+
+ @Override
+ public void create(Deployment dep, WSFRuntime runtime)
+ {
+ DeploymentInfo di = dep.getAttachment(DeploymentInfo.class);
+ if (di == null)
+ throw new IllegalStateException("Cannot obtain deployment info");
+
+ metaDataAdapter.buildContainerMetaData(dep, di);
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.ResourceInjector;
+import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandler extends InvocationHandler
+{
+ private SPIProvider spiProvider;
+ private ResourceInjectorFactory resourceInjectorFactory;
+
+ public DefaultInvocationHandler()
+ {
+ spiProvider = SPIProviderResolver.getInstance().getProvider();
+ resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class);
+ }
+
+ public Invocation createInvocation()
+ {
+ return new Invocation();
+ }
+
+ public void init(Endpoint ep)
+ {
+ }
+
+ protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ {
+ InvocationContext invCtx = epInv.getInvocationContext();
+ Object targetBean = invCtx.getTargetBean();
+ if (targetBean == null)
+ {
+ try
+ {
+ Class epImpl = ep.getTargetBeanClass();
+ targetBean = epImpl.newInstance();
+ invCtx.setTargetBean(targetBean);
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Canot get target bean instance", ex);
+ }
+ }
+ return targetBean;
+ }
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Object targetBean = getTargetBean(ep, epInv);
+
+ InvocationContext invContext = epInv.getInvocationContext();
+ WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
+ if (wsContext != null)
+ {
+
+ ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
+ injector.inject(targetBean, wsContext);
+ }
+
+ Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod());
+ Object retObj = method.invoke(targetBean, epInv.getArgs());
+ epInv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+
+ protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ {
+ String methodName = seiMethod.getName();
+ Class[] paramTypes = seiMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++)
+ {
+ Class paramType = paramTypes[i];
+ if (JavaUtils.isPrimitive(paramType) == false)
+ {
+ String paramTypeName = paramType.getName();
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ paramTypes[i] = paramType;
+ }
+ }
+
+ Method implMethod = implClass.getMethod(methodName, paramTypes);
+ return implMethod;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandlerJAXRPC extends DefaultInvocationHandler
+{
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Object targetBean = getTargetBean(ep, epInv);
+
+ InvocationContext invContext = epInv.getInvocationContext();
+ if (targetBean instanceof ServiceLifecycle)
+ {
+ ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class);
+ if (sepContext != null)
+ ((ServiceLifecycle)targetBean).init(sepContext);
+ }
+
+ try
+ {
+ super.invoke(ep, epInv);
+ }
+ finally
+ {
+ if (targetBean instanceof ServiceLifecycle)
+ {
+ ((ServiceLifecycle)targetBean).destroy();
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandlerJAXWS extends DefaultInvocationHandler
+{
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.logging.Logger;
+import org.dom4j.Document;
+import org.dom4j.Element;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Modifies web.xml for jbossws
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 19-May-2006
+ */
+public class DefaultWebAppDesciptorModifierImpl implements WebAppDesciptorModifier
+{
+ // logging support
+ private static Logger log = Logger.getLogger(DefaultWebAppDesciptorModifierImpl.class);
+
+ public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException
+ {
+ RewriteResults results = new RewriteResults();
+ Element root = webXml.getRootElement();
+
+ String propKey = "org.jboss.ws.webapp.ServletClass";
+ String servletClass = (String)dep.getProperty(propKey);
+ if (servletClass == null)
+ throw new IllegalStateException("Cannot obtain context property: " + propKey);
+
+ propKey = "org.jboss.ws.webapp.ContextParameterMap";
+ Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
+ if (contextParams != null)
+ {
+ for (Map.Entry<String, String> entry : contextParams.entrySet())
+ {
+ Element contextParam = root.addElement("context-param");
+ contextParam.addElement("param-name").addText(entry.getKey());
+ contextParam.addElement("param-value").addText(entry.getValue());
+ }
+ }
+
+ propKey = "org.jboss.ws.webapp.ServletContextListener";
+ String listenerClass = (String)dep.getProperty(propKey);
+ if (listenerClass != null)
+ {
+ Element listener = root.addElement("listener");
+ listener.addElement("listener-class").setText(listenerClass);
+ }
+
+ for (Iterator it = root.elementIterator("servlet"); it.hasNext();)
+ {
+ Element servlet = (Element)it.next();
+ String linkName = servlet.element("servlet-name").getTextTrim();
+
+ // find the servlet-class
+ Element classElement = servlet.element("servlet-class");
+
+ // JSP
+ if (classElement == null)
+ continue;
+
+ String orgServletClassName = classElement.getTextTrim();
+
+ // Get the servlet class
+ Class orgServletClass = null;
+ try
+ {
+ ClassLoader loader = dep.getInitialClassLoader();
+ orgServletClass = loader.loadClass(orgServletClassName);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + orgServletClassName);
+ }
+
+ String targetBeanName = null;
+
+ // Nothing to do if we have an <init-param>
+ if (isAlreadyModified(servlet))
+ {
+ for (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();)
+ {
+ Element elParam = (Element)itParam.next();
+ String paramName = elParam.element("param-name").getTextTrim();
+ String paramValue = elParam.element("param-value").getTextTrim();
+ if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName))
+ {
+ targetBeanName = paramValue;
+ }
+ }
+ }
+ else
+ {
+ // Check if it is a real servlet that we can ignore
+ if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass))
+ {
+ log.info("Ignore servlet: " + orgServletClassName);
+ continue;
+ }
+ else if (orgServletClassName.endsWith("Servlet"))
+ {
+ log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName);
+ continue;
+ }
+
+ classElement.setText(servletClass);
+
+ // add additional init params
+ if (orgServletClassName.equals(servletClass) == false)
+ {
+ targetBeanName = orgServletClassName;
+ Element paramElement = servlet.addElement("init-param");
+ paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT);
+ paramElement.addElement("param-value").addText(targetBeanName);
+ }
+ }
+
+ if (targetBeanName == null)
+ throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
+
+ // remember the target bean name
+ results.sepTargetMap.put(linkName, targetBeanName);
+ }
+
+ return results;
+ }
+
+ // Return true if the web.xml is already modified
+ private boolean isAlreadyModified(Element servlet)
+ {
+ for (Iterator it = servlet.elementIterator("init-param"); it.hasNext();)
+ {
+ Element elParam = (Element)it.next();
+ String paramName = elParam.element("param-name").getTextTrim();
+ if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName))
+ return true;
+ }
+ return false;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+
+//$Id$
+
+
+/**
+ * An interface for all web service deployer hooks
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 24-Apr-2007
+ */
+public interface DeployerHook
+{
+ void deploy(DeploymentInfo unit) throws DeploymentException;
+
+ void undeploy(DeploymentInfo unit);
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHook.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE
+{
+ /**
+ * The deployment should be created in phase 1.
+ */
+ @Override
+ public Deployment createDeployment(DeploymentInfo di)
+ {
+ Deployment deployment = (Deployment)di.context.get(Deployment.class);
+ if (null == deployment)
+ throw new IllegalArgumentException("spi.Deployment missing. Should be created in Phase 1");
+
+ return deployment;
+ }
+
+ /**
+ * A phase 2 deployer hook needs to reject first-place
+ * JSE deployments and wait for those that are re-written.
+ * We rely on the fact that spi.Deployment is created in phase 1.
+ */
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo di)
+ {
+ if (super.isWebServiceDeployment(di) == false)
+ return false;
+
+ Deployment deployment = (Deployment)di.context.get(Deployment.class);
+ return deployment != null;
+ }
+
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,153 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.deployment.SubDeployerInterceptorSupport;
+import org.jboss.mx.server.Invocation;
+import org.jboss.mx.util.MBeanProxy;
+
+/**
+ * A deployer service that manages WS4EE compliant Web Services
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 03-May-2007
+ */
+public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport implements DeployerInterceptorMBean
+{
+ // The main deployer
+ private MainDeployerMBean mainDeployer;
+
+ private List<DeployerHook> phaseOneHooks = new LinkedList<DeployerHook>();
+ private List<DeployerHook> phaseTwoHooks = new LinkedList<DeployerHook>();
+
+ public void addPhaseOneHook(DeployerHook hook)
+ {
+ log.debug("Add phase-one deployer hook: " + hook);
+ phaseOneHooks.add(hook);
+ }
+
+ public void removePhaseOneHook(DeployerHook hook)
+ {
+ log.debug("Remove phase-one deployer hook: " + hook);
+ phaseOneHooks.remove(hook);
+ }
+
+ public void addPhaseTwoHook(DeployerHook hook)
+ {
+ log.debug("Add phase-two deployer hook: " + hook);
+ phaseTwoHooks.add(hook);
+ }
+
+ public void removePhaseTwoHook(DeployerHook hook)
+ {
+ log.debug("Remove phase-two deployer hook: " + hook);
+ phaseTwoHooks.remove(hook);
+ }
+
+ @Override
+ protected final Object create(Invocation invocation, DeploymentInfo unit) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ for (DeployerHook deployer : phaseOneHooks)
+ deployer.deploy(unit);
+
+ return retn;
+ }
+
+ @Override
+ protected final Object start(Invocation invocation, DeploymentInfo unit) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ for (DeployerHook deployer : phaseTwoHooks)
+ deployer.deploy(unit);
+
+ return retn;
+ }
+
+ @Override
+ protected final Object stop(Invocation invocation, DeploymentInfo unit) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ for (DeployerHook deployer : phaseTwoHooks)
+ deployer.undeploy(unit);
+
+ return retn;
+ }
+
+ @Override
+ protected final Object destroy(Invocation invocation, DeploymentInfo unit) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+
+ for (DeployerHook deployer : phaseOneHooks)
+ deployer.undeploy(unit);
+
+ return retn;
+ }
+
+ /** Create the deployer service
+ */
+ protected void createService() throws Exception
+ {
+ mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ super.attach();
+ }
+
+ /** Destroy the deployer service
+ */
+ protected void destroyService()
+ {
+ super.detach();
+ }
+
+ /**
+ * Handle all webservice deployment exceptions.
+ * You can either simply log the problem and keep the EJB/WAR module
+ * alive or undeploy properly.
+ */
+ protected void handleStartupException(DeploymentInfo di, Throwable th)
+ {
+ log.error("Cannot startup webservice for: " + di.shortName, th);
+ mainDeployer.undeploy(di);
+ }
+
+ /**
+ * Handle all webservice deployment exceptions.
+ *
+ * You can either simply logs the problem and keep the EJB/WAR module
+ * alive or undeploy properly.
+ */
+ protected void handleShutdownException(String moduleName, Throwable th)
+ {
+ log.error("Cannot shutdown webservice for: " + moduleName, th);
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+/**
+ * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 15-Jan-2005
+ */
+public class DeployerInterceptorEJB21 extends DeployerInterceptor implements DeployerInterceptorEJB21MBean
+{
+
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import javax.management.ObjectName;
+
+import org.jboss.wsf.common.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorEJB21MBean extends DeployerInterceptorMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21");
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB21MBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+/**
+ * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2005
+ */
+public class DeployerInterceptorEJB3 extends DeployerInterceptor implements DeployerInterceptorEJB3MBean
+{
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import javax.management.ObjectName;
+
+import org.jboss.wsf.common.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorEJB3MBean extends DeployerInterceptorMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3");
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorEJB3MBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+/**
+ * A deployer service that manages WS4EE compliant Web Services for WAR
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 15-Jan-2005
+ */
+public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean
+{
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import javax.management.ObjectName;
+
+import org.jboss.wsf.common.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorJSEMBean extends DeployerInterceptorMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE");
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorJSEMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.deployment.SubDeployerInterceptorMBean;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorMBean extends SubDeployerInterceptorMBean
+{
+ void addPhaseOneHook(DeployerHook deployer);
+
+ void removePhaseOneHook(DeployerHook deployer);
+
+ void addPhaseTwoHook(DeployerHook deployer);
+
+ void removePhaseTwoHook(DeployerHook deployer);
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeployerInterceptorMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.WSFRuntimeLocator;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.http.HttpContext;
+import org.jboss.wsf.spi.http.HttpContextFactory;
+import org.jboss.wsf.spi.http.HttpServer;
+
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * A HTTP Server that uses DeploymentAspects
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 07-Jul-2006
+ */
+public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
+{
+ private String runtimeName;
+
+
+ public void setRuntimeName(String runtimeName)
+ {
+ this.runtimeName = runtimeName;
+ }
+
+ /** Start an instance of this HTTP server */
+ public void start()
+ {
+ // verify required properties
+ }
+
+ /** Create an HTTP context */
+ public HttpContext createContext(String contextRoot)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ HttpContext httpContext = spiProvider.getSPI(HttpContextFactory.class).newHttpContext(this, contextRoot);
+ return httpContext;
+ }
+
+ /** Publish an JAXWS endpoint to the HTTP server */
+ public void publish(HttpContext context, Endpoint endpoint)
+ {
+ Class implClass = getImplementorClass(endpoint);
+
+ try
+ {
+ // Get the deployment model factory
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+
+ // Create/Setup the deployment
+ Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+
+ // Create/Setup the service
+ Service service = dep.getService();
+ service.setContextRoot(context.getContextRoot());
+
+ // Create/Setup the endpoint
+ org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
+ service.addEndpoint(ep);
+
+ // Deploy using deployment aspects
+ WSFRuntimeLocator locator = spiProvider.getSPI(WSFRuntimeLocator.class);
+ WSFRuntime runtime = locator.locateRuntime(runtimeName);
+
+ runtime.create(dep);
+ runtime.start(dep);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ /** Destroys an JAXWS endpoint on the HTTP server */
+ public void destroy(HttpContext context, Endpoint endpoint)
+ {
+ try
+ {
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ private Class getImplementorClass(Endpoint endpoint)
+ {
+ Object implementor = endpoint.getImplementor();
+ Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass());
+ return implClass;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public abstract class EJBArchiveMetaDataAdapter
+{
+ public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentInfo di)
+ {
+ ApplicationMetaData apmd = (ApplicationMetaData)di.metaData;
+ dep.addAttachment(ApplicationMetaData.class, apmd);
+
+ EJBArchiveMetaData appMetaData = new EJBArchiveMetaData();
+ buildUnifiedBeanMetaData(appMetaData, apmd);
+ appMetaData.setConfigName(apmd.getConfigName());
+ appMetaData.setConfigFile(apmd.getConfigFile());
+ appMetaData.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
+ appMetaData.setSecurityDomain(apmd.getSecurityDomain());
+ appMetaData.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
+ return appMetaData;
+ }
+
+ protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return apmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ protected void buildUnifiedBeanMetaData(EJBArchiveMetaData umd, ApplicationMetaData metaData)
+ {
+ List<EJBMetaData> beans = new ArrayList<EJBMetaData>();
+ Iterator it = metaData.getEnterpriseBeans();
+ while (it.hasNext())
+ {
+ BeanMetaData bmd = (BeanMetaData)it.next();
+ EJBMetaData ubmd = buildUnifiedBeanMetaData(bmd);
+ if (ubmd != null)
+ {
+ beans.add(ubmd);
+ }
+ }
+ umd.setEnterpriseBeans(beans);
+ }
+
+ protected abstract EJBMetaData buildUnifiedBeanMetaData(BeanMetaData bmd);
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EjbPortComponentMetaData;
+import org.jboss.metadata.MessageDrivenMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class EJBArchiveMetaDataAdapterEJB21 extends EJBArchiveMetaDataAdapter
+{
+ @Override
+ protected EJBMetaData buildUnifiedBeanMetaData(BeanMetaData bmd)
+ {
+ EJBMetaData ubmd = null;
+ if (bmd instanceof SessionMetaData)
+ {
+ ubmd = new SLSBMetaData();
+ }
+ else if (bmd instanceof MessageDrivenMetaData)
+ {
+ ubmd = new MDBMetaData();
+ ((MDBMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(bmd.getEjbName());
+ ubmd.setEjbClass(bmd.getEjbClass());
+ ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
+ ubmd.setHome(bmd.getHome());
+ ubmd.setLocalHome(bmd.getLocalHome());
+ ubmd.setJndiName(bmd.getJndiName());
+ ubmd.setLocalJndiName(bmd.getLocalJndiName());
+
+ EjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ if (pcmd != null)
+ {
+ ubmd.setPortComponentName(pcmd.getPortComponentName());
+ ubmd.setPortComponentURI(pcmd.getPortComponentURI());
+ EJBSecurityMetaData smd = new EJBSecurityMetaData();
+ smd.setAuthMethod(pcmd.getAuthMethod());
+ smd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
+ ubmd.setSecurityMetaData(smd);
+ }
+ }
+ return ubmd;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.metamodel.EnterpriseBean;
+import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ActivationConfigPropertyMetaData;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Apr-2007
+ */
+public class EJBArchiveMetaDataAdapterEJB3
+{
+ // logging support
+ private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class);
+
+ public static final String DEPLOYED_OBJECT = "org.jboss.ws.ejb3.deployed.object";
+
+ public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep)
+ {
+ EJBArchiveMetaData appMetaData = null;
+
+ ObjectName oname = (ObjectName)dep.getProperty(DEPLOYED_OBJECT);
+
+ // jboss.j2ee:service=EJB3,module=some-ejb3.jar
+ if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service")))
+ {
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(oname);
+
+ ArrayList<EJBMetaData> beans = new ArrayList<EJBMetaData>();
+ for (Object container : ejb3Module.getContainers().values())
+ {
+ if (container instanceof StatelessContainer)
+ {
+ StatelessContainer slc = (StatelessContainer)container;
+ EJBMetaData usmd = new SLSBMetaData();
+ usmd.setEjbName(slc.getEjbName());
+ usmd.setEjbClass(slc.getBeanClassName());
+ beans.add(usmd);
+ }
+ }
+
+ appMetaData = new EJBArchiveMetaData();
+ appMetaData.setEnterpriseBeans(beans);
+ }
+ return appMetaData;
+ }
+
+ static Ejb3ModuleMBean getEJB3Module(ObjectName objectName)
+ {
+ Ejb3ModuleMBean ejb3Module;
+ try
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server);
+ if (ejb3Module == null)
+ throw new WSFDeploymentException("Cannot obtain EJB3 module: " + objectName);
+
+ return ejb3Module;
+ }
+ catch (MBeanProxyCreationException ex)
+ {
+ throw new WSFDeploymentException("Cannot obtain proxy to EJB3 module");
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,184 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.lang.reflect.Method;
+import java.security.Principal;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.ejb.EjbModule;
+import org.jboss.ejb.Interceptor;
+import org.jboss.ejb.StatelessSessionContainer;
+import org.jboss.invocation.InvocationKey;
+import org.jboss.invocation.InvocationType;
+import org.jboss.invocation.PayloadKey;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+
+/**
+ * Handles invocations on EJB21 endpoints.
+ * Used with jboss40 and jboss42.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerEJB21 extends InvocationHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class);
+
+ private String jndiName;
+ private MBeanServer server;
+ private ObjectName objectName;
+
+ /**
+ * Used from both 40 and 42.
+ * Therefore it's not package protected...
+ */
+ public InvocationHandlerEJB21()
+ {
+ }
+
+ public Invocation createInvocation()
+ {
+ return new Invocation();
+ }
+
+ public void init(Endpoint ep)
+ {
+ String ejbName = ep.getShortName();
+ Deployment dep = ep.getService().getDeployment();
+ EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+ EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName);
+ if (beanMetaData == null)
+ throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName);
+
+ // get the bean's JNDI name
+ jndiName = beanMetaData.getContainerObjectNameJndiName();
+ if (jndiName == null)
+ throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName);
+
+ server = MBeanServerLocator.locateJBoss();
+ objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB");
+ if (server.isRegistered(objectName) == false)
+ throw new WebServiceException("Cannot find service endpoint target: " + objectName);
+
+ // Dynamically add the service endpoint interceptor
+ // http://jira.jboss.org/jira/browse/JBWS-758
+ try
+ {
+ EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule");
+ StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName);
+
+ boolean injectionPointFound = false;
+ Interceptor prev = container.getInterceptor();
+ while (prev != null && prev.getNext() != null)
+ {
+ Interceptor next = prev.getNext();
+ if (next.getNext() == null)
+ {
+ log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName());
+ ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor();
+ prev.setNext(sepInterceptor);
+ sepInterceptor.setNext(next);
+ injectionPointFound = true;
+ }
+ prev = next;
+ }
+ if (injectionPointFound == false)
+ log.warn("Cannot service endpoint interceptor injection point");
+ }
+ catch (Exception ex)
+ {
+ log.warn("Cannot add service endpoint interceptor", ex);
+ }
+
+ }
+
+ public void invoke(Endpoint ep, Invocation inv) throws Exception
+ {
+ log.debug("Invoke: " + inv.getJavaMethod().getName());
+
+ // invoke on the container
+ try
+ {
+ // setup the invocation
+ org.jboss.invocation.Invocation jbInv = getMBeanInvocation(inv);
+
+ String[] sig = { org.jboss.invocation.Invocation.class.getName() };
+ Object retObj = server.invoke(objectName, "invoke", new Object[] { jbInv }, sig);
+ inv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+
+ private org.jboss.invocation.Invocation getMBeanInvocation(Invocation inv)
+ {
+ // EJB2.1 endpoints will only get an JAXRPC context
+ MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class);
+ if (msgContext == null)
+ throw new IllegalStateException("Cannot obtain MessageContext");
+
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+ Principal principal = securityAdaptor.getPrincipal();
+ Object credential = securityAdaptor.getCredential();
+
+ Method method = inv.getJavaMethod();
+ Object[] args = inv.getArgs();
+ org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
+
+ HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
+ if (callback == null)
+ throw new IllegalStateException("Cannot obtain HandlerCallback");
+
+ jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
+ jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
+ jbInv.setType(InvocationType.SERVICE_ENDPOINT);
+ jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
+ jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
+
+ return jbInv;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import javax.ejb.EJBContext;
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.aop.Dispatcher;
+import org.jboss.aop.MethodInfo;
+import org.jboss.ejb3.BeanContext;
+import org.jboss.ejb3.BeanContextLifecycleCallback;
+import org.jboss.ejb3.EJBContainerInvocation;
+import org.jboss.ejb3.stateless.StatelessBeanContext;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.injection.lang.reflect.BeanProperty;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationType;
+import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
+
+/**
+ * Handles invocations on EJB3 endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerEJB3 extends AbstractInvocationHandler
+{
+ private ObjectName objectName;
+
+ InvocationHandlerEJB3()
+ {
+ }
+
+ public Invocation createInvocation()
+ {
+ return new Invocation();
+ }
+
+ public void init(Endpoint ep)
+ {
+ String ejbName = ep.getShortName();
+ ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment();
+ String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName();
+ if (dep.getParent() != null)
+ {
+ nameStr += ",ear=" + dep.getParent().getSimpleName();
+ }
+
+ objectName = ObjectNameFactory.create(nameStr.toString());
+
+ Dispatcher dispatcher = Dispatcher.singleton;
+ if (dispatcher.getRegistered(objectName.getCanonicalName()) == null)
+ throw new WebServiceException("Cannot find service endpoint target: " + objectName);
+ }
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Dispatcher dispatcher = Dispatcher.singleton;
+ StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName());
+ Class beanClass = container.getBeanClass();
+
+ Method method = getImplMethod(beanClass, epInv.getJavaMethod());
+ Object[] args = epInv.getArgs();
+
+ MethodInfo info = container.getMethodInfo(method);
+ EJBContainerInvocation<StatelessContainer, StatelessBeanContext> ejb3Inv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info);
+ ejb3Inv.setAdvisor(container);
+ ejb3Inv.setArguments(args);
+ ejb3Inv.setContextCallback(new CallbackImpl(epInv));
+
+ Object retObj = ejb3Inv.invokeNext();
+
+ epInv.setReturnValue(retObj);
+ }
+ catch (Throwable th)
+ {
+ handleInvocationException(th);
+ }
+ }
+
+ static class CallbackImpl implements BeanContextLifecycleCallback
+ {
+ private javax.xml.ws.handler.MessageContext jaxwsMessageContext;
+ private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext;
+
+ public CallbackImpl(Invocation epInv)
+ {
+ jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class);
+ jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class);
+ }
+
+ public void attached(BeanContext beanCtx)
+ {
+ StatelessBeanContext sbc = (StatelessBeanContext)beanCtx;
+ sbc.setMessageContextJAXRPC(jaxrpcMessageContext);
+
+ EJBContext ejbCtx = beanCtx.getEJBContext();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ WebServiceContextFactory factory = spiProvider.getSPI(WebServiceContextFactory.class);
+ ExtensibleWebServiceContext wsContext = factory.newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext);
+ wsContext.addAttachment(EJBContext.class, ejbCtx);
+ sbc.setWebServiceContext(wsContext);
+ }
+
+ public void released(BeanContext beanCtx)
+ {
+ StatelessBeanContext sbc = (StatelessBeanContext)beanCtx;
+ sbc.setMessageContextJAXRPC(null);
+
+ sbc.setWebServiceContext(null);
+ }
+ }
+}
\ No newline at end of file
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.invocation.*;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 19, 2007
+ */
+public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory
+{
+ public InvocationHandler newInvocationHandler(InvocationType type)
+ {
+ InvocationHandler handler = null;
+
+ switch(type)
+ {
+ case JAXRPC_JSE:
+ handler = new DefaultInvocationHandlerJAXRPC();
+ break;
+ case JAXRPC_EJB21:
+ handler = new InvocationHandlerEJB21();
+ break;
+ case JAXRPC_MDB21:
+ handler = new InvocationHandlerMDB21();
+ break;
+ case JAXWS_JSE:
+ handler = new DefaultInvocationHandlerJAXWS();
+ break;
+ case JAXWS_EJB21:
+ handler = new InvocationHandlerEJB21();
+ break;
+ case JAXWS_EJB3:
+ handler = new InvocationHandlerEJB3();
+ }
+
+ if(null == handler)
+ throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type);
+
+ return handler;
+ }
+
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+import java.lang.reflect.Method;
+
+/**
+ * Handles invocations on MDB EJB21 endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerMDB21 extends AbstractInvocationHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class);
+
+ public Invocation createInvocation()
+ {
+ return new Invocation();
+ }
+
+ public void init(Endpoint ep)
+ {
+
+ }
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ log.debug("Invoke: " + epInv.getJavaMethod().getName());
+
+ try
+ {
+ InvocationContext invContext = epInv.getInvocationContext();
+ Object targetBean = invContext.getTargetBean();
+ Class implClass = targetBean.getClass();
+ Method seiMethod = epInv.getJavaMethod();
+ Method implMethod = getImplMethod(implClass, seiMethod);
+
+ Object[] args = epInv.getArgs();
+ Object retObj = implMethod.invoke(targetBean, args);
+ epInv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * A deployer JAXRPC EJB21 Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB
+{
+ /** Get the deployemnt type this deployer can handle
+ */
+ public DeploymentType getDeploymentType()
+ {
+ return DeploymentType.JAXRPC_EJB21;
+ }
+
+ @Override
+ public Deployment createDeployment(DeploymentInfo di)
+ {
+ ArchiveDeployment dep = newDeployment(di);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
+ dep.setRuntimeClassLoader(di.ucl);
+ dep.setType(getDeploymentType());
+
+ Service service = dep.getService();
+
+ ApplicationMetaData appmd = (ApplicationMetaData)di.metaData;
+ if (appmd == null)
+ throw new IllegalStateException("Deployment unit does not contain application meta data");
+
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(di, null);
+ if (wsMetaData == null)
+ throw new IllegalStateException("Deployment unit does not contain webservices meta data");
+
+ // Copy the attachments
+ dep.addAttachment(WebservicesMetaData.class, wsMetaData);
+ dep.addAttachment(ApplicationMetaData.class, appmd);
+
+ for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+ {
+ for (PortComponentMetaData pcmd : wsd.getPortComponents())
+ {
+ String ejbLink = pcmd.getEjbLink();
+ if (ejbLink == null)
+ throw new IllegalStateException("ejb-link cannot be null");
+
+ BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink);
+ if (beanMetaData == null)
+ throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink);
+
+ String ejbClass = beanMetaData.getEjbClass();
+
+ // Create the endpoint
+ Endpoint ep = newEndpoint(ejbClass);
+ ep.setShortName(ejbLink);
+ service.addEndpoint(ep);
+ }
+ }
+ return dep;
+ }
+
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ if ((unit.metaData instanceof ApplicationMetaData) == false)
+ return false;
+
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "META-INF/webservices.xml");
+ return wsMetaData != null;
+ }
+}
\ No newline at end of file
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
+
+/**
+ * A deployer JAXRPC JSE Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE
+{
+
+ public void deploy(DeploymentInfo unit) throws DeploymentException
+ {
+ if (ignoreDeployment(unit))
+ return;
+
+ if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+ {
+ log.debug("deploy: " + unit.shortName);
+ Deployment dep = getDeployment(unit);
+ if(null==dep || Deployment.DeploymentState.CREATED != dep.getState())
+ throw new DeploymentException("Create step is missing");
+
+ getRuntime().start(dep);
+ }
+ }
+
+ /** Get the deployment type this deployer can handle
+ */
+ public Deployment.DeploymentType getDeploymentType()
+ {
+ return Deployment.DeploymentType.JAXRPC_JSE;
+ }
+
+
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml");
+ return (wsMetaData!=null && super.isWebServiceDeployment(unit));
+ }
+
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,149 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * A deployer JAXRPC JSE Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE
+{
+
+ public void undeploy(DeploymentInfo unit)
+ {
+ // the post hook deals with undeployment
+ }
+
+ /** Get the deployemnt type this deployer can handle
+ */
+ public DeploymentType getDeploymentType()
+ {
+ return DeploymentType.JAXRPC_JSE;
+ }
+
+ /**
+ * Create an endpoint for every servlet-link in webservices.xml
+ */
+ @Override
+ public Deployment createDeployment(DeploymentInfo di)
+ {
+ ArchiveDeployment dep = newDeployment(di);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
+ dep.setRuntimeClassLoader(null);
+ dep.setType(getDeploymentType());
+
+ Service service = dep.getService();
+
+ WebMetaData webMetaData = (WebMetaData)di.metaData;
+ if (webMetaData == null)
+ throw new IllegalStateException("Deployment unit does not contain web meta data");
+
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(di, "WEB-INF/webservices.xml");
+ if (wsMetaData == null)
+ throw new IllegalStateException("Deployment unit does not contain webservices meta data");
+
+ // Copy the attachments
+ dep.addAttachment(WebservicesMetaData.class, wsMetaData);
+ dep.addAttachment(WebMetaData.class, webMetaData);
+
+ for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+ {
+ for (PortComponentMetaData pcmd : wsd.getPortComponents())
+ {
+ String servletLink = pcmd.getServletLink();
+ if (servletLink == null)
+ throw new IllegalStateException("servlet-link cannot be null");
+
+ Servlet servlet = getServletForName(webMetaData, servletLink);
+ String servletClass = servlet.getServletClass();
+
+ try
+ {
+ ClassLoader loader = dep.getInitialClassLoader();
+ Class<?> epBean = loader.loadClass(servletClass.trim());
+
+ // If this is a servlet we defer the the bean creation
+ if (javax.servlet.Servlet.class.isAssignableFrom(epBean))
+ servletClass = null;
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + servletClass);
+ }
+
+ // Create the endpoint
+ Endpoint ep = newEndpoint(servletClass);
+ ep.setShortName(servletLink);
+ service.addEndpoint(ep);
+ }
+ }
+
+ return dep;
+ }
+
+ private Servlet getServletForName(WebMetaData wmd, String servletLink)
+ {
+ Iterator it = wmd.getServletClassMap().entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry entry = (Entry)it.next();
+ String servletName = (String)entry.getKey();
+ String servletClass = (String)entry.getValue();
+ if (servletLink.equals(servletName))
+ {
+ return new Servlet(servletName, servletClass);
+ }
+ }
+ throw new IllegalStateException("Cannot find servlet for link: " + servletLink);
+ }
+
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ if (super.isWebServiceDeployment(unit) == false
+ || unit.context.get("org.jboss.ws.ejbwebapp")!=null) // Reject EJB im-memory deployments)
+ return false;
+
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml");
+ return wsMetaData != null;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.mdb.MessagingContainer;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+/**
+ * A deployer JAXWS EJB3 Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB
+{
+ /** Get the deployemnt type this deployer can handle
+ */
+ public DeploymentType getDeploymentType()
+ {
+ return DeploymentType.JAXWS_EJB3;
+ }
+
+ @Override
+ public Deployment createDeployment(DeploymentInfo di)
+ {
+ ArchiveDeployment dep = newDeployment(di);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
+ dep.setRuntimeClassLoader(di.ucl);
+ dep.setType(getDeploymentType());
+
+ Service service = dep.getService();
+
+ Ejb3ModuleMBean ejb3Module = EJBArchiveMetaDataAdapterEJB3.getEJB3Module(di.deployedObject);
+ for (Object manager : ejb3Module.getContainers().values())
+ {
+ if (manager instanceof EJBContainer)
+ {
+ EJBContainer container = (EJBContainer)manager;
+ if (isWebServiceBean(container))
+ {
+ String ejbName = container.getEjbName();
+ String epBean = container.getBeanClassName();
+
+ // Create the endpoint
+ Endpoint ep = newEndpoint(epBean);
+ ep.setShortName(ejbName);
+ service.addEndpoint(ep);
+ }
+ }
+ }
+
+ return dep;
+ }
+
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ boolean isWebserviceDeployment = false;
+
+ // Check if the ejb3 contains annotated endpoints
+ Ejb3ModuleMBean ejb3Module = EJBArchiveMetaDataAdapterEJB3.getEJB3Module(unit.deployedObject);
+ for (Object manager : ejb3Module.getContainers().values())
+ {
+ if (manager instanceof EJBContainer)
+ {
+ EJBContainer container = (EJBContainer)manager;
+ if (isWebServiceBean(container))
+ {
+ isWebserviceDeployment = true;
+ break;
+ }
+ }
+ }
+
+ return isWebserviceDeployment;
+ }
+
+ private boolean isWebServiceBean(EJBContainer container)
+ {
+ boolean isWebServiceBean = false;
+ if (container instanceof StatelessContainer || container instanceof MessagingContainer)
+ {
+ boolean isWebService = container.resolveAnnotation(WebService.class) != null;
+ boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null;
+ isWebServiceBean = isWebService || isWebServiceProvider;
+ }
+ return isWebServiceBean;
+ }
+
+
+ public void deploy(DeploymentInfo unit) throws DeploymentException
+ {
+ super.deploy(unit);
+
+ Deployment dep = getDeployment(unit);
+ if (dep == null)
+ {
+ throw new IllegalStateException("Deployment missing in start phase");
+ }
+
+ getRuntime().start(dep);
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE
+{
+
+
+ public void deploy(DeploymentInfo unit) throws DeploymentException
+ {
+ if (ignoreDeployment(unit))
+ return;
+
+ if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+ {
+ log.debug("deploy: " + unit.shortName);
+ Deployment dep = getDeployment(unit);
+
+ if (null == dep || Deployment.DeploymentState.CREATED != dep.getState())
+ throw new DeploymentException("Create step failed");
+
+ getRuntime().start(dep);
+ }
+ }
+
+ /** Get the deployment type this deployer can handle
+ */
+ public Deployment.DeploymentType getDeploymentType()
+ {
+ return Deployment.DeploymentType.JAXWS_JSE;
+ }
+
+ /**
+ * Reject JAX-RPC deployments
+ */
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); // JAX-RPC artifact
+ return (wsMetaData == null && super.isWebServiceDeployment(unit));
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,155 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+import javax.ejb.Stateless;
+import javax.ejb.Stateful;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.wsf.common.URLLoaderAdapter;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+
+
+/**
+ * A deployer JAXWS JSE Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE
+{
+
+
+ public void undeploy(DeploymentInfo unit)
+ {
+ // let the post hook deal with undeployment
+ }
+
+ /** Get the deployemnt type this deployer can handle
+ */
+ public DeploymentType getDeploymentType()
+ {
+ return DeploymentType.JAXWS_JSE;
+ }
+
+ @Override
+ public Deployment createDeployment(DeploymentInfo di)
+ {
+ ArchiveDeployment dep = newDeployment(di);
+ dep.setRootFile(new URLLoaderAdapter(di.localUrl));
+ dep.setRuntimeClassLoader(null);
+ dep.setType(getDeploymentType());
+
+ Service service = dep.getService();
+
+ WebMetaData webMetaData = (WebMetaData)di.metaData;
+ if (webMetaData == null)
+ throw new IllegalStateException("Deployment unit does not contain web meta data");
+
+ // Copy the attachments
+ dep.addAttachment(WebMetaData.class, webMetaData);
+
+ List<Servlet> servlets = getEndpointBeans(webMetaData, di.annotationsCl);
+ for (Servlet servlet : servlets)
+ {
+ String servletName = servlet.getServletName();
+ String servletClass = servlet.getServletClass();
+
+ // Create the endpoint
+ Endpoint ep = newEndpoint(servletClass);
+ ep.setShortName(servletName);
+ service.addEndpoint(ep);
+ }
+
+ return dep;
+ }
+
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo unit)
+ {
+ if (super.isWebServiceDeployment(unit) == false
+ || unit.context.get("org.jboss.ws.ejbwebapp")!=null) // Reject EJB im-memory deployments
+ return false;
+
+ boolean isWebServiceDeployment = false;
+ try
+ {
+ WebMetaData webMetaData = (WebMetaData)unit.metaData;
+ List<Servlet> servlets = getEndpointBeans(webMetaData, unit.annotationsCl);
+ isWebServiceDeployment = servlets.size() > 0;
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot process web deployment", ex);
+ }
+
+ return isWebServiceDeployment;
+ }
+
+ private List<Servlet> getEndpointBeans(WebMetaData webMetaData, ClassLoader loader)
+ {
+ List<Servlet> servlets = new ArrayList<Servlet>();
+ Iterator it = webMetaData.getServletClassMap().entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry entry = (Entry)it.next();
+ String servletName = (String)entry.getKey();
+ String servletClassName = (String)entry.getValue();
+
+ // Skip JSPs
+ if (servletClassName == null || servletClassName.length() == 0)
+ continue;
+
+ try
+ {
+ Class<?> servletClass = loader.loadClass(servletClassName.trim());
+ boolean isWebService = servletClass.isAnnotationPresent(WebService.class);
+ boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class);
+ if (isWebService || isWebServiceProvider)
+ servlets.add(new Servlet(servletName, servletClassName));
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + servletClassName);
+ continue;
+ }
+ }
+ return servlets;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.deployment.J2eeModuleMetaData;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.WebSecurityMetaData;
+import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection;
+
+/**
+ * Build container independent web meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class JSEArchiveMetaDataAdapter
+{
+ public JSEArchiveMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentInfo di)
+ {
+ String contextRoot = null;
+
+ WebMetaData wmd = (WebMetaData)di.metaData;
+ dep.addAttachment(WebMetaData.class, wmd);
+
+ if (di.parent != null)
+ {
+ J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData;
+ if(appmd!=null) // An ESB case, They deploy a *.war inside *.esb
+ {
+ Iterator it = appmd.getModules();
+ while (it.hasNext())
+ {
+ J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
+ if (module.getFileName().equals(dep.getSimpleName()))
+ contextRoot = module.getWebContext();
+ }
+ }
+ }
+
+ if (contextRoot == null)
+ contextRoot = wmd.getContextRoot();
+
+ JSEArchiveMetaData webMetaData = new JSEArchiveMetaData();
+ webMetaData.setContextRoot(contextRoot);
+ webMetaData.setServletMappings(wmd.getServletMappings());
+ webMetaData.setServletClassNames(getServletClassMap(wmd));
+ webMetaData.setConfigName(wmd.getConfigName());
+ webMetaData.setConfigFile(wmd.getConfigFile());
+ webMetaData.setSecurityDomain(wmd.getSecurityDomain());
+ webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+ webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
+
+ return webMetaData;
+ }
+
+ private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return wmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ private List<JSESecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
+ {
+ ArrayList<JSESecurityMetaData> unifiedsecurityMetaData = new ArrayList<JSESecurityMetaData>();
+
+ while (securityConstraints.hasNext())
+ {
+ WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next();
+
+ JSESecurityMetaData current = new JSESecurityMetaData();
+ unifiedsecurityMetaData.add(current);
+
+ current.setTransportGuarantee(securityMetaData.getTransportGuarantee());
+
+ HashMap resources = securityMetaData.getWebResources();
+ for (Object webResourceObj : resources.values())
+ {
+ WebResourceCollection webResource = (WebResourceCollection)webResourceObj;
+ JSEResourceCollection currentResource = current.addWebResource(webResource.getName());
+ for (String currentPattern : webResource.getUrlPatterns())
+ {
+ currentResource.addPattern(currentPattern);
+ }
+ }
+
+ }
+
+ return unifiedsecurityMetaData;
+ }
+
+ private Map<String, String> getServletClassMap(WebMetaData wmd)
+ {
+ Map<String, String> mappings = new HashMap<String, String>();
+ Iterator it = wmd.getServletClassMap().entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry entry = (Entry)it.next();
+ String servletName = (String)entry.getKey();
+ String servletClass = (String)entry.getValue();
+ // Skip JSPs
+ if (servletClass != null)
+ mappings.put(servletName, servletClass);
+ }
+ return mappings;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,143 @@
+/*
+ * 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.wsf.container.jboss42;
+
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.ComposableRuntime;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
+import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+
+/**
+ * Lazy assembly required because MC 1.0.x doesn't support IOC
+ * across different beans configurations.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class LazyAssemblyWSFRuntime implements WSFRuntime, ComposableRuntime
+{
+
+ private boolean assembled;
+ private String runtimeName;
+ private TransportManagerFactory tmf;
+ private RequestHandlerFactory rhf;
+ private InvocationHandlerFactory ihf;
+ private DeploymentAspectManager dam;
+ private EndpointRegistry reg;
+
+ public void setRuntimeName(String runtimeName)
+ {
+ this.runtimeName = runtimeName;
+ }
+
+ public void create(Deployment deployment)
+ {
+ assemble();
+ dam.create(deployment, this);
+ }
+
+ public void start(Deployment deployment)
+ {
+ assemble();
+ dam.start(deployment, this);
+ }
+
+ public void stop(Deployment deployment)
+ {
+ assemble();
+ dam.stop(deployment, this);
+ }
+
+ public void destroy(Deployment deployment)
+ {
+ assemble();
+ dam.destroy(deployment, this);
+ }
+
+
+ public void setTransportManagerFactory(TransportManagerFactory factory)
+ {
+ this.tmf = factory;
+ }
+
+ public TransportManagerFactory getTransportManagerFactory()
+ {
+ return this.tmf;
+ }
+
+ public void setEndpointRegistry(EndpointRegistry endpointRegistry)
+ {
+ this.reg = endpointRegistry;
+ }
+
+ public EndpointRegistry getEndpointRegistry()
+ {
+ return this.reg;
+ }
+
+ public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager)
+ {
+ this.dam = deploymentManager;
+ }
+
+ public DeploymentAspectManager getDeploymentAspectManager()
+ {
+ return this.dam;
+ }
+
+ public void setRequestHandlerFactory(RequestHandlerFactory factory)
+ {
+ this.rhf = factory;
+ }
+
+ public RequestHandlerFactory getRequestHandlerFactory()
+ {
+ return this.rhf;
+ }
+
+ public void setInvocationHandlerFactory(InvocationHandlerFactory factory)
+ {
+ this.ihf = factory;
+ }
+
+ public InvocationHandlerFactory getInvocationHandlerFactory()
+ {
+ return this.ihf;
+ }
+
+ private void assemble()
+ {
+ if(!assembled)
+ {
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ RequestHandlerFactory rhFactory = provider.getSPI(RequestHandlerFactory.class);
+ setRequestHandlerFactory(rhFactory);
+
+ assembled = true;
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * A deployer that modifies the web.xml meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect
+{
+ private WebXMLRewriterImpl webXMLRewriter;
+
+ public void setWebXMLRewriter(WebXMLRewriterImpl serviceEndpointPublisher)
+ {
+ this.webXMLRewriter = serviceEndpointPublisher;
+ }
+
+ public void create(Deployment dep, WSFRuntime runtime)
+ {
+ RewriteResults results = webXMLRewriter.rewriteWebXml(dep);
+
+ // The endpoint may not have a target bean when
+ // <servlet-class> originally contained a javax.servlet.Servlet
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ if (ep.getTargetBeanName() == null)
+ {
+ String servletName = ep.getShortName();
+ String beanClassName = results.sepTargetMap.get(servletName);
+ if (beanClassName == null)
+ throw new IllegalStateException("Cannot obtain target bean for: " + servletName);
+
+ ep.setTargetBeanName(beanClassName);
+ }
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import java.net.URL;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 19, 2007
+ */
+public class RewriteResults
+{
+ // The URL to the rewritten web.xml
+ public URL webXML;
+ // Maps the servlet name to the target bean
+ public Map<String, String> sepTargetMap = new HashMap<String, String>();
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * Determines the correct runtime loader for per deployment type
+ * and makes it available through the {@link org.jboss.wsf.spi.deployment.Deployment}.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class RuntimeLoaderDeploymentAspect extends DeploymentAspect
+{
+
+ public void start(Deployment dep, WSFRuntime runtime)
+ {
+
+ // JSE endpoints
+ if (dep.getAttachment(WebMetaData.class) != null)
+ {
+ WebMetaData webMetaData = dep.getAttachment(WebMetaData.class);
+ ClassLoader classLoader = webMetaData.getContextLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+
+ // EJB3 endpoints
+ else if (dep.getType() == Deployment.DeploymentType.JAXWS_EJB3)
+ {
+ // loader provided by the deployer hook
+ if(null == dep.getRuntimeClassLoader())
+ throw new IllegalArgumentException("Runtime loader not provided");
+ }
+
+ // EJB21 endpoints
+ else if(dep.getAttachment(ApplicationMetaData.class)!=null)
+ {
+ // loader provided by the deployer hook
+ if(null == dep.getRuntimeClassLoader())
+ throw new IllegalArgumentException("Runtime loader not provided");
+ }
+
+ else
+ {
+ throw new IllegalArgumentException("Unable to determine runtime loader");
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
+{
+ public SecurityAdaptor newSecurityAdapter()
+ {
+ return new SecurityAdaptorImpl();
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.security.Principal;
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+/**
+ * A JBoss specific SecurityAssociationAdaptor
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class SecurityAdaptorImpl implements SecurityAdaptor
+{
+ SecurityAdaptorImpl()
+ {
+ }
+
+ public Principal getPrincipal()
+ {
+ return SecurityAssociation.getPrincipal();
+ }
+
+ public void setPrincipal(Principal pricipal)
+ {
+ SecurityAssociation.setPrincipal(pricipal);
+ }
+
+ public Object getCredential()
+ {
+ return SecurityAssociation.getCredential();
+ }
+
+ public void setCredential(Object credential)
+ {
+ SecurityAssociation.setCredential(credential);
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.dom4j.Element;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.AssemblyDescriptorMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.SecurityHandler;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+
+/**
+ * Generate a service endpoint deployment for EJB endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class SecurityHandlerEJB21 implements SecurityHandler
+{
+ public void addSecurityDomain(Element jbossWeb, Deployment dep)
+ {
+ EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+ if (appMetaData == null)
+ throw new IllegalStateException("Cannot obtain application meta data");
+
+ String securityDomain = appMetaData.getSecurityDomain();
+ if (securityDomain != null)
+ {
+ if (securityDomain.startsWith("java:/jaas/") == false)
+ securityDomain = "java:/jaas/" + securityDomain;
+
+ jbossWeb.addElement("security-domain").addText(securityDomain);
+ }
+ }
+
+ public void addSecurityRoles(Element webApp, Deployment dep)
+ {
+ // Fix: http://jira.jboss.org/jira/browse/JBWS-309
+ ApplicationMetaData applMetaData = dep.getAttachment(ApplicationMetaData.class);
+ AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor();
+ if (assemblyDescriptor != null)
+ {
+ Map securityRoles = assemblyDescriptor.getSecurityRoles();
+ if (securityRoles != null)
+ {
+ Iterator it = securityRoles.keySet().iterator();
+ while (it.hasNext())
+ {
+ webApp.addElement("security-role").addElement("role-name").addText((String)it.next());
+ }
+ }
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,121 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import javax.annotation.security.RolesAllowed;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.dom4j.Element;
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.SecurityHandler;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+
+/**
+ * Generate a service endpoint deployment for EJB endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class SecurityHandlerEJB3 implements SecurityHandler
+{
+ public void addSecurityDomain(Element jbossWeb, Deployment dep)
+ {
+ String securityDomain = null;
+
+ ObjectName deployedObject = (ObjectName)dep.getProperty(EJBArchiveMetaDataAdapterEJB3.DEPLOYED_OBJECT);
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject);
+ for (Object manager : ejb3Module.getContainers().values())
+ {
+ if (manager instanceof StatelessContainer)
+ {
+ StatelessContainer container = (StatelessContainer)manager;
+
+ SecurityDomain anSecurityDomain = (SecurityDomain)container.resolveAnnotation(SecurityDomain.class);
+ if (anSecurityDomain != null)
+ {
+ if (securityDomain != null && !securityDomain.equals(anSecurityDomain.value()))
+ throw new IllegalStateException("Multiple security domains not supported");
+
+ securityDomain = anSecurityDomain.value();
+ }
+ }
+ }
+
+ if (securityDomain != null)
+ {
+ if (securityDomain.startsWith("java:/jaas/") == false)
+ securityDomain = "java:/jaas/" + securityDomain;
+
+ jbossWeb.addElement("security-domain").addText(securityDomain);
+ }
+ }
+
+ public void addSecurityRoles(Element webApp, Deployment dep)
+ {
+ // The container objects below provide access to all of the ejb metadata
+ ObjectName deployedObject = (ObjectName)dep.getProperty(EJBArchiveMetaDataAdapterEJB3.DEPLOYED_OBJECT);
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject);
+ for (Object manager : ejb3Module.getContainers().values())
+ {
+ if (manager instanceof StatelessContainer)
+ {
+ StatelessContainer container = (StatelessContainer)manager;
+
+ RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class);
+ if (anRolesAllowed != null)
+ {
+ for (String role : anRolesAllowed.value())
+ {
+ webApp.addElement("security-role").addElement("role-name").addText(role);
+ }
+ }
+ }
+ }
+ }
+
+ private Ejb3ModuleMBean getEJB3Module(ObjectName objectName)
+ {
+ Ejb3ModuleMBean ejb3Module;
+ try
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server);
+ if (ejb3Module == null)
+ throw new WSFDeploymentException("Cannot obtain EJB3 module: " + objectName);
+
+ return ejb3Module;
+ }
+ catch (MBeanProxyCreationException ex)
+ {
+ throw new WSFDeploymentException("Cannot obtain proxy to EJB3 module");
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,126 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
+import org.jboss.ejb.plugins.AbstractInterceptor;
+import org.jboss.invocation.InvocationKey;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+
+/**
+ * This Interceptor does the ws4ee handler processing.
+ *
+ * According to the ws4ee spec the handler logic must be invoked after the container
+ * applied method level security to the invocation.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 21-Sep-2005
+ */
+public class ServiceEndpointInterceptor extends AbstractInterceptor
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class);
+
+ // Interceptor implementation --------------------------------------
+
+ /** Before and after we call the service endpoint bean, we process the handler chains.
+ */
+ public Object invoke(final org.jboss.invocation.Invocation jbInv) throws Exception
+ {
+ // If no msgContext, it's not for us
+ SOAPMessageContext msgContext = (SOAPMessageContext)jbInv.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT);
+ if (msgContext == null)
+ {
+ return getNext().invoke(jbInv);
+ }
+
+ // Get the endpoint invocation
+ Invocation wsInv = (Invocation)jbInv.getValue(Invocation.class.getName());
+
+ // Get the handler callback
+ HandlerCallback callback = (HandlerCallback)jbInv.getValue(HandlerCallback.class.getName());
+
+ // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor.
+ if (callback != null && wsInv != null)
+ {
+ try
+ {
+ // call the request handlers
+ boolean handlersPass = callback.callRequestHandlerChain(wsInv, HandlerType.ENDPOINT);
+ handlersPass = handlersPass && callback.callRequestHandlerChain(wsInv, HandlerType.POST);
+
+ // Call the next interceptor in the chain
+ if (handlersPass)
+ {
+ // The SOAPContentElements stored in the EndpointInvocation might have changed after
+ // handler processing. Get the updated request payload. This should be a noop if request
+ // handlers did not modify the incomming SOAP message.
+ Object[] reqParams = wsInv.getArgs();
+ jbInv.setArguments(reqParams);
+ Object resObj = getNext().invoke(jbInv);
+
+ // Setting the message to null should trigger binding of the response message
+ msgContext.setMessage(null);
+ wsInv.setReturnValue(resObj);
+ }
+
+ // call the response handlers
+ handlersPass = callback.callResponseHandlerChain(wsInv, HandlerType.POST);
+ handlersPass = handlersPass && callback.callResponseHandlerChain(wsInv, HandlerType.ENDPOINT);
+
+ // update the return value after response handler processing
+ Object resObj = wsInv.getReturnValue();
+
+ return resObj;
+ }
+ catch (Exception ex)
+ {
+ try
+ {
+ // call the fault handlers
+ boolean handlersPass = callback.callFaultHandlerChain(wsInv, HandlerType.POST, ex);
+ handlersPass = handlersPass && callback.callFaultHandlerChain(wsInv, HandlerType.ENDPOINT, ex);
+ }
+ catch (Exception subEx)
+ {
+ log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx);
+ }
+ throw ex;
+ }
+ finally
+ {
+ // do nothing
+ }
+ }
+ else
+ {
+ log.warn("Handler callback not available");
+ return getNext().invoke(jbInv);
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,236 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+//$Id$
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
+import org.jboss.wsf.spi.http.HttpContext;
+import org.jboss.wsf.spi.http.HttpContextFactory;
+import org.jboss.wsf.spi.http.HttpServer;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.w3c.dom.Element;
+
+/**
+ * A Tomcat HTTP Server
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 07-Jul-2006
+ */
+public class WebAppDeployingHttpServer extends AbstractExtensible implements HttpServer
+{
+ private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
+
+ // The MBeanServer
+ private MBeanServer mbeanServer;
+
+ public MBeanServer getMbeanServer()
+ {
+ return mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer mbeanServer)
+ {
+ this.mbeanServer = mbeanServer;
+ }
+
+ /** Start an instance of this HTTP server */
+ public void start()
+ {
+ // verify required properties
+ }
+
+ /** Create an HTTP context */
+ public HttpContext createContext(String contextRoot)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ HttpContext httpContext = spiProvider.getSPI(HttpContextFactory.class).newHttpContext(this, contextRoot);
+ return httpContext;
+ }
+
+ /** Publish an JAXWS endpoint to the HTTP server */
+ public void publish(HttpContext context, Endpoint endpoint)
+ {
+ Class implClass = getImplementorClass(endpoint);
+ String implName = implClass.getName();
+
+ try
+ {
+ Element webDoc = createWebAppDescriptor(context, endpoint);
+ Element jbossDoc = createJBossWebAppDescriptor(context, endpoint);
+
+ File tmpWar = null;
+ try
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ File tmpDir = new File(serverConfig.getServerTempDir().getCanonicalPath() + "/jbossws");
+ tmpDir.mkdirs();
+
+ String deploymentName = implName.substring(implName.lastIndexOf(".") + 1);
+ tmpWar = File.createTempFile(deploymentName, ".war", tmpDir);
+ tmpWar.delete();
+ File webInf = new File(tmpWar, "WEB-INF");
+ webInf.mkdirs();
+
+ File webXml = new File(webInf, "web.xml");
+ FileWriter fw = new FileWriter(webXml);
+ new DOMWriter(fw).setPrettyprint(true).print(webDoc);
+ fw.close();
+
+ File jbossWebXml = new File(webInf, "jboss-web.xml");
+ fw = new FileWriter(jbossWebXml);
+ new DOMWriter(fw).setPrettyprint(true).print(jbossDoc);
+ fw.close();
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Failed to create webservice war", e);
+ }
+
+ Map<String, Object> epProps = endpoint.getProperties();
+ epProps.put("jbossws-endpoint-war-url", tmpWar);
+
+ URL tmpURL = tmpWar.toURL();
+ getMbeanServer().invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { tmpURL }, new String[] { "java.net.URL" });
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ /** Destroys an JAXWS endpoint on the HTTP server */
+ public void destroy(HttpContext context, Endpoint endpoint)
+ {
+ Map<String, Object> epProps = endpoint.getProperties();
+ File tmpWar = (File)epProps.get("jbossws-endpoint-war-url");
+ if (tmpWar == null)
+ throw new IllegalStateException("Cannot find endpoint war property");
+
+ try
+ {
+ URL tmpURL = tmpWar.toURL();
+ getMbeanServer().invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { tmpURL }, new String[] { "java.net.URL" });
+
+ tmpWar.delete();
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ private Class getImplementorClass(Endpoint endpoint)
+ {
+ Object implementor = endpoint.getImplementor();
+ Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass());
+ return implClass;
+ }
+
+ private Element createWebAppDescriptor(HttpContext context, Endpoint endpoint)
+ {
+ Class implClass = getImplementorClass(endpoint);
+ String implName = implClass.getName();
+
+ Element webApp = DOMUtils.createElement("web-app");
+
+ /*
+ <servlet>
+ <servlet-name>
+ <servlet-class>
+ </servlet>
+ */
+ Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet"));
+ Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name"));
+ servletName.appendChild(DOMUtils.createTextNode("JAXWSEndpoint"));
+ Element servletClass = (Element)servlet.appendChild(DOMUtils.createElement("servlet-class"));
+ servletClass.appendChild(DOMUtils.createTextNode(implName));
+
+ /*
+ <servlet-mapping>
+ <servlet-name>
+ <url-pattern>
+ </servlet-mapping>
+ */
+ Element servletMapping = (Element)webApp.appendChild(DOMUtils.createElement("servlet-mapping"));
+ servletName = (Element)servletMapping.appendChild(DOMUtils.createElement("servlet-name"));
+ servletName.appendChild(DOMUtils.createTextNode("JAXWSEndpoint"));
+ Element urlPatternElement = (Element)servletMapping.appendChild(DOMUtils.createElement("url-pattern"));
+
+ String urlPattern = "/*";
+ urlPatternElement.appendChild(DOMUtils.createTextNode(urlPattern));
+
+ // Add security-constraint in generated web.xml for Endpoint API
+ // FIXME: JBWS-1069
+
+ return webApp;
+ }
+
+ private Element createJBossWebAppDescriptor(HttpContext context, Endpoint endpoint)
+ {
+ /* Create a jboss-web
+ <jboss-web>
+ <security-domain>java:/jaas/cts</security-domain>
+ <context-root>/ws/ejbN/</context-root>
+ </jboss-web>
+ */
+ Element jbossWeb = DOMUtils.createElement("jboss-web");
+
+ // Get the context root for this deployment
+ String contextRoot = context.getContextRoot();
+ if (contextRoot == null)
+ throw new WebServiceException("Cannot obtain context root");
+
+ Element root = (Element)jbossWeb.appendChild(DOMUtils.createElement("context-root"));
+ root.appendChild(DOMUtils.createTextNode(contextRoot));
+
+ // Add security-constraint in generated web.xml for Endpoint API
+ // FIXME: JBWS-1069
+
+ return jbossWeb;
+ }
+}
\ No newline at end of file
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id$
+
+import java.net.URL;
+
+import javax.management.MBeanServer;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * Publish the HTTP service endpoint to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class WebAppDeploymentAspect extends DeploymentAspect
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(WebAppDeploymentAspect.class);
+
+ private WebXMLRewriterImpl webXMLRewriter;
+
+ public void setWebXMLRewriter(WebXMLRewriterImpl serviceEndpointPublisher)
+ {
+ this.webXMLRewriter = serviceEndpointPublisher;
+ }
+
+ public void create(Deployment dep, WSFRuntime runtime)
+ {
+ URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
+ if (warURL == null)
+ throw new IllegalStateException("Cannot obtain webapp URL");
+
+ log.debug("publishServiceEndpoint: " + warURL);
+ try
+ {
+ webXMLRewriter.rewriteWebXml(dep);
+
+ DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
+
+ // Preserve the repository config
+ DeploymentInfo di = dep.getAttachment(DeploymentInfo.class);
+ if (di != null)
+ auxdi.repositoryConfig = di.getTopRepositoryConfig();
+ auxdi.context.put("org.jboss.ws.ejbwebapp", "true");
+
+ getMainDeployer().deploy(auxdi);
+ }
+ catch (Exception ex)
+ {
+ WSFDeploymentException.rethrow(ex);
+ }
+ }
+
+ public void destroy(Deployment dep)
+ {
+ URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
+ if (warURL == null)
+ {
+ log.error("Cannot obtain warURL");
+ return;
+ }
+
+ log.debug("destroyServiceEndpoint: " + warURL);
+ try
+ {
+ getMainDeployer().undeploy(warURL);
+ }
+ catch (Exception ex)
+ {
+ WSFDeploymentException.rethrow(ex);
+ }
+ }
+
+ private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ return mainDeployer;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.dom4j.Document;
+
+/**
+ * Modifies the web app according to the stack requirements.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 19-May-2007
+ */
+public interface WebAppDesciptorModifier
+{
+ final String SERVLET_CONTEXT_LISTENER = "org.jboss.ws.webapp.ServletContextListener";
+ final String CONTEXT_PARAMETER_MAP = "org.jboss.ws.webapp.ContextParameterMap";
+ final String SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass";
+
+ RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException;
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+import org.jboss.wsf.spi.invocation.*;
+
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 25, 2007
+ */
+public class WebServiceContextFactoryImpl extends WebServiceContextFactory
+{
+ public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
+ {
+ ExtensibleWebServiceContext context = null;
+
+ if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
+ context = new WebServiceContextEJB(messageContext);
+ else
+ context = new WebServiceContextJSE(messageContext);
+
+ return context;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.net.URL;
+
+import javax.xml.ws.WebServiceException;
+
+import org.dom4j.Document;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * The rewriter for web.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 19-May-2007
+ */
+public class WebXMLRewriterImpl
+{
+ private WebAppDesciptorModifier desciptorModifier;
+
+ public WebXMLRewriterImpl()
+ {
+ this.desciptorModifier = new DefaultWebAppDesciptorModifierImpl();
+ }
+
+ public WebAppDesciptorModifier getDesciptorModifier()
+ {
+ return desciptorModifier;
+ }
+
+ public void setDesciptorModifier(WebAppDesciptorModifier desciptorModifier)
+ {
+ this.desciptorModifier = desciptorModifier;
+ }
+
+ public RewriteResults rewriteWebXml(Deployment dep)
+ {
+ URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
+ File warFile = new File(warURL.getFile());
+ if (warFile.isDirectory() == false)
+ throw new WebServiceException("Expected a war directory: " + warURL);
+
+ File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
+ if (webXML.isFile() == false)
+ throw new WebServiceException("Cannot find web.xml: " + webXML);
+
+ try
+ {
+ // After redeployment there might be a stale copy of the original web.xml.org, we delete it
+ File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ orgWebXML.delete();
+
+ // Rename the web.xml
+ if (webXML.renameTo(orgWebXML) == false)
+ throw new WebServiceException("Cannot rename web.xml: " + orgWebXML);
+
+ return rewriteWebXml(orgWebXML, webXML, dep);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+
+ private RewriteResults rewriteWebXml(File input, File destFile, Deployment dep) throws Exception
+ {
+ if (destFile == null)
+ {
+ destFile = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory());
+ destFile.deleteOnExit();
+ }
+
+ FileInputStream inputStream = null;
+ FileOutputStream outputStream = null;
+
+ try
+ {
+ SAXReader reader = new SAXReader();
+ reader.setEntityResolver(new JBossEntityResolver());
+
+ inputStream = new FileInputStream(input);
+ Document document = reader.read(inputStream);
+
+ RewriteResults results = desciptorModifier.modifyDescriptor(dep, document);
+ results.webXML = destFile.toURL();
+
+ outputStream = new FileOutputStream(destFile);
+ OutputFormat format = OutputFormat.createPrettyPrint();
+ XMLWriter writer = new XMLWriter(outputStream, format);
+ writer.write(document);
+ writer.close();
+
+ return results;
+ }
+ finally
+ {
+ if(inputStream!=null)
+ inputStream.close();
+
+ if(outputStream!=null)
+ outputStream.close();
+ }
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42.serviceref;
+
+// $Id$
+
+
+/**
+ * @deprecated
+ */
+public class ServiceRefHandlerImpl
+{
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/transport/BareTransportManagerFactory.java
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/transport/BareTransportManagerFactory.java (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/transport/BareTransportManagerFactory.java 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,57 @@
+/*
+ * 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.wsf.container.jboss42.transport;
+
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.Protocol;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class BareTransportManagerFactory implements TransportManagerFactory
+{
+
+ private TransportManager httpTransport;
+
+
+ public void setHttpTransport(TransportManager httpTransport)
+ {
+ this.httpTransport = httpTransport;
+ }
+
+ public TransportManager createTransportManager(Protocol protocol)
+ {
+ TransportManager t = null;
+
+ switch(protocol)
+ {
+ case HTTP:
+ t = httpTransport;
+ break;
+ default:
+ throw new IllegalArgumentException("No transport manager for protocol " + protocol);
+ }
+
+ return t;
+ }
+}
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/java/org/jboss/wsf/container/jboss42/transport/BareTransportManagerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,319 @@
+<!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
+
+ <!-- The HTTPServer used by the JAXWS Endpoint API -->
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
+
+ <!-- Bind Service objects in client environment context -->
+ <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
+
+ <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
+ <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
+
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployer interceptors registered with the JBoss Deployers.
+
+ 1) DeployerInterceptorJSE
+ 2) DeployerInterceptorEJB21
+ 3) DeployerInterceptorEJB3
+
+ Each interceptor has a number of DeployerHooks registerd with it
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.deploy(unit)
+ if(isWebServiceDeployment)
+ Deployment dep = createDeployment(unit)
+ DeploymentAspectManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeploymentAspectManager.undeploy(dep)
+
+ Each deployer hook has a web service DeployerManager injected into it.
+ A web service DeployerManager maintains a list of Deployers, each of which
+ handles a single aspect of web service deployment.
+
+ Finally, each Endpoint is registered with the EndpointRegistry.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+
+ <!-- Phase 1 -->
+ <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
+ <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
+ <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
+ <property name="runtime"><inject bean="WebserviceEJBRuntime"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Phase 1 -->
+ <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
+ <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
+ <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
+ <property name="runtime"><inject bean="WebserviceEJBRuntime"/></property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ *********************************************************************************************************************
+ Main WSFRuntimes.
+ -->
+
+ <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime">
+ <property name="runtimeName">WebserviceJSERuntime</property>
+ <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
+
+ <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
+ </bean>
+
+ <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime">
+ <property name="runtimeName">WebserviceEJBRuntime</property>
+ <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
+
+ <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
+ </bean>
+
+ <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime">
+ <property name="runtimeName">EndpointAPIRuntime</property>
+ <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
+
+ <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
+ </bean>
+
+
+ <!--
+ *********************************************************************************************************************
+ WSFRuntimes Components
+ -->
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- invcocation handling -->
+ <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl"/>
+
+ <!--
+ *********************************************************************************************************************
+ Each DeploymentAspectManger maintains a list of DeploymentAspects
+ -->
+ <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerJSE</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerEJB</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
+ </bean>
+
+ <!--
+ The container deployment aspects
+ -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
+ <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property>
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContextRoot</property>
+ </bean>
+
+ <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
+ <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
+ </bean>
+
+ <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointAddress</property>
+ </bean>
+
+ <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContainerEndpointHandler</property>
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
+ </bean>
+
+ <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointName</property>
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+ <property name="requires">EndpointName</property>
+ <property name="provides">RegisteredEndpoint</property>
+ <depends>WSEndpointRegistry</depends>
+ </bean>
+
+ <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
+ <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property>
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">RuntimeLoader</property>
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
+ <property name="requires">ContextRoot, ContainerMetaData</property>
+ <property name="provides">URLPattern</property>
+ </bean>
+
+ <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
+ <property name="requires">WebMetaData, ContextProperties</property>
+ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">WebMetaData</property>
+ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ </bean>
+
+ <!-- Deployment aspect helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
+ <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
+ <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+ <!-- Phase 1 -->
+ <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+
+
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl
\ No newline at end of file
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.SecurityAdapterFactoryImpl
\ No newline at end of file
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.WebServiceContextFactoryImpl
\ No newline at end of file
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
Added: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<server>
+
+ <!--
+ A deployer service for JSE endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.web:service=WebServer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB2.1 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+ <!--
+ A deployer service for EJB3 endpoints.
+ -->
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3">
+ <depends-list optional-attribute-name="Interceptables">
+ <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
+ </depends-list>
+ </mbean>
+
+</server>
Property changes on: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss422/version.properties
===================================================================
--- container/jboss42/branches/jbossws-jboss422/version.properties (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/version.properties 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1,23 @@
+
+# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $
+
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-2.0
+
+version.id=4.2.2.SP1
+repository.id=4.2.2.SP1
+
+implementation.title=JBoss Web Services - Integration JBoss42
+implementation.url=http://www.jboss.org/products/jbossws
+implementation.vendor=JBoss Inc.
+implementation.vendor.id=http://www.jboss.org
+
+# Thirdparty library versions
+jbossws-common=snapshot
+jbossws-spi=3.0-snapshot
+jbossws-framework=3.0-snapshot
+
+dom4j=1.6.1
+sun-jaxrpc=1.1
+sun-jaxws=2.1.1
Added: container/jboss42/branches/jbossws-jboss422/version.properties.md5
===================================================================
--- container/jboss42/branches/jbossws-jboss422/version.properties.md5 (rev 0)
+++ container/jboss42/branches/jbossws-jboss422/version.properties.md5 2008-04-09 15:29:39 UTC (rev 6308)
@@ -0,0 +1 @@
+2f00277cccac2776b6e2da484c611811
16 years, 9 months
- 1
- 0
JBossWS SVN: r6307 - stack/cxf/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-09 10:45:26 -0400 (Wed, 09 Apr 2008)
New Revision: 6307
Modified:
stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBAS-5359] mapped-name is required for context of deployment
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-09 14:27:42 UTC (rev 6306)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-09 14:45:26 UTC (rev 6307)
@@ -35,10 +35,8 @@
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
# [JBWS-2107] Resolve dependency on @SecurityDomain
-org/jboss/test/ws/jaxws/webserviceref/Secure**
org/jboss/test/ws/jaxws/jbws1840/**
# [CXF-1510] Cannot handle anonymous bare requests
@@ -100,3 +98,7 @@
# [CXF-1522] NPE in ServiceUtils
org/jboss/test/ws/jaxws/jbws1566/**
+
+# [JBAS-5359] mapped-name is required for context of deployment
+org/jboss/test/ws/console/**
+org/jboss/test/ws/jaxws/jbws1611/**
16 years, 9 months
- 1
- 0
JBossWS SVN: r6306 - stack/cxf/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-09 10:27:42 -0400 (Wed, 09 Apr 2008)
New Revision: 6306
Modified:
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
Log:
[JBWS-2120] @WebWservice does not work with class isolation
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-09 14:22:56 UTC (rev 6305)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-09 14:27:42 UTC (rev 6306)
@@ -92,3 +92,6 @@
# [CXF-1522] NPE in ServiceUtils
org/jboss/test/ws/jaxws/jbws1566/**
+
+# [JBWS-2120] @WebWservice does not work with class isolation
+org/jboss/test/ws/jaxws/jbws1556/**
16 years, 9 months
- 1
- 0
JBossWS SVN: r6305 - in stack/native/trunk: ant-import-tests and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-09 10:22:56 -0400 (Wed, 09 Apr 2008)
New Revision: 6305
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java
stack/native/trunk/src/test/resources/jaxws/webserviceref/
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/
stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/jboss-web.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/web.xml
stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/console/
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/build.xml
Log:
Move jaxws/webserviceref to native
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-09 14:20:01 UTC (rev 6304)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -235,6 +235,131 @@
</metainf>
</jar>
+ <!-- jaxws-webserviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
+ </manifest>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/>
+ </manifest>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override">
+ <include name="jbossws-client-config.xml"/>
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/>
+ </manifest>
+ </jar>
+
+ <!-- jaxws-webserviceref-secure -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/>
+ </manifest>
+ </jar>
+ <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override">
+ <include name="jbossws-client-config.xml"/>
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/>
+ </manifest>
+ </jar>
+
<!-- jaxws-wsdd -->
<war warfile="${tests.output.dir}/libs/jaxws-wsdd.war" webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-04-09 14:20:01 UTC (rev 6304)
+++ stack/native/trunk/build.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -339,7 +339,7 @@
<metainf dir="${core.resources.dir}/standard-config"/>
</jar>
- <!-- Build jbossws-context.war - START -->
+ <!-- Build jbossws-context.war -->
<copy todir="${core.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
<fileset dir="${core.resources.dir}/jbossws-context.war"/>
<filterset>
@@ -348,7 +348,6 @@
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
-
<war warfile="${core.output.lib.dir}/jbossws-context.war"
webxml="${core.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
manifest="${core.output.etc.dir}/default.mf">
@@ -360,7 +359,6 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
- <!-- Build jbossws-context.war - END -->
<!-- Build jbossws-core-scripts.zip -->
<zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" >
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,35 @@
+
+package org.jboss.test.ws.jaxws.webserviceref;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+
+/**
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.0-b26-ea3
+ * Generated source version: 2.0
+ *
+ */
+@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...")
+@SOAPBinding(style = Style.RPC)
+public interface SecureEndpoint {
+
+
+ /**
+ *
+ * @param arg0
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return")
+ public String echo(
+ @WebParam(name = "arg0", partName = "arg0")
+ String arg0);
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceRef;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService;
+
+public class SecureEndpointClient
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(SecureEndpointClient.class);
+
+ @WebServiceRef(name = "SecureService1")
+ static SecureEndpointService secureService1;
+
+ @WebServiceRef(name = "SecureService2")
+ static Service secureService2;
+
+ @WebServiceRef(name = "SecurePort1")
+ static SecureEndpoint securePort1;
+
+ static String retStr;
+
+ public static void main(String[] args)
+ {
+ String reqMsg = args[0];
+ log.info("echo: " + reqMsg);
+
+ String username = null;
+ if (args.length > 1)
+ username = args[1];
+
+ String password = null;
+ if (args.length > 2)
+ password = args[2];
+
+ if (reqMsg.equals("SecureService1"))
+ {
+ SecureEndpoint port = secureService1.getSecureEndpointPort();
+ retStr = invokeEndpoint(port, reqMsg, username, password);
+ }
+ else if (reqMsg.equals("SecureService2"))
+ {
+ SecureEndpoint port = secureService2.getPort(SecureEndpoint.class);
+ retStr = invokeEndpoint(port, reqMsg, username, password);
+ }
+ else if (reqMsg.equals("SecurePort1"))
+ {
+ SecureEndpoint port = securePort1;
+ retStr = invokeEndpoint(port, reqMsg, username, password);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Invalid req messge: " + reqMsg);
+ }
+ }
+
+ private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password)
+ {
+ if (username != null && password != null)
+ {
+ BindingProvider bindingProvider = (BindingProvider)port;
+ bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username);
+ bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password);
+ }
+
+ return port.echo(inStr);
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref")
+@Stateless(name = "SecureEndpoint")
+@SOAPBinding(style = Style.RPC)
+
+@WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
+@SecurityDomain("JBossWS")
+@RolesAllowed("friend")
+public class SecureEndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(SecureEndpointImpl.class);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ log.info(input);
+ return input;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,55 @@
+
+package org.jboss.test.ws.jaxws.webserviceref;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+/**
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.0-b26-ea3
+ * Generated source version: 2.0
+ *
+ */
+@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...")
+public class SecureEndpointService
+ extends Service
+{
+
+ private final static URL WSDL_LOCATION;
+ private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService");
+ private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort");
+
+ static {
+ URL url = null;
+ try {
+ url = new URL("http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public SecureEndpointService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SecureEndpointService() {
+ super(WSDL_LOCATION, SECUREENDPOINTSERVICE);
+ }
+
+ /**
+ *
+ * @return
+ * returns SecureEndpoint
+ */
+ @WebEndpoint(name = "SecureEndpointPort")
+ public SecureEndpoint getSecureEndpointPort() {
+ return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class);
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.client.ClientLauncher;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test @WebServiceRef overrides in jboss-client.xml
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 18-Jan-2007
+ */
+public class ServiceRefOverridesTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-override-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ if (TestEndpointClientTwo.iniCtx == null)
+ TestEndpointClientTwo.iniCtx = getInitialContext();
+ }
+
+ public void testService1() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName(), resStr);
+ }
+
+ public void testService2() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName(), resStr);
+ }
+
+ public void testService3() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName() + getName(), resStr);
+ }
+
+ public void testService4() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName() + getName(), resStr);
+ }
+
+ public void testPort1() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName(), resStr);
+ }
+
+ public void testPort2() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName() + getName(), resStr);
+ }
+
+ public void testPort3() throws Throwable
+ {
+ String resStr = invokeTest(getName());
+ assertEquals(getName() + getName(), resStr);
+ }
+
+ private String invokeTest(String reqStr) throws Throwable
+ {
+ new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr });
+ return TestEndpointClientTwo.testResult.get(reqStr);
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import java.net.URL;
+import java.io.InputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.client.ClientLauncher;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test the JAXWS annotation: javax.xml.ws.WebServiceRef
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 23-Oct-2005
+ */
+public class StubPropertyTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref-secure";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-webserviceref-secure-client.jar");
+ }
+
+ public void testWSDLAccess() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ InputStream inputStream = wsdlURL.openStream();
+ assertNotNull(inputStream);
+ inputStream.close();
+ }
+
+ public void testDynamicProxy() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService");
+ Service service = Service.create(wsdlURL, qname);
+ SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class);
+
+ BindingProvider bindingProvider = (BindingProvider)port;
+ bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit");
+ bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog");
+
+ String helloWorld = "Hello World";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
+ public void testExplicitSecureService1() throws Throwable
+ {
+ String reqMsg = "SecureService1";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testExplicitSecureService2() throws Throwable
+ {
+ String reqMsg = "SecureService2";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testExplicitSecurePort1() throws Throwable
+ {
+ String reqMsg = "SecurePort1";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testImplicitSecureService1() throws Throwable
+ {
+ String reqMsg = "SecureService1";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testImplicitSecureService2() throws Throwable
+ {
+ String reqMsg = "SecureService2";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+
+ public void testImplicitSecurePort1() throws Throwable
+ {
+ String reqMsg = "SecurePort1";
+ new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg });
+ assertEquals(reqMsg, SecureEndpointClient.retStr);
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import javax.jws.WebService;
+import javax.jws.WebMethod;
+import javax.jws.WebResult;
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.0-b26-ea3
+ * Generated source version: 2.0
+ *
+ */
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref?wsdl")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface TestEndpoint {
+
+
+ /**
+ *
+ * @param arg0
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return")
+ public String echo(
+ @WebParam(name = "arg0", partName = "arg0")
+ String arg0);
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import org.jboss.logging.Logger;
+
+import javax.naming.InitialContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.WebServiceRefs;
+import java.util.ArrayList;
+
+@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+
+// Test multiple on type
+@WebServiceRefs( {
+ @WebServiceRef(name = "service2", value = TestEndpointService.class),
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) })
+public class TestEndpointClientOne
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class);
+
+ // Test on field with name
+ @WebServiceRef(name = "TestEndpointService3")
+ static TestEndpointService service3;
+
+ // Test on field without name
+ @WebServiceRef
+ static TestEndpointService service4;
+
+ // Test on method with name
+ @WebServiceRef(name = "TestEndpointService5")
+ static void setService5(TestEndpointService service)
+ {
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service;
+ }
+ private static TestEndpointService service5;
+
+ // Test on method without name
+ @WebServiceRef
+ static void setService6(TestEndpointService service)
+ {
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service;
+ }
+ private static TestEndpointService service6;
+
+ // Test on field with name and value
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ static TestEndpoint port2;
+
+ // Test on field with value
+ @WebServiceRef(value = TestEndpointService.class)
+ static TestEndpoint port3;
+
+ // Test on field
+ @WebServiceRef
+ static TestEndpoint port4;
+
+ // Test on field with name
+ @WebServiceRef (name = "Port5")
+ static TestEndpoint port5;
+
+ static InitialContext iniCtx;
+ static String retStr;
+
+ public static void main(String[] args)
+ {
+ String inStr = args[0];
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr);
+
+ ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ try
+ {
+ ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort());
+ ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort());
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort());
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort());
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort());
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class));
+ ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort());
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1"));
+ ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2);
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2"));
+ ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3);
+ ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3"));
+ ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4);
+ ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5);
+ }
+ catch (Exception ex)
+ {
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex);
+ throw new WebServiceException(ex);
+ }
+
+ for (TestEndpoint port : ports)
+ {
+ String outStr = port.echo(inStr);
+ if (inStr.equals(outStr) == false)
+ throw new WebServiceException("Invalid echo return: " + inStr);
+ }
+
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,206 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint;
+import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService;
+
+import javax.naming.InitialContext;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceRef;
+import javax.xml.ws.WebServiceRefs;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+@WebServiceRef(name = "Service1")
+// Test multiple on type
+@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) })
+public class TestEndpointClientTwo
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class);
+
+ // Test on field
+ @WebServiceRef(name = "Service3")
+ static Service service3;
+
+ // Test on field
+ @WebServiceRef(name = "Service4")
+ static TestEndpointService service4;
+
+ // Test on field
+ @WebServiceRef(name = "Port2")
+ static TestEndpoint port2;
+
+ // Test on field
+ @WebServiceRef(name = "Port3")
+ static TestEndpoint port3;
+
+ static InitialContext iniCtx;
+ static Map<String, String> testResult = new HashMap<String, String>();
+
+ public static void main(String[] args) throws Exception
+ {
+ String testName = args[0];
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo();
+ Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class });
+ try
+ {
+ String retStr = (String)method.invoke(client, testName);
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr);
+ }
+ catch (InvocationTargetException ex)
+ {
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex);
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString());
+ }
+ catch (Exception ex)
+ {
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex);
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString());
+ }
+ }
+
+ /**
+ * Customize service-class-name, service-qname
+ */
+ public String testService1(String reqStr) throws Exception
+ {
+ TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1");
+ TestEndpoint port = service.getTestEndpointPort();
+ return port.echo(reqStr);
+ }
+
+ /**
+ * Customize config-name, config-file
+ */
+ public String testService2(String reqStr) throws Exception
+ {
+ Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2");
+
+ TestEndpoint port = service.getPort(TestEndpoint.class);
+ //verifyConfig((ConfigProvider)port);
+
+ return port.echo(reqStr);
+ }
+
+ /**
+ * Customize service-class-name, service-qname
+ */
+ public String testService3(String reqStr) throws Exception
+ {
+ TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort();
+ String resStr1 = port.echo(reqStr);
+
+ TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3");
+ port = service.getTestEndpointPort();
+
+ String resStr2 = port.echo(reqStr);
+
+ return resStr1 + resStr2;
+ }
+
+ /**
+ * Customize config-name, config-file
+ */
+ public String testService4(String reqStr) throws Exception
+ {
+ TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort();
+ String resStr1 = port.echo(reqStr);
+ //verifyConfig((ConfigProvider)port);
+
+ TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4");
+ port = service.getTestEndpointPort();
+ //verifyConfig((ConfigProvider)port);
+
+ String resStr2 = port.echo(reqStr);
+
+ return resStr1 + resStr2;
+ }
+
+ /**
+ * Customize port-info: port-qname, config-name, config-file
+ */
+ public String testPort1(String reqStr) throws Exception
+ {
+ TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1");
+ //verifyConfig((ConfigProvider)port);
+
+ return port.echo(reqStr);
+ }
+
+ /**
+ * Customize port-info: service-endpoint-interface, config-name, config-file
+ */
+ public String testPort2(String reqStr) throws Exception
+ {
+ //verifyConfig((ConfigProvider)port2);
+ String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr);
+
+ TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2");
+ //verifyConfig((ConfigProvider)port);
+
+ String resStr2 = port.echo(reqStr);
+
+ return resStr1 + resStr2;
+ }
+
+ /**
+ * Customize port-info: service-endpoint-interface, port-qname, stub-property
+ */
+ public String testPort3(String reqStr) throws Exception
+ {
+ String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr);
+
+ BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3;
+ verifyProperties(bp.getRequestContext());
+
+ TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3");
+ String resStr2 = port.echo(reqStr);
+
+ return resStr1 + resStr2;
+ }
+
+ private void verifyProperties(Map<String, Object> ctx)
+ {
+ String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY);
+ if ("kermit".equals(username) == false)
+ throw new RuntimeException("Invalid username: " + username);
+
+ String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY);
+ if ("thefrog".equals(password) == false)
+ throw new RuntimeException("Invalid password: " + password);
+ }
+
+ /*private void verifyConfig(ConfigProvider cp)
+ {
+ if ("Custom Client".equals(cp.getConfigName()) == false)
+ throw new RuntimeException("Invalid config name: " + cp.getConfigName());
+
+ if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false)
+ throw new RuntimeException("Invalid config file: " + cp.getConfigFile());
+ } */
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+import org.jboss.logging.Logger;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class TestEndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input);
+ return input;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.webserviceref;
+
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * This class was generated by the JAXWS SI.
+ * JAX-WS RI 2.0-b26-ea3
+ * Generated source version: 2.0
+ *
+ */
+@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-webserviceref?wsdl")
+public class TestEndpointService
+ extends Service
+{
+
+ private final static URL WSDL_LOCATION;
+ private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService");
+ private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort");
+
+ static {
+ URL url = null;
+ try {
+ url = new URL("file://bogus-location/jaxws-webserviceref?wsdl");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public TestEndpointService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public TestEndpointService() {
+ super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE);
+ }
+
+ /**
+ *
+ * @return
+ * returns TestEndpoint
+ */
+ @WebEndpoint(name = "TestEndpointPort")
+ public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() {
+ return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class);
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd">
+
+ <display-name>TestEndpointService</display-name>
+
+</application-client>
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <!--
+ @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ -->
+
+ <!--
+ @WebServiceRef(name = "service2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService3")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService3</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne/service4</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService5")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService5</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne/service6</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>port1</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne/port3</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne/port4</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port5")
+ -->
+ <service-ref>
+ <service-ref-name>Port5</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd">
+
+<jboss>
+
+ <!-- [JBWS-1339] @Security domain vs. <security-domain> -->
+ <security-domain>java:/jaas/JBossWS</security-domain>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>EJB3Client</ejb-name>
+
+ <!--
+ @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl")
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ -->
+
+ <!--
+ @WebServiceRef(name = "service2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService3")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService3</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.EJB3Client/service4</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService5")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService5</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.EJB3Client/service6</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>port1</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.EJB3Client/port3</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+
+</jboss>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,39 @@
+<!--
+ wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/TestEndpoint.wsdl
+-->
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <message name='TestEndpoint_echo'>
+ <part name='arg0' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part name='return' type='xsd:string'/>
+ </message>
+
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='arg0'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-webserviceref'/>
+ </port>
+ </service>
+
+</definitions>
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd">
+
+ <display-name>TestEndpointService</display-name>
+
+</application-client>
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <!--
+ @WebServiceRef(name = "Service1")
+ -->
+ <service-ref>
+ <service-ref-name>Service1</service-ref-name>
+ <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Service2")
+ -->
+ <service-ref>
+ <service-ref-name>Service2</service-ref-name>
+ <config-name>Custom Client</config-name>
+ <config-file>META-INF/jbossws-client-config.xml</config-file>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Service3")
+ -->
+ <service-ref>
+ <service-ref-name>Service3</service-ref-name>
+ <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Service4")
+ -->
+ <service-ref>
+ <service-ref-name>Service4</service-ref-name>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface>
+ <config-name>Custom Client</config-name>
+ <config-file>META-INF/jbossws-client-config.xml</config-file>
+ </port-component-ref>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port1", type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port1</service-ref-name>
+ <port-component-ref>
+ <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
+ <config-name>Custom Client</config-name>
+ <config-file>META-INF/jbossws-client-config.xml</config-file>
+ </port-component-ref>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2")
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface>
+ <config-name>Custom Client</config-name>
+ <config-file>META-INF/jbossws-client-config.xml</config-file>
+ </port-component-ref>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port3")
+ -->
+ <service-ref>
+ <service-ref-name>Port3</service-ref-name>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface>
+ <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.username</prop-name>
+ <prop-value>kermit</prop-value>
+ </stub-property>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.password</prop-name>
+ <prop-value>thefrog</prop-value>
+ </stub-property>
+ </port-component-ref>
+ <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+ xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd">
+
+ <client-config>
+ <config-name>Custom Client</config-name>
+ </client-config>
+
+</jaxrpc-config>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,39 @@
+<!--
+ wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/TestEndpoint.wsdl
+-->
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <message name='TestEndpoint_echo'>
+ <part name='arg0' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part name='return' type='xsd:string'/>
+ </message>
+
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='arg0'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-webserviceref'/>
+ </port>
+ </service>
+
+</definitions>
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd">
+
+ <display-name>SecureEndpointService</display-name>
+
+</application-client>
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>SecureService1</service-ref-name>
+ <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
+ <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.username</prop-name>
+ <prop-value>kermit</prop-value>
+ </stub-property>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.password</prop-name>
+ <prop-value>thefrog</prop-value>
+ </stub-property>
+ </port-component-ref>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxws-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>SecureService2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
+ <port-component-ref>
+ <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.username</prop-name>
+ <prop-value>kermit</prop-value>
+ </stub-property>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.password</prop-name>
+ <prop-value>thefrog</prop-value>
+ </stub-property>
+ </port-component-ref>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxws-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>SecurePort1</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.username</prop-name>
+ <prop-value>kermit</prop-value>
+ </stub-property>
+ <stub-property>
+ <prop-name>javax.xml.ws.security.auth.password</prop-name>
+ <prop-value>thefrog</prop-value>
+ </stub-property>
+ </port-component-ref>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxws-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,15 @@
+<?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>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/jboss-web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/jboss-web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/jboss-web.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+
+
+ <!--
+ @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl")
+ <service-ref>
+ <service-ref-name>service1</service-ref-name>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+ -->
+
+ <!--
+ @WebServiceRef(name = "service2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>service2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService3")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService3</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ServletClient/service4</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "TestEndpointService5")
+ -->
+ <service-ref>
+ <service-ref-name>TestEndpointService5</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ServletClient/service6</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class)
+ -->
+ <service-ref>
+ <service-ref-name>port1</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(name = "Port2", value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>Port2</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+ <!--
+ @WebServiceRef(value = TestEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.webserviceref.ServletClient/port3</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-web>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/web.xml 2008-04-09 14:22:56 UTC (rev 6305)
@@ -0,0 +1,15 @@
+<?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>ServletClient</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.webserviceref.ServletClient</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServletClient</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
- 1
- 0