JBossWS SVN: r2519 - trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-05 05:00:36 -0500 (Mon, 05 Mar 2007)
New Revision: 2519
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
Log:
Delegate handler chain resolution yo meta data builder
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04 17:18:14 UTC (rev 2518)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-05 10:00:36 UTC (rev 2519)
@@ -149,11 +149,9 @@
// Resolve path to handler chain
if (handlerChain != null)
{
- boolean validHandlerChain = false;
try
{
new URL(handlerChain);
- validHandlerChain = true;
}
catch (MalformedURLException ex)
{
@@ -165,24 +163,9 @@
else if (anElement instanceof Class)
declaringClass = (Class)anElement;
- String resource = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
- if (findHandlerChain(vfsRoot, resource))
- {
- validHandlerChain = true;
- handlerChain = resource;
- }
-
- resource = "WEB-INF/classes/" + resource;
- if (findHandlerChain(vfsRoot, resource))
- {
- validHandlerChain = true;
- handlerChain = resource;
- }
+ handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
}
-
- if (validHandlerChain == false)
- throw new IllegalStateException("Cannot find handler chain: " + handlerChain);
-
+
usRef.setHandlerChain(handlerChain);
}
17 years, 2 months
- 1
- 0
JBossWS SVN: r2518 - in trunk/jbossws-core/src/java/org/jboss/ws: core/jaxws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-04 12:18:14 -0500 (Sun, 04 Mar 2007)
New Revision: 2518
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
Log:
[JBCTS-544] Binding.getHandlerChain() expected to return a modifyable list
Modified: trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java 2007-03-04 15:31:41 UTC (rev 2517)
+++ trunk/jbossws-core/src/java/org/jboss/ws/annotation/WebContext.java 2007-03-04 17:18:14 UTC (rev 2518)
@@ -85,11 +85,11 @@
String transportGuarantee() default "";
/**
- * A secure endpoint does not by default publish it's wsdl on an unsecure transport.
- * You can override this behaviour by explicitly setting the secureWSDLAccess flag to false.
+ * A secure endpoint does not secure wsdl access by default.
+ * Explicitly setting secureWSDLAccess overrides this behaviour.
*
* Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723
*/
- boolean secureWSDLAccess() default true;
+ boolean secureWSDLAccess() default false;
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04 15:31:41 UTC (rev 2517)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04 17:18:14 UTC (rev 2518)
@@ -178,11 +178,11 @@
validHandlerChain = true;
handlerChain = resource;
}
-
- if (validHandlerChain == false)
- throw new IllegalStateException("Cannot find handler chain: " + handlerChain);
}
+ if (validHandlerChain == false)
+ throw new IllegalStateException("Cannot find handler chain: " + handlerChain);
+
usRef.setHandlerChain(handlerChain);
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-03-04 15:31:41 UTC (rev 2517)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-03-04 17:18:14 UTC (rev 2518)
@@ -24,7 +24,6 @@
// $Id: $
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.xml.ws.handler.Handler;
@@ -61,7 +60,10 @@
if (handlerType == HandlerType.POST || handlerType == HandlerType.ALL)
handlerChain.addAll(postHandlerChain);
- return Collections.unmodifiableList(handlerChain);
+ log.warn("[JBCTS-544] - Binding.getHandlerChain() expected to return a modifyable list");
+ // return Collections.unmodifiableList(handlerChain);
+
+ return handlerChain;
}
public void setHandlerChain(List<Handler> handlerChain, HandlerType handlerType)
@@ -87,13 +89,15 @@
public List<Handler> getHandlerChain()
{
- if(log.isDebugEnabled()) log.debug("getHandlerChain: " + jaxwsHandlerChain);
- return Collections.unmodifiableList(jaxwsHandlerChain);
+ log.warn("[JBCTS-544] - Binding.getHandlerChain() expected to return a modifyable list");
+ // return Collections.unmodifiableList(handlerChain);
+
+ return jaxwsHandlerChain;
}
public void setHandlerChain(List<Handler> handlerChain)
{
- if(log.isDebugEnabled()) log.debug("setHandlerChain: " + handlerChain);
+ log.debug("setHandlerChain: " + handlerChain);
jaxwsHandlerChain.clear();
jaxwsHandlerChain.addAll(handlerChain);
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-03-04 15:31:41 UTC (rev 2517)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-03-04 17:18:14 UTC (rev 2518)
@@ -62,7 +62,7 @@
// The optional transport guarantee
private String transportGuarantee;
// The optional secure wsdl access
- private Boolean secureWSDLAccess;
+ private boolean secureWSDLAccess;
// The bean that registers with the ServiceEndpointManager
private String managedEndpointBean = "org.jboss.ws.core.server.ServiceEndpoint";
@@ -163,19 +163,12 @@
this.transportGuarantee = transportGuarantee;
}
- public Boolean isSecureWSDLAccess()
+ public boolean isSecureWSDLAccess()
{
- // For backward compatiblity we leave wsdl access for jaxrpc endpoints unprotected
- if (secureWSDLAccess == null)
- {
- secureWSDLAccess = (getType() == Type.JAXWS);
- log.debug("Using default for secure wsdl access: " + secureWSDLAccess);
- }
-
return secureWSDLAccess;
}
- public void setSecureWSDLAccess(Boolean secureWSDLAccess)
+ public void setSecureWSDLAccess(boolean secureWSDLAccess)
{
this.secureWSDLAccess = secureWSDLAccess;
}
17 years, 2 months
- 1
- 0
JBossWS SVN: r2517 - in trunk: jbossws-core/src/java/org/jboss/ws/core and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-04 10:31:41 -0500 (Sun, 04 Mar 2007)
New Revision: 2517
Modified:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java
trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
Log:
Decouple handler chain loading from vfs adaptor
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-04 14:46:36 UTC (rev 2516)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-04 15:31:41 UTC (rev 2517)
@@ -38,7 +38,7 @@
public class VirtualFileAdaptor implements UnifiedVirtualFile
{
private static final long serialVersionUID = 6547394037548338042L;
-
+
private VirtualFile root;
public VirtualFileAdaptor(VirtualFile root)
@@ -46,11 +46,6 @@
this.root = root;
}
- public String getName()
- {
- return root.getName();
- }
-
public UnifiedVirtualFile findChild(String child) throws IOException
{
VirtualFile vf = root.findChild(child);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-04 14:46:36 UTC (rev 2516)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-04 15:31:41 UTC (rev 2517)
@@ -36,8 +36,6 @@
*/
public interface UnifiedVirtualFile extends Serializable
{
- String getName();
-
UnifiedVirtualFile findChild(String child) throws IOException;
URL toURL();
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04 14:46:36 UTC (rev 2516)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04 15:31:41 UTC (rev 2517)
@@ -54,7 +54,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 17-Jan-2007
*/
-public class UnifiedWebServiceRefHandler
+public class UnifiedWebServiceRefHandler
{
// logging support
private static Logger log = Logger.getLogger(UnifiedWebServiceRefHandler.class);
@@ -62,7 +62,7 @@
protected void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedVirtualFile vfsRoot, Source metadata) throws NamingException
{
WebServiceRef wsref = null;
-
+
// Build the list of @WebServiceRef relevant annotations
List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>();
for (Annotation an : anElement.getAnnotations())
@@ -145,13 +145,15 @@
HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class);
if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0)
handlerChain = anHandlerChain.file();
-
+
// Resolve path to handler chain
if (handlerChain != null)
{
+ boolean validHandlerChain = false;
try
{
new URL(handlerChain);
+ validHandlerChain = true;
}
catch (MalformedURLException ex)
{
@@ -162,27 +164,32 @@
declaringClass = ((Method)anElement).getDeclaringClass();
else if (anElement instanceof Class)
declaringClass = (Class)anElement;
-
- handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
- if (vfsRoot.getName().endsWith(".war"))
- handlerChain = "WEB-INF/classes/" + handlerChain;
-
- try
+
+ String resource = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
+ if (findHandlerChain(vfsRoot, resource))
{
- vfsRoot.findChild(handlerChain);
+ validHandlerChain = true;
+ handlerChain = resource;
}
- catch (IOException ioex)
+
+ resource = "WEB-INF/classes/" + resource;
+ if (findHandlerChain(vfsRoot, resource))
{
- throw new IllegalStateException("Cannot find handler chain: " + handlerChain, ioex);
+ validHandlerChain = true;
+ handlerChain = resource;
}
+
+ if (validHandlerChain == false)
+ throw new IllegalStateException("Cannot find handler chain: " + handlerChain);
}
+
usRef.setHandlerChain(handlerChain);
}
// Do not use rebind, the binding should be unique
// [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind
Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef));
-
+
log.debug("<service-ref> bound to: java:comp/env/" + encName);
}
catch (RuntimeException rte)
@@ -194,4 +201,17 @@
throw new WSException("Cannot bind web service ref: " + encName, ex);
}
}
+
+ private boolean findHandlerChain(UnifiedVirtualFile vfsRoot, String handlerChain)
+ {
+ try
+ {
+ vfsRoot.findChild(handlerChain);
+ return true;
+ }
+ catch (IOException io)
+ {
+ return false;
+ }
+ }
}
17 years, 2 months
- 1
- 0
JBossWS SVN: r2516 - in trunk: jbossws-core/src/java/org/jboss/ws/core and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-04 09:46:36 -0500 (Sun, 04 Mar 2007)
New Revision: 2516
Modified:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java
trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
Log:
servlet vehicle cannot load handler chain
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-03 17:11:21 UTC (rev 2515)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-04 14:46:36 UTC (rev 2516)
@@ -46,6 +46,11 @@
this.root = root;
}
+ public String getName()
+ {
+ return root.getName();
+ }
+
public UnifiedVirtualFile findChild(String child) throws IOException
{
VirtualFile vf = root.findChild(child);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-03 17:11:21 UTC (rev 2515)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-04 14:46:36 UTC (rev 2516)
@@ -36,6 +36,8 @@
*/
public interface UnifiedVirtualFile extends Serializable
{
+ String getName();
+
UnifiedVirtualFile findChild(String child) throws IOException;
URL toURL();
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-03 17:11:21 UTC (rev 2515)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-04 14:46:36 UTC (rev 2516)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
@@ -163,9 +164,17 @@
declaringClass = (Class)anElement;
handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain;
- UnifiedVirtualFile vfHandlerChain = vfsRoot.findChild(handlerChain);
- if (vfHandlerChain == null)
- throw new IllegalStateException("Cannot find handler chain: " + handlerChain);
+ if (vfsRoot.getName().endsWith(".war"))
+ handlerChain = "WEB-INF/classes/" + handlerChain;
+
+ try
+ {
+ vfsRoot.findChild(handlerChain);
+ }
+ catch (IOException ioex)
+ {
+ throw new IllegalStateException("Cannot find handler chain: " + handlerChain, ioex);
+ }
}
usRef.setHandlerChain(handlerChain);
}
17 years, 2 months
- 1
- 0
JBossWS SVN: r2515 - in trunk/jbossws-core: src/java/org/jboss/ws/core/jaxws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-03 12:11:21 -0500 (Sat, 03 Mar 2007)
New Revision: 2515
Modified:
trunk/jbossws-core/.classpath
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
Log:
Temporarily disable JAXBContextCache
Fix multiple call to rebuildEndpointMetaData
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-03-03 15:32:27 UTC (rev 2514)
+++ trunk/jbossws-core/.classpath 2007-03-03 17:11:21 UTC (rev 2515)
@@ -15,7 +15,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-src.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/>
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-03-03 15:32:27 UTC (rev 2514)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-03-03 17:11:21 UTC (rev 2515)
@@ -29,10 +29,7 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.utils.HashCodeUtil;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
/**
* Cache JAXBContext's.
@@ -57,9 +54,6 @@
/**
* Retrieve a cached JAXBContext instance.
* If no instance is cached a new one will be created and registered.
- * @param classes
- * @return
- * @throws JAXBException
*/
public JAXBContext getInstance(Class[] classes) throws JAXBException
{
@@ -77,9 +71,6 @@
/**
* Retrieve a cached JAXBContext instance.
* If no instance is cached a new one will be created and registered.
- * @param clazz
- * @return
- * @throws JAXBException
*/
public JAXBContext getInstance(Class clazz) throws JAXBException
{
@@ -98,13 +89,13 @@
* Access the JAXBContext cache through the message context.
* The actual instance is assiciated with the EndpointMetaData.
* @return JAXBContextCache
- */
public static JAXBContextCache getContextCache()
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
return epMetaData.getJaxbCache();
}
+ */
private static Integer buildId(Class[] classes)
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-03-03 15:32:27 UTC (rev 2514)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-03-03 17:11:21 UTC (rev 2515)
@@ -60,14 +60,16 @@
Object value = null;
try
{
- Class[] types = (Class[])serContext.getProperty(SerializationContext.CONTEXT_TYPES);
+ Class[] javaTypes = (Class[])serContext.getProperty(SerializationContext.CONTEXT_TYPES);
TypeMappingImpl typeMapping = serContext.getTypeMapping();
Class javaType = typeMapping.getJavaType(xmlType);
- JAXBContextCache contextCache = JAXBContextCache.getContextCache();
- JAXBContext jaxbContext = contextCache.getInstance(types);
-
+ //JAXBContextCache contextCache = JAXBContextCache.getContextCache();
+ //JAXBContext jaxbContext = contextCache.getInstance(types);
+
+ JAXBContext jaxbContext = JAXBContext.newInstance(javaTypes);
+
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl());
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-03 15:32:27 UTC (rev 2514)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-03 17:11:21 UTC (rev 2515)
@@ -23,27 +23,21 @@
// $Id$
-import java.io.StringWriter;
-import java.io.ByteArrayOutputStream;
import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
-import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceException;
-import javax.xml.transform.Source;
import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.dom.DOMResult;
+import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult;
import org.jboss.ws.core.jaxrpc.binding.ComplexTypeSerializer;
import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl;
import org.w3c.dom.NamedNodeMap;
@@ -73,9 +67,11 @@
{
Class javaType = deriveType(value, xmlType, serContext.getTypeMapping());
- JAXBContextCache contextCache = JAXBContextCache.getContextCache();
- JAXBContext jaxbContext = contextCache.getInstance(javaType);
-
+ //JAXBContextCache contextCache = JAXBContextCache.getContextCache();
+ //JAXBContext jaxbContext = contextCache.getInstance(javaType);
+
+ JAXBContext jaxbContext = JAXBContext.newInstance(javaType);
+
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-03 15:32:27 UTC (rev 2514)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-03 17:11:21 UTC (rev 2515)
@@ -205,6 +205,7 @@
{
JAXWSClientMetaDataBuilder metaDataBuilder = new JAXWSClientMetaDataBuilder();
metaDataBuilder.rebuildEndpointMetaData(epMetaData, seiClass);
+ annotatedPorts.add(portName);
}
return (T)createProxy(seiClass, epMetaData);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-03 15:32:27 UTC (rev 2514)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-03 17:11:21 UTC (rev 2515)
@@ -51,7 +51,6 @@
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory;
-import org.jboss.ws.core.jaxws.JAXBContextCache;
import org.jboss.ws.core.jaxws.JAXBDeserializerFactory;
import org.jboss.ws.core.jaxws.JAXBSerializerFactory;
import org.jboss.ws.core.utils.JavaUtils;
@@ -127,7 +126,7 @@
private ConfigObservable configObservable = new ConfigObservable();
- private JAXBContextCache jaxbCache = new JAXBContextCache();
+ //private JAXBContextCache jaxbCache = new JAXBContextCache();
public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
@@ -578,9 +577,11 @@
}
}
+ /*
public JAXBContextCache getJaxbCache() {
return jaxbCache;
}
+ */
// ---------------------------------------------------------------
// Configuration provider impl
17 years, 2 months
- 1
- 0
JBossWS SVN: r2514 - trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-03 10:32:27 -0500 (Sat, 03 Mar 2007)
New Revision: 2514
Added:
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
Log:
Fix svn move hickup
Added: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-03-03 15:32:27 UTC (rev 2514)
@@ -0,0 +1,153 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.metadata.builder.jaxws;
+
+// $Id$
+
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.ws.annotation.WebContext;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * Builds ServiceEndpointMetaData for a JAX-WS endpoint.
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ * @author Thomas.Diesler(a)jboss.com
+ */
+public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder
+{
+ static void setupProviderOrWebService(UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception
+ {
+ if (beanClass.isAnnotationPresent(WebService.class))
+ {
+ JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder();
+ builder.buildWebServiceMetaData(umd, udi, beanClass, beanName);
+ }
+ else if (beanClass.isAnnotationPresent(WebServiceProvider.class))
+ {
+ JAXWSProviderMetaDataBuilder builder = new JAXWSProviderMetaDataBuilder();
+ builder.buildProviderMetaData(umd, udi, beanClass, beanName);
+ }
+ }
+
+ protected void processEndpointConfig(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
+ {
+ EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class);
+
+ if (anEndpointConfig== null)
+ return;
+
+ String configName = null;
+ String configFile = null;
+
+ if (anEndpointConfig.configName().length() > 0)
+ configName = anEndpointConfig.configName();
+
+ if (anEndpointConfig.configFile().length() > 0)
+ configFile = anEndpointConfig.configFile();
+
+ if (configName != null || configFile != null)
+ sepMetaData.setConfigName(configName, configFile);
+ }
+
+ protected void processWebContext(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
+ {
+ WebContext anWebContext = wsClass.getAnnotation(WebContext.class);
+
+ if (anWebContext == null)
+ return;
+
+ boolean isJSEEndpoint = (udi.type == DeploymentType.JAXWS_JSE);
+
+ // context-root
+ if (anWebContext.contextRoot().length() > 0)
+ {
+ if (isJSEEndpoint)
+ log.warn("@WebContext.contextRoot is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String contextRoot = anWebContext.contextRoot();
+ if (contextRoot.startsWith("/") == false)
+ contextRoot = "/" + contextRoot;
+
+ sepMetaData.setContextRoot(contextRoot);
+ }
+ }
+
+ // url-pattern
+ if (anWebContext.urlPattern().length() > 0)
+ {
+ if (isJSEEndpoint)
+ log.warn("@WebContext.urlPattern is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String urlPattern = anWebContext.urlPattern();
+ sepMetaData.setURLPattern(urlPattern);
+ }
+ }
+
+ // auth-method
+ if (anWebContext.authMethod().length() > 0)
+ {
+ if (isJSEEndpoint)
+ log.warn("@WebContext.authMethod is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String authMethod = anWebContext.authMethod();
+ sepMetaData.setAuthMethod(authMethod);
+ }
+ }
+
+ // transport-guarantee
+ if (anWebContext.transportGuarantee().length() > 0)
+ {
+ if (isJSEEndpoint)
+ log.warn("@WebContext.transportGuarantee is only valid on EJB endpoints");
+
+ if (isJSEEndpoint == false)
+ {
+ String transportGuarantee = anWebContext.transportGuarantee();
+ sepMetaData.setTransportGuarantee(transportGuarantee);
+ }
+ }
+
+ // secure wsdl access
+ sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess());
+
+ // virtual hosts
+ String[] virtualHosts = anWebContext.virtualHosts();
+ if (virtualHosts != null & virtualHosts.length > 0)
+ {
+ sepMetaData.setVirtualHosts(virtualHosts);
+ }
+
+ }
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 2 months
- 1
- 0
JBossWS SVN: r2513 - trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-03 10:32:05 -0500 (Sat, 03 Mar 2007)
New Revision: 2513
Removed:
trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
Log:
Fix svn move hickup
Deleted: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-03-03 15:24:16 UTC (rev 2512)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-03-03 15:32:05 UTC (rev 2513)
@@ -1,153 +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.metadata.builder.jaxws;
-
-// $Id$
-
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceProvider;
-
-import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.annotation.WebContext;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-
-/**
- * Builds ServiceEndpointMetaData for a JAX-WS endpoint.
- *
- * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @author Thomas.Diesler(a)jboss.com
- */
-public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder
-{
- static void setupProviderOrWebService(UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception
- {
- if (beanClass.isAnnotationPresent(WebService.class))
- {
- JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder();
- builder.buildWebServiceMetaData(umd, udi, beanClass, beanName);
- }
- else if (beanClass.isAnnotationPresent(WebServiceProvider.class))
- {
- JAXWSProviderMetaDataBuilder builder = new JAXWSProviderMetaDataBuilder();
- builder.buildProviderMetaData(umd, udi, beanClass, beanName);
- }
- }
-
- protected void processEndpointConfig(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
- {
- EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class);
-
- if (anEndpointConfig== null)
- return;
-
- String configName = null;
- String configFile = null;
-
- if (anEndpointConfig.configName().length() > 0)
- configName = anEndpointConfig.configName();
-
- if (anEndpointConfig.configFile().length() > 0)
- configFile = anEndpointConfig.configFile();
-
- if (configName != null || configFile != null)
- sepMetaData.setConfigName(configName, configFile);
- }
-
- protected void processWebContext(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
- {
- WebContext anWebContext = wsClass.getAnnotation(WebContext.class);
-
- if (anWebContext == null)
- return;
-
- boolean isJSEEndpoint = (udi.type == DeploymentType.JAXWS_JSE);
-
- // context-root
- if (anWebContext.contextRoot().length() > 0)
- {
- if (isJSEEndpoint)
- log.warn("@WebContext.contextRoot is only valid on EJB endpoints");
-
- if (isJSEEndpoint == false)
- {
- String contextRoot = anWebContext.contextRoot();
- if (contextRoot.startsWith("/") == false)
- contextRoot = "/" + contextRoot;
-
- sepMetaData.setContextRoot(contextRoot);
- }
- }
-
- // url-pattern
- if (anWebContext.urlPattern().length() > 0)
- {
- if (isJSEEndpoint)
- log.warn("@WebContext.urlPattern is only valid on EJB endpoints");
-
- if (isJSEEndpoint == false)
- {
- String urlPattern = anWebContext.urlPattern();
- sepMetaData.setURLPattern(urlPattern);
- }
- }
-
- // auth-method
- if (anWebContext.authMethod().length() > 0)
- {
- if (isJSEEndpoint)
- log.warn("@WebContext.authMethod is only valid on EJB endpoints");
-
- if (isJSEEndpoint == false)
- {
- String authMethod = anWebContext.authMethod();
- sepMetaData.setAuthMethod(authMethod);
- }
- }
-
- // transport-guarantee
- if (anWebContext.transportGuarantee().length() > 0)
- {
- if (isJSEEndpoint)
- log.warn("@WebContext.transportGuarantee is only valid on EJB endpoints");
-
- if (isJSEEndpoint == false)
- {
- String transportGuarantee = anWebContext.transportGuarantee();
- sepMetaData.setTransportGuarantee(transportGuarantee);
- }
- }
-
- // secure wsdl access
- sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess());
-
- // virtual hosts
- String[] virtualHosts = anWebContext.virtualHosts();
- if (virtualHosts != null & virtualHosts.length > 0)
- {
- sepMetaData.setVirtualHosts(virtualHosts);
- }
-
- }
-}
17 years, 2 months
- 1
- 0
JBossWS SVN: r2512 - in trunk: integration-jboss42/src and 20 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-03 10:24:16 -0500 (Sat, 03 Mar 2007)
New Revision: 2512
Added:
trunk/integration-jboss42/src/java/
trunk/integration-jboss42/src/java/org/
trunk/integration-jboss42/src/resources/
trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/
trunk/integration-jboss42/src/resources/jbossws.beans/
trunk/integration-jboss42/src/resources/jbossws.sar/
trunk/integration-jboss42/src/resources/jbossws.war/
trunk/integration-jboss50/src/java/
trunk/integration-jboss50/src/java/org/
trunk/integration-jboss50/src/resources/
trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/
trunk/integration-jboss50/src/resources/jbossws.deployer/
trunk/integration-jboss50/src/resources/jbossws.war/
trunk/integration-tomcat/src/java/
trunk/integration-tomcat/src/java/org/
trunk/integration-tomcat/src/resources/
trunk/integration-tomcat/src/resources/jbossws.war/
trunk/integration-tomcat/src/resources/log4j.xml
trunk/integration-tomcat/src/resources/tomcat-users.xml
trunk/jbossws-core/src/java/
trunk/jbossws-core/src/java/javax/
trunk/jbossws-core/src/java/org/
trunk/jbossws-core/src/resources/
trunk/jbossws-core/src/resources/dtd/
trunk/jbossws-core/src/resources/jboss-jaxws.jar/
trunk/jbossws-core/src/resources/jboss-saaj.jar/
trunk/jbossws-core/src/resources/jbossws.sar/
trunk/jbossws-core/src/resources/jbossws.war/
trunk/jbossws-core/src/resources/samples/
trunk/jbossws-core/src/resources/schema/
trunk/jbossws-tests/src/README_XERCES
trunk/jbossws-tests/src/etc/
trunk/jbossws-tests/src/etc/jndi.properties
trunk/jbossws-tests/src/etc/log4j.xml
trunk/jbossws-tests/src/etc/tst.policy
trunk/jbossws-tests/src/java/
trunk/jbossws-tests/src/java/org/
trunk/jbossws-tests/src/resources/
trunk/jbossws-tests/src/resources/benchmark/
trunk/jbossws-tests/src/resources/common/
trunk/jbossws-tests/src/resources/interop/
trunk/jbossws-tests/src/resources/jaxrpc/
trunk/jbossws-tests/src/resources/jaxws/
trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt
trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt
trunk/jbossws-tests/src/resources/tools/
trunk/jbossws-tests/src/tools-exception-list.txt
Removed:
trunk/integration-jboss42/src/java/org/
trunk/integration-jboss42/src/main/
trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar/
trunk/integration-jboss42/src/resources/jbossws.beans/
trunk/integration-jboss42/src/resources/jbossws.sar/
trunk/integration-jboss42/src/resources/jbossws.war/
trunk/integration-jboss50/src/java/org/
trunk/integration-jboss50/src/main/
trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar/
trunk/integration-jboss50/src/resources/jbossws.deployer/
trunk/integration-jboss50/src/resources/jbossws.war/
trunk/integration-tomcat/src/java/org/
trunk/integration-tomcat/src/main/
trunk/integration-tomcat/src/resources/jbossws.war/
trunk/integration-tomcat/src/resources/log4j.xml
trunk/integration-tomcat/src/resources/tomcat-users.xml
trunk/jbossws-core/src/java/javax/
trunk/jbossws-core/src/java/org/
trunk/jbossws-core/src/main/
trunk/jbossws-core/src/resources/dtd/
trunk/jbossws-core/src/resources/jboss-jaxws.jar/
trunk/jbossws-core/src/resources/jboss-saaj.jar/
trunk/jbossws-core/src/resources/jbossws.sar/
trunk/jbossws-core/src/resources/jbossws.war/
trunk/jbossws-core/src/resources/samples/
trunk/jbossws-core/src/resources/schema/
trunk/jbossws-tests/src/etc/jndi.properties
trunk/jbossws-tests/src/etc/log4j.xml
trunk/jbossws-tests/src/etc/tst.policy
trunk/jbossws-tests/src/java/org/
trunk/jbossws-tests/src/main/
trunk/jbossws-tests/src/resources/benchmark/
trunk/jbossws-tests/src/resources/common/
trunk/jbossws-tests/src/resources/interop/
trunk/jbossws-tests/src/resources/jaxrpc/
trunk/jbossws-tests/src/resources/jaxws/
trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt
trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt
trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt
trunk/jbossws-tests/src/resources/tools/
Modified:
trunk/integration-jboss42/.classpath
trunk/integration-jboss42/build.xml
trunk/integration-jboss50/.classpath
trunk/integration-jboss50/build.xml
trunk/integration-tomcat/.classpath
trunk/integration-tomcat/build.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/resources/samples/build.xml
trunk/jbossws-tests/.classpath
trunk/jbossws-tests/build.xml
Log:
Remove redundant directory 'main'
Modified: trunk/integration-jboss42/.classpath
===================================================================
--- trunk/integration-jboss42/.classpath 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/integration-jboss42/.classpath 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/integration-jboss42/build.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -17,7 +17,7 @@
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/>
+ <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/>
<property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/>
<property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/>
<property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/>
Copied: trunk/integration-jboss42/src/java (from rev 2509, trunk/integration-jboss42/src/main/java)
Copied: trunk/integration-jboss42/src/java/org (from rev 2510, trunk/integration-jboss42/src/main/java/org)
Copied: trunk/integration-jboss42/src/resources (from rev 2509, trunk/integration-jboss42/src/main/resources)
Copied: trunk/integration-jboss42/src/resources/jbossws-jboss42-integration.jar (from rev 2510, trunk/integration-jboss42/src/main/resources/jbossws-jboss42-integration.jar)
Copied: trunk/integration-jboss42/src/resources/jbossws.beans (from rev 2510, trunk/integration-jboss42/src/main/resources/jbossws.beans)
Copied: trunk/integration-jboss42/src/resources/jbossws.sar (from rev 2510, trunk/integration-jboss42/src/main/resources/jbossws.sar)
Copied: trunk/integration-jboss42/src/resources/jbossws.war (from rev 2510, trunk/integration-jboss42/src/main/resources/jbossws.war)
Modified: trunk/integration-jboss50/.classpath
===================================================================
--- trunk/integration-jboss50/.classpath 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/integration-jboss50/.classpath 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar" sourcepath="/build/thirdparty/jboss-vfs-sources.jar"/>
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/integration-jboss50/build.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -17,7 +17,7 @@
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src/main"/>
+ <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src"/>
<property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/>
<property name="jboss50.resources.dir" value="${jboss50.src.dir}/resources"/>
<property name="jboss50.output.dir" value="${integration.jboss50.dir}/output"/>
Copied: trunk/integration-jboss50/src/java (from rev 2509, trunk/integration-jboss50/src/main/java)
Copied: trunk/integration-jboss50/src/java/org (from rev 2510, trunk/integration-jboss50/src/main/java/org)
Copied: trunk/integration-jboss50/src/resources (from rev 2509, trunk/integration-jboss50/src/main/resources)
Copied: trunk/integration-jboss50/src/resources/jbossws-jboss50-integration.jar (from rev 2510, trunk/integration-jboss50/src/main/resources/jbossws-jboss50-integration.jar)
Copied: trunk/integration-jboss50/src/resources/jbossws.deployer (from rev 2510, trunk/integration-jboss50/src/main/resources/jbossws.deployer)
Copied: trunk/integration-jboss50/src/resources/jbossws.war (from rev 2510, trunk/integration-jboss50/src/main/resources/jbossws.war)
Modified: trunk/integration-tomcat/.classpath
===================================================================
--- trunk/integration-tomcat/.classpath 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/integration-tomcat/.classpath 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/integration-tomcat/build.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -17,7 +17,7 @@
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src/main"/>
+ <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src"/>
<property name="tomcat.java.dir" value="${tomcat.src.dir}/java"/>
<property name="tomcat.resources.dir" value="${tomcat.src.dir}/resources"/>
<property name="tomcat.output.dir" value="${integration.tomcat.dir}/output"/>
Copied: trunk/integration-tomcat/src/java (from rev 2509, trunk/integration-tomcat/src/main/java)
Copied: trunk/integration-tomcat/src/java/org (from rev 2510, trunk/integration-tomcat/src/main/java/org)
Copied: trunk/integration-tomcat/src/resources (from rev 2509, trunk/integration-tomcat/src/main/resources)
Copied: trunk/integration-tomcat/src/resources/jbossws.war (from rev 2510, trunk/integration-tomcat/src/main/resources/jbossws.war)
Deleted: trunk/integration-tomcat/src/resources/log4j.xml
===================================================================
--- trunk/integration-tomcat/src/main/resources/log4j.xml 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-tomcat/src/resources/log4j.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ -->
-
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${catalina.home}/logs/jbossws.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ws">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.apache.catalina">
- <priority value="INFO"/>
- </category>
-
- <category name="org.apache.commons">
- <priority value="INFO"/>
- </category>
-
- <category name="org.apache.jasper">
- <priority value="INFO"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <!-- Enable SOAP message tracing
- <category name="jbossws.SOAPMessage">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: trunk/integration-tomcat/src/resources/log4j.xml (from rev 2510, trunk/integration-tomcat/src/main/resources/log4j.xml)
===================================================================
--- trunk/integration-tomcat/src/resources/log4j.xml (rev 0)
+++ trunk/integration-tomcat/src/resources/log4j.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id:log4j.xml 1492 2006-11-21 19:49:34Z thomas.diesler(a)jboss.com $ -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${catalina.home}/logs/jbossws.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.apache.catalina">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.commons">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.jasper">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Enable SOAP message tracing
+ <category name="jbossws.SOAPMessage">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Deleted: trunk/integration-tomcat/src/resources/tomcat-users.xml
===================================================================
--- trunk/integration-tomcat/src/main/resources/tomcat-users.xml 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-tomcat/src/resources/tomcat-users.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<tomcat-users>
- <!-- Security realm for jbossws sample tests -->
- <role rolename="friend"/>
- <user username="kermit" password="thefrog" roles="friend"/>
-
- <!-- Security realm for jbossws sample deployment -->
- <role rolename="manager"/>
- <user username="manager" password="manager" roles="manager"/>
-</tomcat-users>
Copied: trunk/integration-tomcat/src/resources/tomcat-users.xml (from rev 2510, trunk/integration-tomcat/src/main/resources/tomcat-users.xml)
===================================================================
--- trunk/integration-tomcat/src/resources/tomcat-users.xml (rev 0)
+++ trunk/integration-tomcat/src/resources/tomcat-users.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+ <!-- Security realm for jbossws sample tests -->
+ <role rolename="friend"/>
+ <user username="kermit" password="thefrog" roles="friend"/>
+
+ <!-- Security realm for jbossws sample deployment -->
+ <role rolename="manager"/>
+ <user username="manager" password="manager" roles="manager"/>
+</tomcat-users>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/jbossws-core/.classpath 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/jbossws-core/build.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -16,7 +16,7 @@
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
- <property name="core.src.dir" value="${core.dir}/src/main"/>
+ <property name="core.src.dir" value="${core.dir}/src"/>
<property name="core.java.dir" value="${core.src.dir}/java"/>
<property name="core.resources.dir" value="${core.src.dir}/resources"/>
<property name="core.samples.dir" value="${core.resources.dir}/samples"/>
@@ -55,10 +55,10 @@
<classpath refid="core.classpath"/>
</javac>
- <!-- Compile core classes with jdk1.4 -->
+ <!-- Compile core classes with jdk1.5 -->
<mkdir dir="${core.output.classes.dir}"/>
<javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="javax/annotation/**"/>
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
Copied: trunk/jbossws-core/src/java (from rev 2509, trunk/jbossws-core/src/main/java)
Copied: trunk/jbossws-core/src/java/javax (from rev 2510, trunk/jbossws-core/src/main/java/javax)
Copied: trunk/jbossws-core/src/java/org (from rev 2510, trunk/jbossws-core/src/main/java/org)
Copied: trunk/jbossws-core/src/resources (from rev 2509, trunk/jbossws-core/src/main/resources)
Copied: trunk/jbossws-core/src/resources/dtd (from rev 2510, trunk/jbossws-core/src/main/resources/dtd)
Copied: trunk/jbossws-core/src/resources/jboss-jaxws.jar (from rev 2510, trunk/jbossws-core/src/main/resources/jboss-jaxws.jar)
Copied: trunk/jbossws-core/src/resources/jboss-saaj.jar (from rev 2510, trunk/jbossws-core/src/main/resources/jboss-saaj.jar)
Copied: trunk/jbossws-core/src/resources/jbossws.sar (from rev 2510, trunk/jbossws-core/src/main/resources/jbossws.sar)
Copied: trunk/jbossws-core/src/resources/jbossws.war (from rev 2510, trunk/jbossws-core/src/main/resources/jbossws.war)
Copied: trunk/jbossws-core/src/resources/samples (from rev 2510, trunk/jbossws-core/src/main/resources/samples)
Modified: trunk/jbossws-core/src/resources/samples/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-03-03 11:53:17 UTC (rev 2510)
+++ trunk/jbossws-core/src/resources/samples/build.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -16,10 +16,10 @@
<property file="${basedir}/version.properties"/>
<property name="tests.dir" value="${basedir}"/>
- <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
+ <property name="tests.etc.dir" value="${tests.dir}/src/etc"/>
<property name="tests.lib.dir" value="${tests.dir}/lib"/>
- <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/resources"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
<property name="thirdparty.dir" value="${basedir}/thirdparty"/>
Copied: trunk/jbossws-core/src/resources/schema (from rev 2510, trunk/jbossws-core/src/main/resources/schema)
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/jbossws-tests/.classpath 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/jbws718/" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="output/wsconsume/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="output/wstools/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/build"/>
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-03-03 15:18:14 UTC (rev 2511)
+++ trunk/jbossws-tests/build.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -25,9 +25,9 @@
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
- <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
- <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.etc.dir" value="${tests.dir}/src/etc"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/resources"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
<!-- ================================================================== -->
Copied: trunk/jbossws-tests/src/README_XERCES (from rev 2509, trunk/jbossws-tests/src/main/README_XERCES)
===================================================================
--- trunk/jbossws-tests/src/README_XERCES (rev 0)
+++ trunk/jbossws-tests/src/README_XERCES 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,76 @@
+This is a xerces bug. The problem is that the latest version of ant only bundles 2.6.2, you need at least 2.7.0 for this not to happen.
+So all you need to do is update your version of ant. I actually use the one in jboss-head/tools, although you have to drop log4j.jar
+in jboss-head/tools/lib.
+
+-Jason
+
+> -----Original Message-----
+> From: Heiko Braun
+> Sent: Friday, July 07, 2006 5:46 AM
+> To: Jason T. Greene
+> Cc: Dev - JBossWS
+> Subject: build failure
+>
+> Jason,
+>
+> the build fails due to your latest tools additions and unfortunately I
+> am missing "the hitchhikers guide through wstools" in order to
+> translate this error into something useful:
+>
+> generate-sources:
+> [move] Moving 2 files to C:\dev\prj\jbossws\branches\jbossws-
+> 1.0\output\tests\wstools\java
+> [wstools] java.lang.NullPointerException
+> [wstools] at java.lang.System.arraycopy(Native Method)
+> [wstools] at
+> org.apache.xerces.impl.xs.XSModelImpl.getAnnotations(Unknown Source)
+> [wstools] at
+> org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils.copyXSModel(WSSchem
+> aUti
+> ls.java:737)
+> [wstools] at
+> org.jboss.ws.tools.JavaToXSD.parseSchema(JavaToXSD.java:201)
+> [wstools] at
+> org.jboss.ws.metadata.wsdl.WSDL11Reader.processTypes(WSDL11Reader.java
+> :227
+> )
+> [wstools] at
+> org.jboss.ws.metadata.wsdl.WSDL11Reader.processDefinition(WSDL11Reader
+> .jav
+> a:118)
+> [wstools] at
+> org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory.parse(WSDLDefinition
+> sFac
+> tory.java:145)
+> [wstools] at
+> org.jboss.ws.tools.WSDLToJava.convertWSDL2Java(WSDLToJava.java:121)
+> [wstools] at
+> org.jboss.ws.tools.helpers.ToolsHelper.handleWSDLToJavaGeneration(Tool
+> sHel
+> per.java:323)
+> [wstools] at org.jboss.ws.tools.WSTools.process(WSTools.java:138)
+> [wstools] at org.jboss.ws.tools.WSTools.generate(WSTools.java:120)
+> [wstools] at
+> org.jboss.ws.tools.ant.wstools.execute(wstools.java:103)
+> [wstools] at
+> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:275)
+> [wstools] at org.apache.tools.ant.Task.perform(Task.java:364)
+> [wstools] at org.apache.tools.ant.Target.execute(Target.java:341)
+> [wstools] at
+> org.apache.tools.ant.Target.performTasks(Target.java:369)
+> [wstools] at
+> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1216)
+> [wstools] at
+> org.apache.tools.ant.Project.executeTarget(Project.java:1185)
+> [wstools] at
+> org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExec
+> utor
+> .java:40)
+> [wstools] at
+> org.apache.tools.ant.Project.executeTargets(Project.java:1068)
+> [wstools] at org.apache.tools.ant.Main.runBuild(Main.java:668)
+> [wstools] at org.apache.tools.ant.Main.startAnt(Main.java:187)
+> [wstools] at
+> org.apache.tools.ant.launch.Launcher.run(Launcher.java:246)
+> [wstools] at
+> org.apache.tools.ant.launch.Launcher.main(Launcher.java:67)
\ No newline at end of file
Copied: trunk/jbossws-tests/src/etc (from rev 2509, trunk/jbossws-tests/src/main/etc)
Deleted: trunk/jbossws-tests/src/etc/jndi.properties
===================================================================
--- trunk/jbossws-tests/src/main/etc/jndi.properties 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/etc/jndi.properties 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Copied: trunk/jbossws-tests/src/etc/jndi.properties (from rev 2510, trunk/jbossws-tests/src/main/etc/jndi.properties)
===================================================================
--- trunk/jbossws-tests/src/etc/jndi.properties (rev 0)
+++ trunk/jbossws-tests/src/etc/jndi.properties 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/etc/log4j.xml
===================================================================
--- trunk/jbossws-tests/src/main/etc/log4j.xml 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/etc/log4j.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${build.testlog}/test.log"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="INFO"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ws">
- <priority value="DEBUG"/>
- </category>
-
- <category name="org.jboss.remoting">
- <priority value="INFO"/>
- </category>
-
- <!-- Apache security is verbose -->
- <category name="org.apache.xml.security">
- <priority value="INFO"/>
- </category>
-
- <!-- Enable SOAP message tracing -->
- <category name="jbossws.SOAPMessage">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
-
- <!--
- <category name="org.jboss.xb">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
-<!--
- <appender-ref ref="CONSOLE"/>
--->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: trunk/jbossws-tests/src/etc/log4j.xml (from rev 2510, trunk/jbossws-tests/src/main/etc/log4j.xml)
===================================================================
--- trunk/jbossws-tests/src/etc/log4j.xml (rev 0)
+++ trunk/jbossws-tests/src/etc/log4j.xml 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${build.testlog}/test.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="INFO"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.ws">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Apache security is verbose -->
+ <category name="org.apache.xml.security">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Enable SOAP message tracing -->
+ <category name="jbossws.SOAPMessage">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <!--
+ <category name="org.jboss.xb">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+<!--
+ <appender-ref ref="CONSOLE"/>
+-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Deleted: trunk/jbossws-tests/src/etc/tst.policy
===================================================================
--- trunk/jbossws-tests/src/main/etc/tst.policy 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/etc/tst.policy 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,4 +0,0 @@
-grant {
- permission java.security.AllPermission;
-};
-
Copied: trunk/jbossws-tests/src/etc/tst.policy (from rev 2510, trunk/jbossws-tests/src/main/etc/tst.policy)
===================================================================
--- trunk/jbossws-tests/src/etc/tst.policy (rev 0)
+++ trunk/jbossws-tests/src/etc/tst.policy 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Copied: trunk/jbossws-tests/src/java (from rev 2509, trunk/jbossws-tests/src/main/java)
Copied: trunk/jbossws-tests/src/java/org (from rev 2510, trunk/jbossws-tests/src/main/java/org)
Copied: trunk/jbossws-tests/src/resources (from rev 2509, trunk/jbossws-tests/src/main/resources)
Copied: trunk/jbossws-tests/src/resources/benchmark (from rev 2510, trunk/jbossws-tests/src/main/resources/benchmark)
Copied: trunk/jbossws-tests/src/resources/common (from rev 2510, trunk/jbossws-tests/src/main/resources/common)
Copied: trunk/jbossws-tests/src/resources/interop (from rev 2510, trunk/jbossws-tests/src/main/resources/interop)
Copied: trunk/jbossws-tests/src/resources/jaxrpc (from rev 2510, trunk/jbossws-tests/src/main/resources/jaxrpc)
Copied: trunk/jbossws-tests/src/resources/jaxws (from rev 2510, trunk/jbossws-tests/src/main/resources/jaxws)
Deleted: trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,9 +0,0 @@
-# Always excludes
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Copied: trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt (from rev 2510, trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,9 @@
+# Always excludes
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,18 +0,0 @@
-# Always excludes
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/eardeployment/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/jbws981/**
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/samples/xop/**
-
-
Copied: trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt (from rev 2510, trunk/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,18 @@
+# Always excludes
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/eardeployment/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/jbws981/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
+
Deleted: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,8 +0,0 @@
-# Always excludes
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/**
Copied: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt (from rev 2510, trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,8 @@
+# Always excludes
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,17 +0,0 @@
-# Always excludes
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/eardeployment/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/jbws981/**
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/samples/xop/**
-
Copied: trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt (from rev 2510, trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,17 @@
+# Always excludes
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/eardeployment/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/jbws981/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/samples/xop/**
+
Deleted: trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,19 +0,0 @@
-# Always excludes
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# Fix before JBoss50 goes final
-org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
-org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
-org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
-org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
-org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.*
-org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
-org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
-org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
-org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
-org/jboss/test/ws/jaxrpc/wsdlpublish/**
-
Copied: trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt (from rev 2510, trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,19 @@
+# Always excludes
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# Fix before JBoss50 goes final
+org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
+org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
+org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
+org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
+org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.*
+org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
+org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
+org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
+org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
+
Deleted: trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt
===================================================================
--- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -1,26 +0,0 @@
-# Always excludes
-org/jboss/test/ws/interop/**
-org/jboss/test/ws/benchmark/**
-
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxrpc/jbws1011/**
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.*
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.*
-org/jboss/test/ws/jaxws/samples/jsr181ejb/**
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# JBoss excludes
-org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
-org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-org/jboss/test/ws/jaxws/samples/jaxr/**
-
-# TODO: Why are these excluded
-# [JBWS-1471] - Remove unwanted tomcat excludes
-org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
-org/jboss/test/ws/jaxws/samples/wseventing/**
Copied: trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt (from rev 2510, trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt)
===================================================================
--- trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt (rev 0)
+++ trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,26 @@
+# Always excludes
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxrpc/jbws1011/**
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.*
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/**
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# JBoss excludes
+org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
+org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+org/jboss/test/ws/jaxws/samples/jaxr/**
+
+# TODO: Why are these excluded
+# [JBWS-1471] - Remove unwanted tomcat excludes
+org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.*
+org/jboss/test/ws/jaxws/samples/wseventing/**
Copied: trunk/jbossws-tests/src/resources/tools (from rev 2510, trunk/jbossws-tests/src/main/resources/tools)
Copied: trunk/jbossws-tests/src/tools-exception-list.txt (from rev 2509, trunk/jbossws-tests/src/main/tools-exception-list.txt)
===================================================================
--- trunk/jbossws-tests/src/tools-exception-list.txt (rev 0)
+++ trunk/jbossws-tests/src/tools-exception-list.txt 2007-03-03 15:24:16 UTC (rev 2512)
@@ -0,0 +1,30 @@
+webservice/test
+---------------
+addressing - no support for WSDL->Java doc/literal unwrapping
+anonymous - n/a for tools
+config - n/a for tools
+encoded - not support by tools
+eventing - customized
+interop - n/a
+jbws434 - incomplete support for WSDL->java wildcards
+jsr181 - no support for WSDL->Java doc/literal unwrapping
+tools - n/a
+wsdl11 - n/a
+wsdlficture - n/a
+
+testsuite
+---------
+attachment - no support for attachments
+attachmentstepbystep - no support for attachments
+encstyle - not supported
+header - WSDL->Java headers not supported
+jbws484 - WSDL->Java doc/literal unwrapping
+jbws637 - WSDL->Java doc/literal unwrapping
+jbws663 - WSDL->Java headers not supported
+jbws718 - WSDL->Java no support for simple types, xs:choice
+jbws720 - WSDL->Java no support for wildcards, unwrapping, xml attributes, xml:lang
+jbws751 - WSDL->Java no support for attributes
+jbws775 - WSDL->Java no support for attributes
+marshalltest-rpcenc - SOAP encoding not supported
+wsdlimport - n/a
+wsrp - shouldn't be in testsuite
17 years, 2 months
- 1
- 0
JBossWS SVN: r2511 - in trunk/integration-jboss40: src and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-03 10:18:14 -0500 (Sat, 03 Mar 2007)
New Revision: 2511
Added:
trunk/integration-jboss40/src/java/
trunk/integration-jboss40/src/java/org/
trunk/integration-jboss40/src/resources/
trunk/integration-jboss40/src/resources/jbossws.beans/
trunk/integration-jboss40/src/resources/jbossws.sar/
Removed:
trunk/integration-jboss40/src/java/org/
trunk/integration-jboss40/src/main/
trunk/integration-jboss40/src/resources/jbossws.beans/
trunk/integration-jboss40/src/resources/jbossws.sar/
Modified:
trunk/integration-jboss40/.classpath
trunk/integration-jboss40/build.xml
Log:
Remove redundant directory 'main'
Modified: trunk/integration-jboss40/.classpath
===================================================================
--- trunk/integration-jboss40/.classpath 2007-03-03 11:53:17 UTC (rev 2510)
+++ trunk/integration-jboss40/.classpath 2007-03-03 15:18:14 UTC (rev 2511)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-03-03 11:53:17 UTC (rev 2510)
+++ trunk/integration-jboss40/build.xml 2007-03-03 15:18:14 UTC (rev 2511)
@@ -19,7 +19,7 @@
<import file="${basedir}/../integration-jboss42/build.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src/main"/>
+ <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src"/>
<property name="jboss40.java.dir" value="${jboss40.src.dir}/java"/>
<property name="jboss40.resources.dir" value="${jboss40.src.dir}/resources"/>
<property name="jboss40.output.dir" value="${integration.jboss40.dir}/output"/>
@@ -27,7 +27,7 @@
<property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/>
<property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/>
- <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/>
+ <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/>
<property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/>
<property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/>
<property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/>
@@ -207,7 +207,7 @@
<fileset dir="${jboss40.output.classes14.dir}">
<include name="org/jboss/ws/**"/>
</fileset>
- <fileset dir="${core.dir}/src/main/resources">
+ <fileset dir="${core.dir}/src/resources">
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
Copied: trunk/integration-jboss40/src/java (from rev 2509, trunk/integration-jboss40/src/main/java)
Copied: trunk/integration-jboss40/src/java/org (from rev 2510, trunk/integration-jboss40/src/main/java/org)
Copied: trunk/integration-jboss40/src/resources (from rev 2509, trunk/integration-jboss40/src/main/resources)
Copied: trunk/integration-jboss40/src/resources/jbossws.beans (from rev 2510, trunk/integration-jboss40/src/main/resources/jbossws.beans)
Copied: trunk/integration-jboss40/src/resources/jbossws.sar (from rev 2510, trunk/integration-jboss40/src/main/resources/jbossws.sar)
17 years, 2 months
- 1
- 0
JBossWS SVN: r2510 - in trunk: integration-jboss40 and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-03 06:53:17 -0500 (Sat, 03 Mar 2007)
New Revision: 2510
Added:
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdaptor.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21MBean.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3MBean.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSEMBean.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSE.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSEMBean.java
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeploymentInfoAdaptor.java
Modified:
trunk/build/ant-import/build-thirdparty.xml
trunk/integration-jboss40/.classpath
trunk/integration-jboss40/build.xml
trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml
Log:
[JBWS-1558] Add support for <secure-wsdl-access> in <port-component>
Modified: trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- trunk/build/ant-import/build-thirdparty.xml 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/build/ant-import/build-thirdparty.xml 2007-03-03 11:53:17 UTC (rev 2510)
@@ -151,7 +151,7 @@
<path refid="core.classpath"/>
</path>
- <!-- The compile classpath for jboss42 integration -->
+ <!-- The compile classpath for tomcat integration -->
<path id="tomcat.integration.classpath">
<path refid="core.classpath"/>
</path>
Modified: trunk/integration-jboss40/.classpath
===================================================================
--- trunk/integration-jboss40/.classpath 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-jboss40/.classpath 2007-03-03 11:53:17 UTC (rev 2510)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/activation.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/commons-logging.jar"/>
@@ -31,5 +30,6 @@
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration-jboss40/build.xml
===================================================================
--- trunk/integration-jboss40/build.xml 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-jboss40/build.xml 2007-03-03 11:53:17 UTC (rev 2510)
@@ -57,17 +57,12 @@
<!-- Compile integration java sources -->
<target name="jboss40-compile-classes" depends="jboss40-init,core-compile">
<mkdir dir="${jboss40.output.classes.dir}"/>
- <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src location="${jboss42.java.dir}"/>
<src location="${jboss40.java.dir}"/>
<include name="org/jboss/ws/integration/jboss40/**"/>
- <include name="org/jboss/ws/integration/jboss42/**"/>
- <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
- <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
- <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
- <exclude name="org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java"/>
- <exclude name="org/jboss/ws/integration/jboss42/ServiceRefHandler.java"/>
+ <exclude name="org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java"/>
<classpath refid="jboss40.integration.classpath"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath path="${core.output.classes.dir}"/>
@@ -75,13 +70,11 @@
</target>
<target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile,jboss40-check-ejb3-classes" if="jboss40.ejb3.available">
<mkdir dir="${jboss40.output.classes.dir}"/>
- <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src location="${jboss42.java.dir}"/>
<src location="${jboss40.java.dir}"/>
- <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
- <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
- <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
+ <include name="org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java"/>
<classpath refid="jboss40.integration.classpath"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath path="${core.output.classes.dir}"/>
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdaptor.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdaptor.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,125 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EjbPortComponentMetaData;
+import org.jboss.metadata.MessageDrivenMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class ApplicationMetaDataAdaptor
+{
+ public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(ApplicationMetaData apmd)
+ {
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(umd, apmd);
+ umd.setConfigName(apmd.getConfigName());
+ umd.setConfigFile(apmd.getConfigFile());
+ umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
+ umd.setSecurityDomain(apmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
+ return umd;
+ }
+
+ private static PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
+ {
+ return new PublishLocationAdapter ()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return apmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
+ {
+ List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ Iterator it = metaData.getEnterpriseBeans();
+ while (it.hasNext())
+ {
+ BeanMetaData bmd = (BeanMetaData)it.next();
+ UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
+ if (ubmd != null)
+ {
+ beans.add(ubmd);
+ }
+ }
+ umd.setEnterpriseBeans(beans);
+ }
+
+ private static UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd)
+ {
+ UnifiedBeanMetaData ubmd = null;
+ if (bmd instanceof SessionMetaData)
+ {
+ ubmd = new UnifiedSessionMetaData();
+ }
+ else if (bmd instanceof MessageDrivenMetaData)
+ {
+ ubmd = new UnifiedMessageDrivenMetaData();
+ ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(bmd.getEjbName());
+ ubmd.setEjbClass(bmd.getEjbClass());
+ ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
+ ubmd.setHome(bmd.getHome());
+ ubmd.setLocalHome(bmd.getLocalHome());
+ ubmd.setJndiName(bmd.getJndiName());
+ ubmd.setLocalJndiName(bmd.getLocalJndiName());
+
+ EjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ if (pcmd != null)
+ {
+ UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData();
+ upcmd.setPortComponentName(pcmd.getPortComponentName());
+ upcmd.setPortComponentURI(pcmd.getPortComponentURI());
+ upcmd.setAuthMethod(pcmd.getAuthMethod());
+ upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ ubmd.setPortComponent(upcmd);
+ }
+ }
+ return ubmd;
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdaptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,212 @@
+/*
+ * 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.jboss40;
+
+//$Id$
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.deployment.SubDeployerInterceptorSupport;
+import org.jboss.kernel.spi.registry.KernelRegistry;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.mx.server.Invocation;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.KernelLocator;
+import org.jboss.ws.core.server.ServiceEndpointDeployer;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+
+/**
+ * A deployer service that manages WS4EE compliant Web Services
+ *
+ * This service is called from the {@see org.jboss.ws.metadata.WebServiceInterceptor}
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author Dimitris.Andreadis(a)jboss.org
+ * @since 15-Jan-2005
+ */
+public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport
+{
+ // The main deployer
+ private MainDeployerMBean mainDeployer;
+
+ /** Create the deployer service
+ */
+ protected void createService() throws Exception
+ {
+ mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ super.attach();
+ }
+
+ /** Destroy the deployer service
+ */
+ protected void destroyService()
+ {
+ super.detach();
+ }
+
+ /** Overwrite to create the webservice
+ */
+ protected final Object create(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+ if (isWebserviceDeployment(di))
+ {
+ try
+ {
+ createServiceEndpoint(di);
+ }
+ catch (Exception ex)
+ {
+ destroyServiceEndpoint(di);
+ DeploymentException.rethrowAsDeploymentException("Cannot create service endpoint", ex);
+ }
+ }
+ return retn;
+ }
+
+ /** Overwrite to start the webservice
+ */
+ protected final Object start(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ Object retn = invokeNext(invocation);
+ try
+ {
+ startServiceEndpoint(di);
+ }
+ catch (Exception ex)
+ {
+ destroyServiceEndpoint(di);
+ DeploymentException.rethrowAsDeploymentException("Cannot start service endpoint", ex);
+ }
+ return retn;
+ }
+
+ /** Overwrite to stop the webservice
+ */
+ protected final Object stop(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ stopServiceEndpoint(di);
+ return invokeNext(invocation);
+ }
+
+ /** Overwrite to destroy the webservice
+ */
+ protected final Object destroy(Invocation invocation, DeploymentInfo di) throws Throwable
+ {
+ destroyServiceEndpoint(di);
+ return invokeNext(invocation);
+ }
+
+ protected void createServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ log.debug("create: " + di.url);
+ UnifiedDeploymentInfo udi = createUnifiedDeploymentInfo(di);
+ di.context.put(UnifiedDeploymentInfo.class.getName(), udi);
+ getServiceEndpointDeployer().create(udi);
+ }
+
+ protected void startServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di);
+ if (udi != null)
+ {
+ log.debug("start: " + di.url);
+
+ // late initialization of the web context loader
+ if (di.metaData instanceof WebMetaData)
+ {
+ ClassLoader classLoader = ((WebMetaData)di.metaData).getContextLoader();
+ udi.classLoader = classLoader;
+ }
+
+ getServiceEndpointDeployer().start(udi);
+ }
+ }
+
+ protected void stopServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di);
+ if (udi != null)
+ {
+ log.debug("stop: " + di.url);
+ getServiceEndpointDeployer().stop(udi);
+ }
+ }
+
+ protected void destroyServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di);
+ if (udi != null)
+ {
+ log.debug("destroy: " + di.url);
+ getServiceEndpointDeployer().destroy(udi);
+ }
+ }
+
+ protected ServiceEndpointDeployer getServiceEndpointDeployer()
+ {
+ KernelRegistry registry = KernelLocator.getKernel().getRegistry();
+ KernelRegistryEntry entry = registry.getEntry(ServiceEndpointDeployer.BEAN_NAME);
+ return (ServiceEndpointDeployer)entry.getTarget();
+ }
+
+ protected AbstractServiceEndpointPublisher getServiceEndpointPublisher()
+ {
+ KernelRegistry registry = KernelLocator.getKernel().getRegistry();
+ KernelRegistryEntry entry = registry.getEntry(AbstractServiceEndpointPublisher.BEAN_NAME);
+ return (AbstractServiceEndpointPublisher)entry.getTarget();
+ }
+
+ /** Return true if the deployment contains a web service endpoint
+ */
+ protected abstract boolean isWebserviceDeployment(DeploymentInfo di);
+
+ protected abstract UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception;
+
+ protected UnifiedDeploymentInfo getUnifiedDeploymentInfo(DeploymentInfo di)
+ {
+ return (UnifiedDeploymentInfo)di.context.get(UnifiedDeploymentInfo.class.getName());
+ }
+
+ /** Handle all webservice deployment exceptions.
+ * You can either simply logs the problem and keep the EJB/WAR module
+ * alive or undeploy properly.
+ */
+ protected void handleStartupException(DeploymentInfo di, Throwable th)
+ {
+ log.error("Cannot startup webservice for: " + di.shortName, th);
+ mainDeployer.undeploy(di);
+ }
+
+ /** Handle all webservice deployment exceptions.
+ *
+ * You can either simply logs the problem and keep the EJB/WAR module
+ * alive or undeploy properly.
+ */
+ protected void handleShutdownException(String moduleName, Throwable th)
+ {
+ log.error("Cannot shutdown webservice for: " + moduleName, th);
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,67 @@
+/*
+ * 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.jboss40;
+
+//$Id$
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * A deployer service that manages WS4EE compliant Web-Services for EJB Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 15-Jan-2005
+ */
+public abstract class DeployerInterceptorEJB extends DeployerInterceptor
+{
+ protected void createServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ super.createServiceEndpoint(di);
+
+ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di);
+ if (udi != null)
+ {
+ UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
+ udi.webappURL = generateWebDeployment(di, wsMetaData);
+ udi.context.put(DeploymentInfo.class.getName(), di);
+ getServiceEndpointPublisher().publishServiceEndpoint(udi);
+ }
+ }
+
+ protected abstract URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException;
+
+ protected void destroyServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ super.destroyServiceEndpoint(di);
+
+ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di);
+ if (udi != null)
+ {
+ getServiceEndpointPublisher().destroyServiceEndpoint(udi);
+ }
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,118 @@
+/*
+ * 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.jboss40;
+
+//$Id$
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Iterator;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.UnifiedVirtualFile;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.jboss42.ServiceEndpointGeneratorEJB21;
+import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
+import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 15-Jan-2005
+ */
+public class DeployerInterceptorEJB21 extends DeployerInterceptorEJB implements DeployerInterceptorEJB21MBean
+{
+ protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception
+ {
+ UnifiedVirtualFile vfsWebservices = getWebservicesFile(di);
+ UnifiedDeploymentInfo udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_EJB21, vfsWebservices);
+ DeploymentInfoAdaptor.buildDeploymentInfo(udi, di);
+ return udi;
+ }
+
+ /** Return true if the deployment is a web service endpoint
+ */
+ protected boolean isWebserviceDeployment(DeploymentInfo di)
+ {
+ ApplicationMetaData applMetaData = (ApplicationMetaData)di.metaData;
+ boolean isWebserviceDeployment = applMetaData.isWebServiceDeployment();
+
+ // Check if we have a webservices.xml descriptor
+ if (isWebserviceDeployment == false)
+ {
+ isWebserviceDeployment = getWebservicesFile(di) != null;
+ }
+
+ // Check if the ejb-jar contains annotated endpoints
+ if (isWebserviceDeployment == false)
+ {
+ try
+ {
+ Iterator itBeans = applMetaData.getEnterpriseBeans();
+ while (itBeans.hasNext() && isWebserviceDeployment == false)
+ {
+ BeanMetaData beanMetaData = (BeanMetaData)itBeans.next();
+ String ejbClassName = beanMetaData.getEjbClass();
+ Class ejbClass = di.annotationsCl.loadClass(ejbClassName);
+ if (ejbClass.isAnnotationPresent(javax.jws.WebService.class))
+ throw new UnsupportedOperationException("JAXWS not supported on EJB2.1 endpoints");
+ }
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw new WSException(e);
+ }
+ }
+
+ applMetaData.setWebServiceDeployment(isWebserviceDeployment);
+ return isWebserviceDeployment;
+ }
+
+ private UnifiedVirtualFile getWebservicesFile(DeploymentInfo di)
+ {
+ UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(di.localCl);
+ try
+ {
+ return vfsRoot.findChild("META-INF/webservices.xml");
+ }
+ catch (IOException e)
+ {
+ return null;
+ }
+ }
+
+ protected URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException
+ {
+ ServiceEndpointGeneratorEJB21 generator = new ServiceEndpointGeneratorEJB21();
+ return generator.generatWebDeployment(wsMetaData, di);
+ }
+
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21MBean.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21MBean.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21MBean.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.integration.jboss40;
+
+import javax.management.ObjectName;
+
+import org.jboss.deployment.SubDeployerInterceptorMBean;
+import org.jboss.ws.core.utils.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorEJB21MBean extends SubDeployerInterceptorMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21");
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB21MBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,130 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+
+import javax.jws.WebService;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.server.JAXWSDeployment;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.jboss42.ServiceEndpointGeneratorEJB3;
+import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2005
+ */
+public class DeployerInterceptorEJB3 extends DeployerInterceptorEJB implements DeployerInterceptorEJB3MBean
+{
+ protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception
+ {
+ UnifiedDeploymentInfo udi = new JAXWSDeployment(UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3);
+ DeploymentInfoAdaptor.buildDeploymentInfo(udi, di);
+
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject);
+
+ // The container objects below provide access to all of the ejb metadata
+ ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ for (Object container : ejb3Module.getContainers().values())
+ {
+ if (container instanceof StatelessContainer)
+ {
+ StatelessContainer slc = (StatelessContainer)container;
+ UnifiedBeanMetaData uslc = new UnifiedBeanMetaData();
+ uslc.setEjbName(slc.getEjbName());
+ uslc.setEjbClass(slc.getBeanClassName());
+ beans.add(uslc);
+ }
+ }
+
+ UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData();
+ appMetaData.setEnterpriseBeans(beans);
+ udi.metaData = appMetaData;
+
+ return udi;
+ }
+
+ /** Return true if the deployment is a web service endpoint
+ */
+ protected boolean isWebserviceDeployment(DeploymentInfo di)
+ {
+ boolean isWebserviceDeployment = false;
+
+ // Check if the ejb3 contains annotated endpoints
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(di.deployedObject);
+ for (Object manager : ejb3Module.getContainers().values())
+ {
+ if (manager instanceof StatelessContainer)
+ {
+ StatelessContainer container = (StatelessContainer)manager;
+ if (container.resolveAnnotation(WebService.class) != null)
+ {
+ isWebserviceDeployment = true;
+ break;
+ }
+ }
+ }
+
+ return isWebserviceDeployment;
+ }
+
+ private Ejb3ModuleMBean getEJB3Module(ObjectName objectName)
+ {
+ Ejb3ModuleMBean ejb3Module;
+ try
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server);
+ if (ejb3Module == null)
+ throw new WSException("Cannot obtain EJB3 module: " + objectName);
+
+ return ejb3Module;
+ }
+ catch (MBeanProxyCreationException ex)
+ {
+ throw new WSException("Cannot obtain proxy to EJB3 module");
+ }
+ }
+
+ protected URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException
+ {
+ return new ServiceEndpointGeneratorEJB3().generatWebDeployment(wsMetaData, di);
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3MBean.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3MBean.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3MBean.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.integration.jboss40;
+
+import javax.management.ObjectName;
+
+import org.jboss.deployment.SubDeployerInterceptorMBean;
+import org.jboss.ws.core.utils.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorEJB3MBean extends SubDeployerInterceptorMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3");
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorEJB3MBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,170 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.UnifiedVirtualFile;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.JAXWSDeployment;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
+import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+
+/**
+ * A deployer service that manages WS4EE compliant Web Services for WAR
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 15-Jan-2005
+ */
+public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean
+{
+ /** Return true if the deployment is a web service endpoint
+ */
+ protected boolean isWebserviceDeployment(DeploymentInfo di)
+ {
+ WebMetaData webMetaData = (WebMetaData)di.metaData;
+ boolean isWebserviceDeployment = webMetaData.isWebServiceDeployment();
+
+ // Check if we have a webservices.xml descriptor
+ if (isWebserviceDeployment == false)
+ {
+ if (getWebservicesFile(di) != null)
+ {
+ di.context.put("UnifiedDeploymentInfo.Type", UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE);
+ isWebserviceDeployment = true;
+ }
+ }
+
+ // Check if the web.xml contains annotated endpoint impl
+ if (isWebserviceDeployment == false)
+ {
+ Map servletClassMap = webMetaData.getServletClassMap();
+ Iterator<String> it = servletClassMap.values().iterator();
+ while (it.hasNext() && isWebserviceDeployment == false)
+ {
+ String servletClassName = it.next();
+ try
+ {
+ Class servletClass = di.annotationsCl.loadClass(servletClassName);
+ if (servletClass.isAnnotationPresent(WebService.class) || servletClass.isAnnotationPresent(WebServiceProvider.class))
+ {
+ di.context.put("UnifiedDeploymentInfo.Type", UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE);
+ isWebserviceDeployment = true;
+ }
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + servletClassName);
+ }
+ }
+ }
+
+ webMetaData.setWebServiceDeployment(isWebserviceDeployment);
+ return isWebserviceDeployment;
+ }
+
+ protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception
+ {
+ UnifiedDeploymentInfo udi;
+
+ DeploymentType type = (DeploymentType)di.context.get("UnifiedDeploymentInfo.Type");
+ if (type == UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE)
+ {
+ UnifiedVirtualFile vfsWebservices = getWebservicesFile(di);
+ udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE, vfsWebservices);
+ DeploymentInfoAdaptor.buildDeploymentInfo(udi, di);
+ }
+ else if (type == UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE)
+ {
+ udi = new JAXWSDeployment(UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE);
+ DeploymentInfoAdaptor.buildDeploymentInfo(udi, di);
+ }
+ else
+ {
+ throw new WSException("Unexpected type: " + type);
+ }
+
+ return udi;
+ }
+
+ /** Overwrite to create the webservice
+ *
+ * This implemantation modifies the servlet entries in web.xml
+ */
+ protected void createServiceEndpoint(DeploymentInfo di) throws Exception
+ {
+ super.createServiceEndpoint(di);
+ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(di);
+ if (udi != null)
+ {
+ AbstractServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
+ RewriteResults results = endpointPublisher.rewriteWebXml(udi);
+ updateServiceEndpointTargetBeans(udi, results);
+ }
+ }
+
+ private void updateServiceEndpointTargetBeans(UnifiedDeploymentInfo udi, RewriteResults results)
+ {
+ UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi);
+ Map<String, String> sepTargetMap = results.sepTargetMap;
+
+ for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
+ {
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ {
+ ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
+ String targetBean = sepTargetMap.get(sepMetaData.getLinkName());
+ sepMetaData.setServiceEndpointImplName(targetBean);
+ }
+ }
+ }
+
+ private UnifiedVirtualFile getWebservicesFile(DeploymentInfo di)
+ {
+ UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(di.localCl);
+ try
+ {
+ return vfsRoot.findChild("WEB-INF/webservices.xml");
+ }
+ catch (IOException e)
+ {
+ return null;
+ }
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSEMBean.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSEMBean.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSEMBean.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.integration.jboss40;
+
+import javax.management.ObjectName;
+
+import org.jboss.deployment.SubDeployerInterceptorMBean;
+import org.jboss.ws.core.utils.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface DeployerInterceptorJSEMBean extends SubDeployerInterceptorMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE");
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorJSEMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSE.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSE.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSE.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,132 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.deployment.SubDeployerSupport;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigLocator;
+import org.jboss.ws.core.utils.IOUtils;
+
+/**
+ * A deployer service that manages WS4EE compliant Web Services for
+ * nested POJO endpoints.
+ *
+ * The WebServiceDeployerJSE attaches itself as an deployment interceptor to
+ * the jboss.web:service=WebServer deployer. As a consequence, all *.war deployments
+ * that are picked up before the interceptor is installed are not treated as potential
+ * web service endpoint deployments.
+ *
+ * Nested POJO endpoints can be packaged in *.jse deployments that are then picked up by this
+ * deployer.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 03-Mar-2005
+ */
+public class DeployerInterceptorNestedJSE extends SubDeployerSupport implements DeployerInterceptorNestedJSEMBean
+{
+ private static final String NESTED_JSE_WAR_FILE = "org.jboss.ws.server.nested.jse";
+
+ // The MainDeployer
+ protected MainDeployerMBean mainDeployer;
+
+ public void setMainDeployer(MainDeployerMBean mainDeployer)
+ {
+ this.mainDeployer = mainDeployer;
+ }
+
+ public boolean accepts(DeploymentInfo sdi)
+ {
+ setSuffixes(new String[] { ".jse" });
+ return super.accepts(sdi);
+ }
+
+ /** Copy the *.jse to a *.war and deploy through the main deployer
+ */
+ public void create(DeploymentInfo di) throws DeploymentException
+ {
+ log.debug("create: " + di.url);
+
+ try
+ {
+ File jseFile = new File(di.localUrl.getFile());
+ if (jseFile.isFile() == false)
+ throw new DeploymentException("Expected a file: " + di.localUrl);
+
+ ServerConfig config = ServerConfigLocator.locate();
+ String warFileName = config.getServerTempDir().getCanonicalPath() + "/deploy/" + di.shortName;
+ warFileName = warFileName.substring(0, warFileName.length() - 4) + ".war";
+ File warFile = new File(warFileName);
+
+ FileOutputStream fos = new FileOutputStream(warFile);
+ FileInputStream fis = new FileInputStream(jseFile);
+ try
+ {
+ IOUtils.copyStream(fos, fis);
+ }
+ finally
+ {
+ fos.close();
+ fis.close();
+ }
+
+ mainDeployer.deploy(warFile.toURL());
+
+ // remember the war url that we deployed
+ di.context.put(NESTED_JSE_WAR_FILE, warFile);
+
+ super.create(di);
+ }
+ catch (IOException ex)
+ {
+ throw new DeploymentException("Failed to create: " + di.url, ex);
+ }
+ }
+
+ /** Undeploy the *.war through the main deployer
+ */
+ public void destroy(DeploymentInfo di) throws DeploymentException
+ {
+ log.debug("destroy: " + di.url);
+ try
+ {
+ File warFile = (File)di.context.get(NESTED_JSE_WAR_FILE);
+ mainDeployer.undeploy(warFile.toURL());
+ warFile.delete();
+
+ super.destroy(di);
+ }
+ catch (IOException ex)
+ {
+ throw new DeploymentException("Failed to destroy: " + di.url, ex);
+ }
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSEMBean.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSEMBean.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSEMBean.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,42 @@
+/*
+* 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.jboss40;
+
+// $Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.deployment.SubDeployerMBean;
+import org.jboss.ws.core.utils.ObjectNameFactory;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 03-Mar-2005
+ */
+public interface DeployerInterceptorNestedJSEMBean extends SubDeployerMBean
+{
+ //default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerNestedJSE");
+
+ void setMainDeployer(MainDeployerMBean mainDeployer);
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeployerInterceptorNestedJSEMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeploymentInfoAdaptor.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeploymentInfoAdaptor.java (rev 0)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeploymentInfoAdaptor.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -0,0 +1,91 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.jboss42.WebMetaDataAdaptor;
+import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter;
+
+/**
+ * Build container independent deployment info.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public class DeploymentInfoAdaptor
+{
+ public static UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) throws Exception
+ {
+ if (di.parent != null)
+ {
+ udi.parent = new UnifiedDeploymentInfo(null);
+ buildDeploymentInfo(udi.parent, di.parent);
+ }
+
+ udi.vfRoot = new ResourceLoaderAdapter(di.localCl);
+ udi.name = di.getCanonicalName();
+ udi.simpleName = di.shortName;
+ udi.url = getDeploymentURL(di);
+ udi.classLoader = di.annotationsCl;
+ udi.deployedObject = di.deployedObject;
+
+ buildMetaData(udi, di.metaData);
+
+ return udi;
+ }
+
+ private static URL getDeploymentURL(DeploymentInfo di) throws MalformedURLException
+ {
+ URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url);
+ if ("file".equals(deploymentURL.getProtocol()))
+ {
+ String path = deploymentURL.getPath();
+ if (new File(path).isFile())
+ {
+ deploymentURL = new URL("jar:file:" + path + "!/");
+ }
+ }
+ return deploymentURL;
+ }
+
+ private static void buildMetaData(UnifiedDeploymentInfo udi, Object metaData)
+ {
+ if (metaData instanceof WebMetaData)
+ {
+ udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData((WebMetaData)metaData);
+ udi.webappURL = udi.url;
+ }
+ else if (metaData instanceof ApplicationMetaData)
+ {
+ udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData((ApplicationMetaData)metaData);
+ }
+ }
+}
Property changes on: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/DeploymentInfoAdaptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-jboss40/src/main/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -39,7 +39,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.jboss42.DeploymentInfoAdaptor;
+import org.jboss.ws.integration.jboss40.DeploymentInfoAdaptor;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -117,6 +117,7 @@
upcmd.setPortComponentURI(pcmd.getPortComponentURI());
upcmd.setAuthMethod(pcmd.getAuthMethod());
upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
ubmd.setPortComponent(upcmd);
}
}
Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -166,6 +166,7 @@
upcmd.setPortComponentURI(pcmd.getPortComponentURI());
upcmd.setAuthMethod(pcmd.getAuthMethod());
upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
ubmd.setPortComponent(upcmd);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -172,6 +172,11 @@
String transportGuarantee = bpcMetaData.getTransportGuarantee();
sepMetaData.setTransportGuarantee(transportGuarantee);
}
+ if (bpcMetaData.getSecureWSDLAccess() != null)
+ {
+ Boolean secureWSDLAccess = bpcMetaData.getSecureWSDLAccess();
+ sepMetaData.setSecureWSDLAccess(secureWSDLAccess);
+ }
sepMetaData.setURLPattern(bpcMetaData.getURLPattern());
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -37,6 +37,7 @@
private String portComponentURI;
private String authMethod;
private String transportGuarantee;
+ private Boolean secureWSDLAccess;
public String getPortComponentName()
{
@@ -87,4 +88,14 @@
{
this.transportGuarantee = transportGuarantee;
}
+
+ public Boolean getSecureWSDLAccess()
+ {
+ return secureWSDLAccess;
+ }
+
+ public void setSecureWSDLAccess(Boolean secureWSDLAccess)
+ {
+ this.secureWSDLAccess = secureWSDLAccess;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -26,6 +26,7 @@
import javax.management.ObjectName;
import javax.xml.namespace.QName;
+import org.jboss.logging.Logger;
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
@@ -38,6 +39,8 @@
*/
public class ServerEndpointMetaData extends EndpointMetaData
{
+ protected static final Logger log = Logger.getLogger(ServerEndpointMetaData.class);
+
public static final String SEPID_DOMAIN = "jboss.ws";
public static final String SEPID_PROPERTY_CONTEXT = "context";
public static final String SEPID_PROPERTY_ENDPOINT = "endpoint";
@@ -59,7 +62,7 @@
// The optional transport guarantee
private String transportGuarantee;
// The optional secure wsdl access
- private boolean secureWSDLAccess = true;
+ private Boolean secureWSDLAccess;
// The bean that registers with the ServiceEndpointManager
private String managedEndpointBean = "org.jboss.ws.core.server.ServiceEndpoint";
@@ -160,12 +163,19 @@
this.transportGuarantee = transportGuarantee;
}
- public boolean isSecureWSDLAccess()
+ public Boolean isSecureWSDLAccess()
{
+ // For backward compatiblity we leave wsdl access for jaxrpc endpoints unprotected
+ if (secureWSDLAccess == null)
+ {
+ secureWSDLAccess = (getType() == Type.JAXWS);
+ log.debug("Using default for secure wsdl access: " + secureWSDLAccess);
+ }
+
return secureWSDLAccess;
}
- public void setSecureWSDLAccess(boolean secureWSDLAccess)
+ public void setSecureWSDLAccess(Boolean secureWSDLAccess)
{
this.secureWSDLAccess = secureWSDLAccess;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -73,6 +73,8 @@
// The HTTP context root
private String contextRoot;
+ // The optional secure wsdl access
+ private Boolean secureWSDLAccess;
/** Construct a new PortComponentMetaData for a given WebserviceDescriptionMetaData
*/
@@ -161,11 +163,16 @@
this.contextRoot = contextRoot;
}
- /**
- * Serialize as a String
- *
- * @return
- */
+ public Boolean getSecureWSDLAccess()
+ {
+ return secureWSDLAccess;
+ }
+
+ public void setSecureWSDLAccess(Boolean secureWSDLAccess)
+ {
+ this.secureWSDLAccess = secureWSDLAccess;
+ }
+
public String serialize()
{
StringBuilder builder = new StringBuilder("<port-component>");
@@ -175,17 +182,9 @@
builder.append("<service-endpoint-interface>").append(serviceEndpointInterface).append("</service-endpoint-interface>");
builder.append("<service-impl-bean>");
if (ejbLink != null)
- {
- builder.append("<ejb-link>");
- builder.append(ejbLink);
- builder.append("</ejb-link>");
- }
+ builder.append("<ejb-link>" + ejbLink + "</ejb-link>");
else
- {
- builder.append("<servlet-link>");
- builder.append(servletLink);
- builder.append("</servlet-link>");
- }
+ builder.append("<servlet-link>"+ servletLink + "</servlet-link>");
builder.append("</service-impl-bean>");
builder.append("</port-component>");
return builder.toString();
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-03-03 11:53:17 UTC (rev 2510)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxrpc.samples.secureejb;
+import java.net.URL;
import java.rmi.RemoteException;
import javax.naming.InitialContext;
@@ -34,6 +35,9 @@
import org.jboss.security.SimplePrincipal;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLException;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
/**
@@ -84,23 +88,19 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
- /** Test that the remote access to this bean is unchecked
- */
- public void testBasicSecuredSLSB() throws Exception
+ public void testRoleSecuredWSDLAccess() throws Exception
{
- InitialContext iniCtx = getInitialContext();
- OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
-
- OrganizationRemote bean = home.create();
- String info = bean.getContactInfo("mafia");
- assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/RoleSecured?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdl = factory.parse(wsdlURL);
+ assertNotNull("Expect unsecured wsdl access by default for jaxrpc", wsdl);
}
-
- public void testBasicSecuredServiceAccess() throws Exception
+
+ public void testRoleSecuredServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
- QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort");
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
+ QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort");
OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
try
@@ -121,11 +121,39 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
- public void testRoleSecuredServiceAccess() throws Exception
+ /** Test that the remote access to this bean is unchecked
+ */
+ public void testBasicSecuredSLSB() throws Exception
{
InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
- QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort");
+ OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
+
+ OrganizationRemote bean = home.create();
+ String info = bean.getContactInfo("mafia");
+ assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
+ }
+
+ public void testBasicSecuredWSDLAccess() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/BasicSecured?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ try
+ {
+ factory.parse(wsdlURL);
+ fail("Expect secured wsdl access");
+ }
+ catch (WSDLException ex)
+ {
+ String cause = ex.getCause().getMessage();
+ assertTrue("Server returned HTTP response code: 401", cause.startsWith("Server returned HTTP response code: 401"));
+ }
+ }
+
+ public void testBasicSecuredServiceAccess() throws Exception
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
+ QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort");
OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
try
@@ -146,6 +174,14 @@
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
+ public void testConfidentialSecuredWSDLAccess() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdl = factory.parse(wsdlURL);
+ assertNotNull("Expect unsecured wsdl access", wsdl);
+ }
+
public void testConfidentialServiceAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-03-02 14:41:35 UTC (rev 2509)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-03-03 11:53:17 UTC (rev 2510)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd">
<jboss>
@@ -15,6 +15,7 @@
<port-component-uri>/jaxrpc-samples-ejb/RoleSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
+ <!-- default secure-wsdl-access (false for jaxrpc) -->
</port-component>
</session>
<session>
@@ -25,6 +26,7 @@
<port-component-uri>/jaxrpc-samples-ejb/BasicSecured</port-component-uri>
<auth-method>BASIC</auth-method>
<transport-guarantee>NONE</transport-guarantee>
+ <secure-wsdl-access>true</secure-wsdl-access>
</port-component>
</session>
<session>
@@ -34,6 +36,7 @@
<port-component-name>ConfidentialSecured</port-component-name>
<port-component-uri>/jaxrpc-samples-ejb/ConfidentialSecured</port-component-uri>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <secure-wsdl-access>false</secure-wsdl-access>
</port-component>
</session>
</enterprise-beans>
17 years, 2 months
- 1
- 0