JBossWS SVN: r2036 - subprojects and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-23 09:39:41 -0500 (Tue, 23 Jan 2007)
New Revision: 2036
Added:
branches/jbossws-1.2.0/build/hudson/
Removed:
subprojects/jbossws-hudson/
Log:
move hudson to 1.2.0
Copied: branches/jbossws-1.2.0/build/hudson (from rev 2035, subprojects/jbossws-hudson)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2035 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-23 09:12:23 -0500 (Tue, 23 Jan 2007)
New Revision: 2035
Added:
branches/jbossws-1.2.0/
Removed:
branches/jbossws-1.2/
Log:
Create jbossws-1.2.0 QA branch
Copied: branches/jbossws-1.2.0 (from rev 2034, branches/jbossws-1.2)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2034 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-23 09:05:38 -0500 (Tue, 23 Jan 2007)
New Revision: 2034
Added:
branches/jbossws-1.2/
Log:
Create jbossws-1.2 QA branch
Copied: branches/jbossws-1.2 (from rev 2033, trunk)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2033 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-23 07:37:52 -0500 (Tue, 23 Jan 2007)
New Revision: 2033
Added:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextEJB.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.java
Log:
Provide workaround for: [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextEJB.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextEJB.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextEJB.java 2007-01-23 12:37:52 UTC (rev 2033)
@@ -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.ws.core.jaxws;
+
+// $Id$
+
+import java.security.Principal;
+
+import javax.ejb.EJBContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A WebServiceContext implementation that delegates to the EJBContext.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 23-Jan-2007
+ */
+public class WebServiceContextEJB extends AbstractWebServiceContext
+{
+ // provide logging
+ private Logger log = Logger.getLogger(WebServiceContextEJB.class);
+
+ private EJBContext ejbContext;
+
+ public WebServiceContextEJB(MessageContext messageContext, EJBContext ejbContext)
+ {
+ super(messageContext);
+ this.ejbContext = ejbContext;
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ Principal principal = ejbContext.getCallerPrincipal();
+ return principal;
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ boolean isUserInRole = ejbContext.isCallerInRole(role);
+ return isUserInRole;
+ }
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextEJB.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-01-23 12:37:52 UTC (rev 2033)
@@ -0,0 +1,97 @@
+/*
+ * 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.ws.core.jaxws;
+
+// $Id$
+
+import java.io.Serializable;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.security.RealmMapping;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/**
+ * A WebServiceContext implementation that delegates to jbosssx.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 23-Jan-2007
+ */
+public class WebServiceContextJSE extends AbstractWebServiceContext
+{
+ // provide logging
+ private Logger log = Logger.getLogger(WebServiceContextJSE.class);
+
+ private RealmMapping realmMapping;
+
+ public WebServiceContextJSE(MessageContext messageContext)
+ {
+ super(messageContext);
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ Principal principal = SecurityAssociation.getCallerPrincipal();
+ return principal;
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ boolean isUserInRole = false;
+ Principal principal = SecurityAssociation.getCallerPrincipal();
+ RealmMapping realmMapping = getRealmMapping();
+ if (realmMapping != null && principal != null)
+ {
+ Set<Principal> roles = new HashSet<Principal>();
+ roles.add(new SimplePrincipal(role));
+ isUserInRole = realmMapping.doesUserHaveRole(principal, roles);
+ }
+ return isUserInRole;
+ }
+
+ private RealmMapping getRealmMapping()
+ {
+ if (realmMapping == null)
+ {
+ String lookupName = "java:comp/env/security/realmMapping";
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ realmMapping = (RealmMapping)iniCtx.lookup(lookupName);
+ }
+ catch (NamingException e)
+ {
+ log.debug("Cannot obtain realm mapping from: " + lookupName);
+ }
+ }
+ return realmMapping;
+ }
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.java 2007-01-23 12:37:52 UTC (rev 2033)
@@ -0,0 +1,87 @@
+/*
+ * 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.context;
+
+// $Id$
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJBContext;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ws.annotation.WebContext;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.jaxws.WebServiceContextEJB;
+import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context")
+@SOAPBinding(style = Style.RPC)
+@Stateless
+
+@WebContext(contextRoot = "/jaxws-context", urlPattern = "/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false)
+@SecurityDomain("JBossWS")
+@RolesAllowed("friend")
+public class EndpointNoInjectEJB
+{
+ // @Resource
+ WebServiceContext wsCtx;
+
+ @Resource
+ EJBContext ejbCtx;
+
+ @WebMethod
+ public String testGetMessageContext()
+ {
+ // @Resource WebServiceContext for jbossas-4.x
+ // http://jira.jboss.org/jira/browse/JBWS-1468
+ if (wsCtx == null)
+ {
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ wsCtx = new WebServiceContextEJB((SOAPMessageContextJAXWS)msgContext, ejbCtx);
+ }
+
+ SOAPMessageContext jaxwsContext = (SOAPMessageContext)wsCtx.getMessageContext();
+ return jaxwsContext != null ? "pass" : "fail";
+ }
+
+ @WebMethod
+ public String testGetUserPrincipal()
+ {
+ return wsCtx.getUserPrincipal().getName();
+ }
+
+ @WebMethod
+ public boolean testIsUserInRole(String role)
+ {
+ return wsCtx.isUserInRole(role);
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 9 months
- 1
- 0
JBossWS SVN: r2032 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/jaxws and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-23 07:36:16 -0500 (Tue, 23 Jan 2007)
New Revision: 2032
Removed:
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws718/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws718/
Modified:
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java
trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java
trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Provide workaround for: [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x
Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-01-23 12:36:16 UTC (rev 2032)
@@ -42,6 +42,7 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
+import org.jboss.ws.core.jaxws.WebServiceContextEJB;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.server.AbstractServiceEndpointInvoker;
import org.jboss.ws.core.server.ServiceEndpointInfo;
@@ -170,7 +171,7 @@
if (beanProp != null)
{
EJBContext ejbCtx = beanCtx.getEJBContext();
- beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB3(jaxwsMessageContext, ejbCtx));
+ beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx));
}
}
Deleted: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,62 +0,0 @@
-/*
- * 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.ws.integration.jboss50;
-
-// $Id$
-
-import java.security.Principal;
-
-import javax.ejb.EJBContext;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.ws.core.jaxws.AbstractWebServiceContext;
-
-/**
- * A WebServiceContext implementation that delegates to the EJBContext.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 23-Jan-2007
- */
-public class WebServiceContextEJB3 extends AbstractWebServiceContext
-{
- private EJBContext ejbContext;
-
- public WebServiceContextEJB3(MessageContext messageContext, EJBContext ejbContext)
- {
- super(messageContext);
- this.ejbContext = ejbContext;
- }
-
- @Override
- public Principal getUserPrincipal()
- {
- Principal principal = ejbContext.getCallerPrincipal();
- return principal;
- }
-
- @Override
- public boolean isUserInRole(String role)
- {
- boolean isUserInRole = ejbContext.isCallerInRole(role);
- return isUserInRole;
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,98 +0,0 @@
-/*
- * 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.ws.core.jaxws;
-
-// $Id$
-
-import java.io.Serializable;
-import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.logging.Logger;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-/**
- * A WebServiceContext implementation that delegates to the EJBContext if available.
- * Otherwise it uses jbosssx.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 23-Jan-2007
- */
-public class WebServiceContextImpl extends AbstractWebServiceContext implements Serializable
-{
- // provide logging
- private Logger log = Logger.getLogger(WebServiceContextImpl.class);
-
- private transient RealmMapping realmMapping;
-
- public WebServiceContextImpl(MessageContext messageContext)
- {
- super(messageContext);
- }
-
- @Override
- public Principal getUserPrincipal()
- {
- Principal principal = SecurityAssociation.getCallerPrincipal();
- return principal;
- }
-
- @Override
- public boolean isUserInRole(String role)
- {
- boolean isUserInRole = false;
- Principal principal = SecurityAssociation.getCallerPrincipal();
- RealmMapping realmMapping = getRealmMapping();
- if (realmMapping != null && principal != null)
- {
- Set<Principal> roles = new HashSet<Principal>();
- roles.add(new SimplePrincipal(role));
- isUserInRole = realmMapping.doesUserHaveRole(principal, roles);
- }
- return isUserInRole;
- }
-
- private RealmMapping getRealmMapping()
- {
- if (realmMapping == null)
- {
- String lookupName = "java:comp/env/security/realmMapping";
- try
- {
- InitialContext iniCtx = new InitialContext();
- realmMapping = (RealmMapping)iniCtx.lookup(lookupName);
- }
- catch (NamingException e)
- {
- log.debug("Cannot obtain realm mapping from: " + lookupName);
- }
- }
- return realmMapping;
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-01-23 12:36:16 UTC (rev 2032)
@@ -36,8 +36,8 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl;
-import org.jboss.ws.core.jaxws.WebServiceContextImpl;
import org.jboss.ws.core.jaxws.WebServiceContextInjector;
+import org.jboss.ws.core.jaxws.WebServiceContextJSE;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
@@ -92,7 +92,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext instanceof SOAPMessageContextJAXWS)
{
- WebServiceContext wsContext = new WebServiceContextImpl((SOAPMessageContextJAXWS)msgContext);
+ WebServiceContext wsContext = new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext);
new WebServiceContextInjector().injectContext(seiImpl, wsContext);
}
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-23 12:36:16 UTC (rev 2032)
@@ -304,33 +304,6 @@
</metainf>
</jar>
- <!-- jaxrpc-jbws718 -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-jbws718.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws718/WEB-INF">
- <include name="webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws718-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws718/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws718/WEB-INF">
- <include name="wsdl/**"/>
- <include name="jaxrpc-mapping.xml"/>
- </metainf>
- </jar>
-
<!-- jaxrpc-jbws720 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-01-23 12:36:16 UTC (rev 2032)
@@ -60,6 +60,11 @@
<include name="org/jboss/test/ws/jaxws/context/EndpointEJB.class"/>
</fileset>
</jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-context-jboss4x.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/context/EndpointNoInjectEJB.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-eardeployment -->
<war warfile="${tests.output.dir}/libs/jaxws-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml">
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/build.xml 2007-01-23 12:36:16 UTC (rev 2032)
@@ -273,7 +273,6 @@
<classpath location="${tests.output.dir}"/>
</taskdef>
<mkdir dir="${tests.output.dir}/wstools/java"/>
- <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${tests.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
@@ -295,7 +294,6 @@
<wstools dest="${tests.output.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${tests.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${tests.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
<move todir="${tests.output.dir}/wstools/java">
- <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/>
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
</move>
</target>
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java 2007-01-23 12:36:16 UTC (rev 2032)
@@ -47,8 +47,7 @@
@RolesAllowed("friend")
public class EndpointEJB
{
- // mappedName needed for jboss40
- @Resource(mappedName = "wsCtx")
+ @Resource
WebServiceContext wsCtx;
@WebMethod
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.java 2007-01-23 12:36:16 UTC (rev 2032)
@@ -33,6 +33,7 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestHelper;
import org.jboss.test.ws.JBossWSTestSetup;
/**
@@ -47,7 +48,8 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(WebServiceContextEJBTestCase.class, "jaxws-context.jar");
+ String endpointJar = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-context.jar" : "jaxws-context-jboss4x.jar");
+ return JBossWSTestSetup.newTestSetup(WebServiceContextEJBTestCase.class, endpointJar);
}
public void setUp() throws Exception
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,10 +1,6 @@
org/jboss/test/ws/interop/**
org/jboss/test/ws/jaxrpc/benchmark/**
-org/jboss/test/ws/jaxrpc/jbws718/**
-org/jboss/test/ws/jaxrpc/samples/wseventing/**
-org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/benchmark/**
-org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/endpoint/**
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase*
org/jboss/test/ws/jaxws/webserviceref/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,10 +1,6 @@
org/jboss/test/ws/interop/**
org/jboss/test/ws/jaxrpc/benchmark/**
-org/jboss/test/ws/jaxrpc/jbws718/**
-org/jboss/test/ws/jaxrpc/samples/wseventing/**
-org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/benchmark/**
-org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/endpoint/**
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase*
org/jboss/test/ws/jaxws/webserviceref/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,15 +1,12 @@
org/jboss/test/ws/interop/**
org/jboss/test/ws/jaxrpc/benchmark/**
-org/jboss/test/ws/jaxrpc/jbws718/**
-org/jboss/test/ws/jaxrpc/samples/wseventing/**
-org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/benchmark/**
-org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/endpoint/**
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/webserviceref/**
# EJB3 excludes
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/eardeployment/**
org/jboss/test/ws/jaxws/jbws944/**
org/jboss/test/ws/jaxws/jbws981/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,5 +1,3 @@
org/jboss/test/ws/interop/**
org/jboss/test/ws/jaxrpc/benchmark/**
-org/jboss/test/ws/jaxrpc/jbws718/**
-org/jboss/test/ws/jaxrpc/samples/wseventing/**
-org/jboss/test/ws/jaxrpc/wseventing/**
+org/jboss/test/ws/jaxws/benchmark/**
Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-23 12:28:31 UTC (rev 2031)
+++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-23 12:36:16 UTC (rev 2032)
@@ -1,15 +1,11 @@
-org/jboss/test/ws/interop/**
org/jboss/test/ws/jaxrpc/benchmark/**
-org/jboss/test/ws/jaxrpc/jbws718/**
org/jboss/test/ws/jaxrpc/jbws1011/**
-org/jboss/test/ws/jaxrpc/samples/wseventing/**
org/jboss/test/ws/jaxrpc/samples/dynamichandler/**
org/jboss/test/ws/jaxrpc/samples/jmstransport/**
org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
org/jboss/test/ws/jaxrpc/samples/secureejb/**
org/jboss/test/ws/jaxrpc/samples/wsbpel/**
org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
-org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/samples/jsr181ejb/**
17 years, 9 months
- 1
- 0
JBossWS SVN: r2031 - in subprojects: jbossws-hudson and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-23 07:28:31 -0500 (Tue, 23 Jan 2007)
New Revision: 2031
Added:
subprojects/jbossws-hudson/
subprojects/jbossws-hudson/config.xml
subprojects/jbossws-hudson/hudson.scm.CVSSCM.xml
subprojects/jbossws-hudson/hudson.scm.SubversionSCM.xml
subprojects/jbossws-hudson/hudson.tasks.Ant.xml
subprojects/jbossws-hudson/hudson.tasks.Mailer.xml
subprojects/jbossws-hudson/hudson.tasks.Maven.xml
subprojects/jbossws-hudson/hudson.tasks.Shell.xml
subprojects/jbossws-hudson/hudson.triggers.SCMTrigger.xml
subprojects/jbossws-hudson/jobs/
subprojects/jbossws-hudson/jobs/AS-4.0/
subprojects/jbossws-hudson/jobs/AS-4.0/builds/
subprojects/jbossws-hudson/jobs/AS-4.0/config.xml
subprojects/jbossws-hudson/jobs/AS-4.0/lastSuccessful
subprojects/jbossws-hudson/jobs/AS-4.0/nextBuildNumber
subprojects/jbossws-hudson/jobs/AS-4.0/workspace/
subprojects/jbossws-hudson/jobs/AS-4.2/
subprojects/jbossws-hudson/jobs/AS-4.2/builds/
subprojects/jbossws-hudson/jobs/AS-4.2/config.xml
subprojects/jbossws-hudson/jobs/AS-4.2/lastSuccessful
subprojects/jbossws-hudson/jobs/AS-4.2/nextBuildNumber
subprojects/jbossws-hudson/jobs/AS-4.2/workspace/
subprojects/jbossws-hudson/jobs/AS-5.x/
subprojects/jbossws-hudson/jobs/AS-5.x/builds/
subprojects/jbossws-hudson/jobs/AS-5.x/config.xml
subprojects/jbossws-hudson/jobs/AS-5.x/lastSuccessful
subprojects/jbossws-hudson/jobs/AS-5.x/nextBuildNumber
subprojects/jbossws-hudson/jobs/AS-5.x/workspace/
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/builds/
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/config.xml
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/nextBuildNumber
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/scm-polling.log
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/workspace/
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/builds/
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/config.xml
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/nextBuildNumber
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/scm-polling.log
subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/workspace/
subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/
subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/builds/
subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/config.xml
subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/nextBuildNumber
subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/scm-polling.log
subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/workspace/
subprojects/jbossws-hudson/plugins/
subprojects/jbossws-hudson/users/
subprojects/jbossws-hudson/users/heiko.braun(a)jboss.com/
subprojects/jbossws-hudson/users/heiko.braun(a)jboss.com/config.xml
Log:
inital import
Added: subprojects/jbossws-hudson/config.xml
===================================================================
--- subprojects/jbossws-hudson/config.xml (rev 0)
+++ subprojects/jbossws-hudson/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson>
+ <numExecutors>2</numExecutors>
+ <useSecurity>false</useSecurity>
+ <systemMessage><!--a href="http://labs.jboss.com/portal/jbossws">
+<img src="http://labs.jboss.com/file-access/default/theme/images/spotligh... border=0/>
+</a--></systemMessage>
+ <jdks/>
+ <slaves/>
+ <quietPeriod>5</quietPeriod>
+ <views/>
+</hudson>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.scm.CVSSCM.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.scm.CVSSCM.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.scm.CVSSCM.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.scm.CVSSCM-DescriptorImpl>
+ <cvsPassFile></cvsPassFile>
+ <browsers/>
+</hudson.scm.CVSSCM-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.scm.SubversionSCM.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.scm.SubversionSCM.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.scm.SubversionSCM.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.scm.SubversionSCM-DescriptorImpl>
+ <svnExe>svn</svnExe>
+</hudson.scm.SubversionSCM-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.tasks.Ant.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.tasks.Ant.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.tasks.Ant.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.tasks.Ant-DescriptorImpl>
+ <installations/>
+</hudson.tasks.Ant-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.tasks.Mailer.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.tasks.Mailer.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.tasks.Mailer.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.tasks.Mailer-DescriptorImpl>
+ <defaultSuffix>openj.net</defaultSuffix>
+ <hudsonUrl>http://localhost:8180/hudson/</hudsonUrl>
+ <adminAddress>heiko(a)openj.net</adminAddress>
+ <smtpHost>openj.net</smtpHost>
+</hudson.tasks.Mailer-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.tasks.Maven.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.tasks.Maven.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.tasks.Maven.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.tasks.Maven-DescriptorImpl>
+ <installations/>
+</hudson.tasks.Maven-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.tasks.Shell.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.tasks.Shell.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.tasks.Shell.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.tasks.Shell-DescriptorImpl>
+ <shell>/bin/sh</shell>
+</hudson.tasks.Shell-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/hudson.triggers.SCMTrigger.xml
===================================================================
--- subprojects/jbossws-hudson/hudson.triggers.SCMTrigger.xml (rev 0)
+++ subprojects/jbossws-hudson/hudson.triggers.SCMTrigger.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hudson.triggers.SCMTrigger-DescriptorImpl>
+ <maximumThreads>0</maximumThreads>
+</hudson.triggers.SCMTrigger-DescriptorImpl>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/AS-4.0/config.xml
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-4.0/config.xml (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-4.0/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>cd Branch_4_0
+rm -f thirdparty/libraries.ent
+./build/build.sh clean
+./build/build.sh
+
+#
+# patch
+#
+chmod +x build/output/jboss-4.0.5.SP1-ejb3/bin/*.sh</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>heiko.braun(a)jboss.com</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>https://svn.jboss.org/repos/jbossas/branches/Branch_4_0</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>/home/hbraun/hudson/jobs/AS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/AS-4.0/lastSuccessful
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-4.0/lastSuccessful (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-4.0/lastSuccessful 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+link builds/2007-01-22_17-40-33
\ No newline at end of file
Property changes on: subprojects/jbossws-hudson/jobs/AS-4.0/lastSuccessful
___________________________________________________________________
Name: svn:special
+ *
Added: subprojects/jbossws-hudson/jobs/AS-4.0/nextBuildNumber
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-4.0/nextBuildNumber (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-4.0/nextBuildNumber 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+3
Added: subprojects/jbossws-hudson/jobs/AS-4.2/config.xml
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-4.2/config.xml (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-4.2/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>cd Branch_4_2
+rm -f thirdparty/libraries.ent
+./build/build.sh clean
+./build/build.sh
+
+#
+# patch
+#
+chmod +x build/output/jboss-4.2.0.CR1-ejb3/bin/*.sh</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>heiko.braun(a)jboss.com</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>https://svn.jboss.org/repos/jbossas/branches/Branch_4_2</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>/home/hbraun/hudson/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/AS-4.2/lastSuccessful
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-4.2/lastSuccessful (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-4.2/lastSuccessful 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+link builds/2007-01-22_17-24-45
\ No newline at end of file
Property changes on: subprojects/jbossws-hudson/jobs/AS-4.2/lastSuccessful
___________________________________________________________________
Name: svn:special
+ *
Added: subprojects/jbossws-hudson/jobs/AS-4.2/nextBuildNumber
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-4.2/nextBuildNumber (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-4.2/nextBuildNumber 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+5
Added: subprojects/jbossws-hudson/jobs/AS-5.x/config.xml
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-5.x/config.xml (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-5.x/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>cd trunk
+rm -f thirdparty/libraries.ent
+./build/build.sh clean
+./build/build.sh</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>heiko.braun(a)jboss.com</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>https://svn.jboss.org/repos/jbossas/trunk</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>/home/hbraun/hudson/jobs/AS-5.x/workspace/trunk/build/output/jboss-5.0.0.Beta2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/AS-5.x/lastSuccessful
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-5.x/lastSuccessful (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-5.x/lastSuccessful 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+link builds/2007-01-22_15-04-06
\ No newline at end of file
Property changes on: subprojects/jbossws-hudson/jobs/AS-5.x/lastSuccessful
___________________________________________________________________
Name: svn:special
+ *
Added: subprojects/jbossws-hudson/jobs/AS-5.x/nextBuildNumber
===================================================================
--- subprojects/jbossws-hudson/jobs/AS-5.x/nextBuildNumber (rev 0)
+++ subprojects/jbossws-hudson/jobs/AS-5.x/nextBuildNumber 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+4
Added: subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/config.xml
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/config.xml (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command># common script settings
+pwd
+
+#
+# Module settings
+#
+HUDSON="/home/hbraun/hudson"
+MODULE="JBossWS-AS-4.0"
+WORKSPACE=$HUDSON/jobs/$MODULE/workspace
+JBOSS_INSTANCE=$HUDSON/jobs/AS-4.0/workspaceBranch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+ENV_DEFAULTS="-Djboss50.home= -Djboss42.home= -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+cd $WORKSPACE/trunk/build
+pwd
+
+#
+# build core modules (and update thirdparty libs)
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties -Dforce.thirdparty.get=true main
+
+#
+# deploy jboss40
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40
+
+#
+# build test suite
+#
+cd $WORKSPACE/trunk/jbossws-tests
+pwd
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties $ENV_DEFAULTS main
+
+#
+# start jbossas
+#(make sure it's stopped first)
+#
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE stop
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE start
+sleep 30
+
+#
+# execute tests
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties $ENV_DEFAULTS tests
+
+#
+# stop jbossas
+#
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE stop</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>heiko(a)openj.net</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>https://svn.jboss.org/repos/jbossws/trunk</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Builds JBossWS-TRUNK against AS 4.0</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/nextBuildNumber
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/nextBuildNumber (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/nextBuildNumber 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+8
Added: subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/scm-polling.log
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/scm-polling.log (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-AS-4.0/scm-polling.log 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+
Added: subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/config.xml
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/config.xml (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command># common script settings
+pwd
+
+#
+# Module settings
+#
+HUDSON="/home/hbraun/hudson"
+MODULE="JBossWS-AS-4.2"
+WORKSPACE=$HUDSON/jobs/$MODULE/workspace
+JBOSS_INSTANCE=$HUDSON/jobs/AS-4.2/workspace/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
+ENV_DEFAULTS="-Djboss50.home= -Djboss42.home= -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+cd $WORKSPACE/trunk/build
+pwd
+
+#
+# build core modules (and update thirdparty libs)
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties -Dforce.thirdparty.get=true main
+
+#
+# deploy jboss42
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE deploy-jboss42
+
+#
+# build test suite
+#
+cd $WORKSPACE/trunk/jbossws-tests
+pwd
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties $ENV_DEFAULTS main
+
+#
+# start jbossas
+#(make sure it's stopped first)
+#
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE stop
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE start
+sleep 30
+
+#
+# execute tests
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties $ENV_DEFAULTS tests
+
+#
+# stop jbossas
+#
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE stop
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>heiko(a)openj.net</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>https://svn.jboss.org/repos/jbossws/trunk</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Builds JBossWS-TRUNK against AS 4.2</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/nextBuildNumber
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/nextBuildNumber (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/nextBuildNumber 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+11
Added: subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/scm-polling.log
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/scm-polling.log (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-AS-4.2/scm-polling.log 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+
Added: subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/config.xml
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/config.xml (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command># common script settings
+pwd
+
+#
+# Module settings
+#
+HUDSON="/home/hbraun/hudson"
+MODULE="JBossWS-TRUNK"
+WORKSPACE=$HUDSON/jobs/$MODULE/workspace
+JBOSS_INSTANCE=$HUDSON/jobs/AS-5.x/workspace/trunk/build/output/jboss-5.0.0.Beta2
+ENV_DEFAULTS="-Djboss50.home=$JBOSS_INSTANCE -Djbossws.integration.target=jboss50"
+
+cd $WORKSPACE/trunk/build
+pwd
+
+#
+# build core modules (and update thirdparty libs)
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties -Dforce.thirdparty.get=true main
+
+#
+# deploy jboss50
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties deploy-jboss50
+
+#
+# build test suite
+#
+cd $WORKSPACE/trunk/jbossws-tests
+pwd
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties main
+
+#
+# start jbossas
+#(make sure it's stopped first)
+#
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE stop
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE start
+sleep 30
+
+#
+# execute tests
+#
+ant -propertyfile $WORKSPACE/trunk/build/etc/hudson/AS-5.x.properties $ENV_DEFAULTS tests
+
+#
+# stop jbossas
+#
+$WORKSPACE/trunk/build/etc/hudson/jboss-init.sh $JBOSS_INSTANCE stop</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>trunk/jbossws-tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>heiko(a)openj.net</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <modules>https://svn.jboss.org/repos/jbossws/trunk</modules>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <description>Builds JBossWS-TRUNK against AS 5.0 TRUNK</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Added: subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/nextBuildNumber
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/nextBuildNumber (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/nextBuildNumber 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+99
Added: subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/scm-polling.log
===================================================================
--- subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/scm-polling.log (rev 0)
+++ subprojects/jbossws-hudson/jobs/JBossWS-TRUNK/scm-polling.log 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1 @@
+
Added: subprojects/jbossws-hudson/users/heiko.braun(a)jboss.com/config.xml
===================================================================
--- subprojects/jbossws-hudson/users/heiko.braun(a)jboss.com/config.xml (rev 0)
+++ subprojects/jbossws-hudson/users/heiko.braun(a)jboss.com/config.xml 2007-01-23 12:28:31 UTC (rev 2031)
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<user>
+ <fullName>heiko.braun(a)jboss.com</fullName>
+ <description>Heiko</description>
+ <properties>
+ <hudson.tasks.Mailer-UserProperty/>
+ </properties>
+</user>
\ No newline at end of file
![src="http://labs.jboss.com/file-access/default/theme/images/spotligh...](http://src="http://labs.jboss.com/file-access/default/theme/images/spotlight_jbossws1.jpg%22){kind=link}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2030 - in trunk: integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-23 04:22:12 -0500 (Tue, 23 Jan 2007)
New Revision: 2030
Added:
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java
Modified:
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextInjector.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java
trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
[JBWS-1468] @Resource WebServiceContext for jbossas-4.x
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -33,15 +33,11 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
-import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.server.AbstractServiceEndpointInvoker;
import org.jboss.ws.core.server.ServiceEndpointInfo;
import org.jboss.ws.core.server.ServiceEndpointInvoker;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.utils.ObjectNameFactory;
/**
@@ -100,8 +96,6 @@
public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception
{
log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName());
-
- // invoke on the container
try
{
// setup the invocation
@@ -115,23 +109,8 @@
throw new WSException("Cannot obtain container from Dispatcher: " + canonicalName);
Class beanClass = container.getBeanClass();
-
- SOAPMessageContextJAXWS jaxwsMessageContext = null;
- SOAPMessageContextJAXRPC jaxrpcMessageContext = null;
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- if (msgContext instanceof SOAPMessageContextJAXRPC)
- {
- jaxrpcMessageContext = (SOAPMessageContextJAXRPC)msgContext;
- jaxwsMessageContext = new SOAPMessageContextJAXWS(msgContext);
- }
- else if (msgContext instanceof SOAPMessageContextJAXWS)
- {
- jaxwsMessageContext = (SOAPMessageContextJAXWS)msgContext;
- jaxrpcMessageContext = new SOAPMessageContextJAXRPC(msgContext);
- }
Method implMethod = getImplMethod(beanClass, seiMethod);
- //BeanContextLifecycleCallback callback = new CallbackImpl(jaxrpcMessageContext, jaxwsMessageContext);
Object retObj = container.localInvoke(implMethod, args);
epInv.setReturnValue(retObj);
Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -24,12 +24,10 @@
// $Id$
import java.lang.reflect.Method;
-import java.security.Principal;
import javax.ejb.EJBContext;
import javax.management.ObjectName;
import javax.xml.rpc.soap.SOAPFaultException;
-import javax.xml.ws.handler.MessageContext;
import org.jboss.aop.Dispatcher;
import org.jboss.aop.MethodInfo;
@@ -44,7 +42,6 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.core.jaxws.AbstractWebServiceContext;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.server.AbstractServiceEndpointInvoker;
import org.jboss.ws.core.server.ServiceEndpointInfo;
@@ -173,7 +170,7 @@
if (beanProp != null)
{
EJBContext ejbCtx = beanCtx.getEJBContext();
- beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx));
+ beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB3(jaxwsMessageContext, ejbCtx));
}
}
@@ -187,29 +184,4 @@
beanProp.set(beanCtx.getInstance(), null);
}
}
-
- /** Delegate to EJBContext
- */
- class WebServiceContextEJB extends AbstractWebServiceContext
- {
- private EJBContext ejbContext;
-
- public WebServiceContextEJB(MessageContext messageContext, EJBContext ejbContext)
- {
- super(messageContext);
- this.ejbContext = ejbContext;
- }
-
- @Override
- public Principal getUserPrincipal()
- {
- return ejbContext.getCallerPrincipal();
- }
-
- @Override
- public boolean isUserInRole(String role)
- {
- return ejbContext.isCallerInRole(role);
- }
- }
}
Added: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java (rev 0)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -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.ws.integration.jboss50;
+
+// $Id$
+
+import java.security.Principal;
+
+import javax.ejb.EJBContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.ws.core.jaxws.AbstractWebServiceContext;
+
+/**
+ * A WebServiceContext implementation that delegates to the EJBContext.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 23-Jan-2007
+ */
+public class WebServiceContextEJB3 extends AbstractWebServiceContext
+{
+ private EJBContext ejbContext;
+
+ public WebServiceContextEJB3(MessageContext messageContext, EJBContext ejbContext)
+ {
+ super(messageContext);
+ this.ejbContext = ejbContext;
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ Principal principal = ejbContext.getCallerPrincipal();
+ return principal;
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ boolean isUserInRole = ejbContext.isCallerInRole(role);
+ return isUserInRole;
+ }
+}
Property changes on: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceContextEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -0,0 +1,98 @@
+/*
+ * 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.ws.core.jaxws;
+
+// $Id$
+
+import java.io.Serializable;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.security.RealmMapping;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/**
+ * A WebServiceContext implementation that delegates to the EJBContext if available.
+ * Otherwise it uses jbosssx.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 23-Jan-2007
+ */
+public class WebServiceContextImpl extends AbstractWebServiceContext implements Serializable
+{
+ // provide logging
+ private Logger log = Logger.getLogger(WebServiceContextImpl.class);
+
+ private transient RealmMapping realmMapping;
+
+ public WebServiceContextImpl(MessageContext messageContext)
+ {
+ super(messageContext);
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ Principal principal = SecurityAssociation.getCallerPrincipal();
+ return principal;
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ boolean isUserInRole = false;
+ Principal principal = SecurityAssociation.getCallerPrincipal();
+ RealmMapping realmMapping = getRealmMapping();
+ if (realmMapping != null && principal != null)
+ {
+ Set<Principal> roles = new HashSet<Principal>();
+ roles.add(new SimplePrincipal(role));
+ isUserInRole = realmMapping.doesUserHaveRole(principal, roles);
+ }
+ return isUserInRole;
+ }
+
+ private RealmMapping getRealmMapping()
+ {
+ if (realmMapping == null)
+ {
+ String lookupName = "java:comp/env/security/realmMapping";
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ realmMapping = (RealmMapping)iniCtx.lookup(lookupName);
+ }
+ catch (NamingException e)
+ {
+ log.debug("Cannot obtain realm mapping from: " + lookupName);
+ }
+ }
+ return realmMapping;
+ }
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextInjector.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextInjector.java 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextInjector.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -25,58 +25,48 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
import javax.annotation.Resource;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import org.jboss.logging.Logger;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
/**
* Inject the JAXWS WebServiceContext
*
* @author Thomas.Diesler(a)jboss.org
- * @since 04-Jan-2006
+ * @since 04-Jan-2007
*/
public class WebServiceContextInjector
{
// provide logging
private static Logger log = Logger.getLogger(WebServiceContextInjector.class);
- public void injectContext(Object epImpl, MessageContext msgContext)
+ public void injectContext(Object epInstance, WebServiceContext wsContext)
{
- AbstractWebServiceContext webServiceContext = new WebServiceContextJSE(msgContext);
try
{
// scan fields that are marked with @Resource
- Field[] fields = epImpl.getClass().getDeclaredFields();
+ Field[] fields = epInstance.getClass().getDeclaredFields();
for (Field field : fields)
{
Class type = field.getType();
if (type == WebServiceContext.class && field.isAnnotationPresent(Resource.class))
{
field.setAccessible(true);
- field.set(epImpl, webServiceContext);
+ field.set(epInstance, wsContext);
}
}
// scan methods that are marked with @Resource
- Method[] methods = epImpl.getClass().getDeclaredMethods();
+ Method[] methods = epInstance.getClass().getDeclaredMethods();
for (Method method : methods)
{
Class[] paramTypes = method.getParameterTypes();
if (paramTypes.length == 1 && paramTypes[0] == WebServiceContext.class && method.isAnnotationPresent(Resource.class))
{
method.setAccessible(true);
- method.invoke(epImpl, new Object[] { webServiceContext });
+ method.invoke(epInstance, new Object[] { wsContext });
}
}
}
@@ -89,54 +79,4 @@
log.warn("Cannot inject WebServiceContext", ex);
}
}
-
- class WebServiceContextJSE extends AbstractWebServiceContext
- {
- private RealmMapping realmMapping;
-
- public WebServiceContextJSE(MessageContext messageContext)
- {
- super(messageContext);
- }
-
- @Override
- public Principal getUserPrincipal()
- {
- Principal principal = SecurityAssociation.getCallerPrincipal();
- return principal;
- }
-
- @Override
- public boolean isUserInRole(String role)
- {
- boolean isUserInRole = false;
- Principal principal = SecurityAssociation.getCallerPrincipal();
- RealmMapping realmMapping = getRealmMapping();
- if (realmMapping != null && principal != null)
- {
- Set<Principal> roles = new HashSet<Principal>();
- roles.add(new SimplePrincipal(role));
- isUserInRole = realmMapping.doesUserHaveRole(principal, roles);
- }
- return isUserInRole;
- }
-
- private RealmMapping getRealmMapping()
- {
- if (realmMapping == null)
- {
- String lookupName = "java:comp/env/security/realmMapping";
- try
- {
- InitialContext iniCtx = new InitialContext();
- realmMapping = (RealmMapping) iniCtx.lookup(lookupName);
- }
- catch (NamingException e)
- {
- log.debug("Cannot obtain realm mapping from: " + lookupName);
- }
- }
- return realmMapping;
- }
- }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -29,12 +29,14 @@
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.rpc.server.ServletEndpointContext;
import javax.xml.rpc.soap.SOAPFaultException;
+import javax.xml.ws.WebServiceContext;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl;
+import org.jboss.ws.core.jaxws.WebServiceContextImpl;
import org.jboss.ws.core.jaxws.WebServiceContextInjector;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
@@ -89,7 +91,10 @@
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext instanceof SOAPMessageContextJAXWS)
- new WebServiceContextInjector().injectContext(seiImpl, (SOAPMessageContextJAXWS)msgContext);
+ {
+ WebServiceContext wsContext = new WebServiceContextImpl((SOAPMessageContextJAXWS)msgContext);
+ new WebServiceContextInjector().injectContext(seiImpl, wsContext);
+ }
Class implClass = seiImpl.getClass();
Method seiMethod = epInv.getJavaMethod();
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java 2007-01-23 09:22:12 UTC (rev 2030)
@@ -47,7 +47,8 @@
@RolesAllowed("friend")
public class EndpointEJB
{
- @Resource
+ // mappedName needed for jboss40
+ @Resource(mappedName = "wsCtx")
WebServiceContext wsCtx;
@WebMethod
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-23 09:22:12 UTC (rev 2030)
@@ -4,7 +4,8 @@
org/jboss/test/ws/jaxrpc/samples/wseventing/**
org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/benchmark/**
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase*
org/jboss/test/ws/jaxws/webserviceref/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-23 09:22:12 UTC (rev 2030)
@@ -4,6 +4,7 @@
org/jboss/test/ws/jaxrpc/samples/wseventing/**
org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/benchmark/**
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase*
org/jboss/test/ws/jaxws/webserviceref/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-23 09:22:12 UTC (rev 2030)
@@ -4,6 +4,7 @@
org/jboss/test/ws/jaxrpc/samples/wseventing/**
org/jboss/test/ws/jaxrpc/wseventing/**
org/jboss/test/ws/jaxws/benchmark/**
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/endpoint/**
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/webserviceref/**
Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-23 04:37:44 UTC (rev 2029)
+++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-23 09:22:12 UTC (rev 2030)
@@ -10,6 +10,7 @@
org/jboss/test/ws/jaxrpc/samples/wsbpel/**
org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
org/jboss/test/ws/jaxrpc/wseventing/**
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/samples/jsr181ejb/**
org/jboss/test/ws/jaxws/samples/retail/**
17 years, 9 months
- 1
- 0
JBossWS SVN: r2029 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/utils and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-01-22 23:37:44 -0500 (Mon, 22 Jan 2007)
New Revision: 2029
Modified:
trunk/build/version.properties
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java
Log:
Fix JBWS-1458
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-01-22 21:11:38 UTC (rev 2028)
+++ trunk/build/version.properties 2007-01-23 04:37:44 UTC (rev 2029)
@@ -34,7 +34,7 @@
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-ejb3=1.0.0.CR9-jboss4.0.5
-jboss-jbossretro=1.0.4.GA
+jboss-jbossretro=snapshot
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.snapshot
jbossas-core-libs=4.0.5.GA
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-01-22 21:11:38 UTC (rev 2028)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2007-01-23 04:37:44 UTC (rev 2029)
@@ -206,6 +206,39 @@
}
/**
+ * Gets the value type of a JAX-RPC holder. Note this method should not be used
+ * for JAX-WS, as a JAX-WS holder requires generic info. Instead, use the Type
+ * version.
+ *
+ * @param holderType the generic type for JAX-WS, a standard class for JAX-RPC
+ * @return the value type
+ */
+ public static Class getValueType(Class holderClass)
+ {
+ boolean jaxrpcHolder = javax.xml.rpc.holders.Holder.class.isAssignableFrom(holderClass);
+ boolean jaxwsHolder = javax.xml.ws.Holder.class.isAssignableFrom(holderClass);
+ if (!jaxrpcHolder && !jaxwsHolder)
+ throw new IllegalArgumentException("Is not a holder: " + holderClass.getName());
+
+ // No generic info
+ if (jaxwsHolder)
+ return Object.class;
+
+ // Holder is supposed to have a public value field.
+ Field field;
+ try
+ {
+ field = holderClass.getField("value");
+ }
+ catch (NoSuchFieldException e)
+ {
+ throw new IllegalArgumentException("Cannot find public value field: " + holderClass);
+ }
+
+ return field.getType();
+ }
+
+ /**
* Gets the value object of a JAX-WS or JAX-RPC holder instance.
*
* @param holder the holder object instance
@@ -282,10 +315,14 @@
* @param holder JAX-WS holder type
* @return generic value type
*/
- // [JBBUILD-331] Add support for java.lang.reflect.Type
public static Type getGenericValueType(Type holder)
{
- return (holder instanceof ParameterizedType) ? ((ParameterizedType)holder).getActualTypeArguments()[0] : Object.class;
+ // For some reason the JDK 4 bytecode verifier trips up on this function if you use the ternary operator
+ // The only difference between it and the working form here is the use of a goto instruction. JDK bug perhaps?
+ if (holder instanceof ParameterizedType)
+ return ((ParameterizedType)holder).getActualTypeArguments()[0];
+
+ return Object.class;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-01-22 21:11:38 UTC (rev 2028)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-01-23 04:37:44 UTC (rev 2029)
@@ -586,6 +586,17 @@
return ret;
}
+
+ /**
+ * This method tests for retro translation by searching for a known problem where Class
+ * does not implement Type. If this is true, then code must never cast a Class to a Type.
+ *
+ * @return true if we are in retro
+ */
+ public static boolean isRetro14()
+ {
+ return !(String.class instanceof java.lang.reflect.Type);
+ }
/**
* Tests if this class loader is a JBoss RepositoryClassLoader
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-22 21:11:38 UTC (rev 2028)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-23 04:37:44 UTC (rev 2029)
@@ -109,13 +109,21 @@
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
{
Class returnType = method.getReturnType();
- Type[] parameters = method.getGenericParameterTypes();
+ Type[] genericParameters = method.getGenericParameterTypes();
+ Class[] classParameters = method.getParameterTypes();
if (index == -1 && matchTypes(returnType, expectedType, exact, false))
return true;
- boolean indexInBounds = -1 < index && index < parameters.length;
- if (indexInBounds && matchTypes(parameters[index], expectedType, exact, holder))
+ boolean indexInBounds = -1 < index && index < classParameters.length;
+ boolean matchTypes;
+
+ if (JavaUtils.isRetro14())
+ matchTypes = matchTypes(classParameters[index], expectedType, exact, holder);
+ else
+ matchTypes = matchTypes(genericParameters[index], expectedType, exact, holder);
+
+ if (indexInBounds && matchTypes)
{
matches.add(index);
return true;
@@ -123,7 +131,7 @@
return false;
}
-
+
private static boolean matchTypes(Type actualType, Class expectedType, boolean exact, boolean holder)
{
if (holder && HolderUtils.isHolderType(actualType) == false)
@@ -132,6 +140,24 @@
Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType);
Class valueClass = JavaUtils.erasure(valueType);
+ return matchTypesInternal(valueClass, expectedType, exact);
+ }
+
+ // This duplication is needed because Class does not implement Type in 1.4,
+ // which makes retrotranslation not possible. This takes advantage of overloading to
+ // prevent the problem.
+ private static boolean matchTypes(Class actualType, Class expectedType, boolean exact, boolean holder)
+ {
+ if (holder && HolderUtils.isHolderType(actualType) == false)
+ return false;
+
+ Class valueClass = (holder ? HolderUtils.getValueType(actualType) : actualType);
+
+ return matchTypesInternal(valueClass, expectedType, exact);
+ }
+
+ private static boolean matchTypesInternal(Class valueClass, Class expectedType, boolean exact)
+ {
// FIXME - Why do we need this hack? It shouldn't be needed. The method
// signature should _ALWAYS_ match, else we will get ambiguous or
// incorrect results
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java 2007-01-22 21:11:38 UTC (rev 2028)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java 2007-01-23 04:37:44 UTC (rev 2029)
@@ -42,7 +42,7 @@
/**
* JAXBWSDLGenerator provides a JAXB based WSDLGenerator.
*
- * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
*/
public class JAXBWSDLGenerator extends WSDLGenerator
{
17 years, 9 months
- 1
- 0
JBossWS SVN: r2028 - in trunk/jbossws-tests: src/main/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-22 16:11:38 -0500 (Mon, 22 Jan 2007)
New Revision: 2028
Modified:
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Use excludes for compile as well
Fix test compile classpath
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-22 18:52:12 UTC (rev 2027)
+++ trunk/jbossws-tests/build.xml 2007-01-22 21:11:38 UTC (rev 2028)
@@ -43,17 +43,17 @@
</condition>
<!-- Available integration target -->
- <property name="${jbossws.integration.target}.available" value="true"/>
+ <property name="integration.target.${jbossws.integration.target}" value="true"/>
<!-- Define jboss.home -->
<condition property="jboss.home" value="${jboss50.home}">
- <isset property="jboss50.available"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
</condition>
<condition property="jboss.home" value="${jboss42.home}">
- <isset property="jboss42.available"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
<condition property="jboss.home" value="${jboss40.home}">
- <isset property="jboss40.available"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
<!-- Integration Target Server -->
@@ -134,15 +134,15 @@
</not>
</condition>
<property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/>
- <property name="tests.excludefile" value="${tests.resources.dir}/${excludes-short-name}"/>
+ <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>
<echo/>
<echo message="-----------------------------------------------"/>
- <echo message="jboss.home = ${jboss.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
- <echo message="java.home = ${java.home}"/>
- <echo message="endorsed = ${endorsed.dirs}"/>
- <echo message="excludefile = ${excludes-short-name}"/>
+ <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="endorsed = ${endorsed.dirs}"/>
+ <echo message="excludesfile = ${excludes-short-name}"/>
<echo message="-----------------------------------------------"/>
</target>
@@ -150,10 +150,7 @@
<!--
Init the various classpaths
-->
- <target name="init" depends="prepare,thirdparty,init-jboss50-classpath">
- </target>
-
- <target name="init-jboss50-classpath" depends="prepare" if="jboss50.available">
+ <target name="init" depends="prepare,thirdparty">
<!-- The combined compile classpath -->
<path id="javac.classpath">
@@ -186,7 +183,6 @@
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-jboss50-integration.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
@@ -199,7 +195,8 @@
<target name="compile14" depends="init" unless="HAVE_JDK_1.5">
<mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="${tests.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
@@ -213,12 +210,9 @@
<target name="compile15" depends="init" if="HAVE_JDK_1.5">
<mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/wseventing/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
@@ -337,8 +331,6 @@
<target name="tests" depends="main" description="Run all unit tests and generate a report">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
- <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/>
- <param name="excludesfile" value="${tests.excludefile}"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -347,7 +339,6 @@
<target name="tests-benchmark" depends="init" description="Run benchmark unit tests">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/>
- <param name="excludesfile" value="${tests.excludefile}"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -356,7 +347,6 @@
<target name="tests-samples" depends="init" description="Run samples unit tests">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
- <param name="excludesfile" value="${tests.excludefile}"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -365,7 +355,6 @@
<target name="tests-tools" depends="init" description="Run tools unit tests">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/>
- <param name="excludesfile" value="${tests.excludefile}"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -377,8 +366,6 @@
<target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
- <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/>
- <param name="excludesfile" value="${tests.excludefile}"/>
</antcall>
</target>
@@ -412,7 +399,7 @@
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
<batchtest todir="${tests.output.dir}/reports" fork="true">
- <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/>
+ <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/>
</batchtest>
</junit>
</target>
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028)
@@ -1,3 +1,10 @@
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxrpc/jbws718/**
+org/jboss/test/ws/jaxrpc/samples/wseventing/**
+org/jboss/test/ws/jaxrpc/wseventing/**
+org/jboss/test/ws/jaxws/benchmark/**
org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/webserviceref/**
+
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028)
@@ -1,3 +1,9 @@
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxrpc/jbws718/**
+org/jboss/test/ws/jaxrpc/samples/wseventing/**
+org/jboss/test/ws/jaxrpc/wseventing/**
+org/jboss/test/ws/jaxws/benchmark/**
org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/webserviceref/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028)
@@ -1,9 +1,18 @@
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxrpc/jbws718/**
+org/jboss/test/ws/jaxrpc/samples/wseventing/**
+org/jboss/test/ws/jaxrpc/wseventing/**
+org/jboss/test/ws/jaxws/benchmark/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# EJB3 excludes
org/jboss/test/ws/jaxws/eardeployment/**
org/jboss/test/ws/jaxws/jbws944/**
org/jboss/test/ws/jaxws/jbws981/**
-org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class
-org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.class
-org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.class
+org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/webserviceref/**
org/jboss/test/ws/jaxws/xop/**
Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027)
+++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028)
@@ -1 +1,5 @@
-nothing-to-exclude/**
\ No newline at end of file
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxrpc/jbws718/**
+org/jboss/test/ws/jaxrpc/samples/wseventing/**
+org/jboss/test/ws/jaxrpc/wseventing/**
Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027)
+++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028)
@@ -1,10 +1,15 @@
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxrpc/jbws718/**
org/jboss/test/ws/jaxrpc/jbws1011/**
+org/jboss/test/ws/jaxrpc/samples/wseventing/**
org/jboss/test/ws/jaxrpc/samples/dynamichandler/**
org/jboss/test/ws/jaxrpc/samples/jmstransport/**
org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
org/jboss/test/ws/jaxrpc/samples/secureejb/**
org/jboss/test/ws/jaxrpc/samples/wsbpel/**
-org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.class
-org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class
+org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
+org/jboss/test/ws/jaxrpc/wseventing/**
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
org/jboss/test/ws/jaxws/samples/jsr181ejb/**
org/jboss/test/ws/jaxws/samples/retail/**
17 years, 9 months
- 1
- 0
JBossWS SVN: r2027 - trunk/jbossws-tests/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-22 13:52:12 -0500 (Mon, 22 Jan 2007)
New Revision: 2027
Modified:
trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
Log:
Remove support for JSR181 on EJB2.1\nAdd @WebServiceRef tests to exclude list\nCommit msg for privious commit
Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-22 18:48:34 UTC (rev 2026)
+++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027)
@@ -5,5 +5,6 @@
org/jboss/test/ws/jaxrpc/samples/secureejb/**
org/jboss/test/ws/jaxrpc/samples/wsbpel/**
org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.class
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class
org/jboss/test/ws/jaxws/samples/jsr181ejb/**
org/jboss/test/ws/jaxws/samples/retail/**
17 years, 9 months
- 1
- 0