JBossWS SVN: r12003 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: metadata and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-15 11:54:24 -0400 (Thu, 15 Apr 2010)
New Revision: 12003
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
[JBWS-2999] Refactoring DDEnpoint creation to a dedicated builder and adding webservices.xml override checks
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-04-15 15:48:09 UTC (rev 12002)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-04-15 15:54:24 UTC (rev 12003)
@@ -26,20 +26,15 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.soap.MTOM;
-import javax.xml.ws.soap.SOAPBinding;
-
import org.jboss.logging.Logger;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
-import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
/**
* A deployer that locates or generates cxf.xml
@@ -160,34 +155,9 @@
private URL generateCXFConfigFromDeployment(Deployment dep)
{
// Generate the jbossws-cxf.xml descriptor
- DeploymentType depType = dep.getType();
-
- DDBeans dd = new DDBeans();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- String id = ep.getShortName();
- String address = ep.getAddress();
- String implementor = ep.getTargetBeanName();
+ MetadataBuilder builder = new MetadataBuilder();
+ DDBeans dd = builder.build(dep, invokerEJB3, invokerJSE);
- boolean mtomEnabled = isMtomEnabled(ep.getTargetBeanClass());
-
- DDEndpoint ddep = new DDEndpoint(id, address, implementor, mtomEnabled);
-
- if (depType == DeploymentType.JAXWS_EJB3)
- {
- ddep.setInvoker(invokerEJB3);
- }
-
- if (depType == DeploymentType.JAXWS_JSE)
- {
- ddep.setInvoker(invokerJSE);
- }
-
-
- log.info("Add " + ddep);
- dd.addEndpoint(ddep);
- }
-
URL cxfURL = dd.createFileURL();
log.info("JBossWS-CXF configuration generated: " + cxfURL);
@@ -218,19 +188,4 @@
contextParams.put(BusHolder.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm());
}
- private static boolean isMtomEnabled(Class<?> beanClass)
- {
- BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
- MTOM mtom = (MTOM)beanClass.getAnnotation(MTOM.class);
-
- boolean mtomEnabled = mtom != null;
- if (!mtomEnabled && bindingType != null)
- {
- String binding = bindingType.value();
- mtomEnabled = binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
- }
-
- return mtomEnabled;
- }
-
}
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-04-15 15:54:24 UTC (rev 12003)
@@ -0,0 +1,258 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.metadata;
+
+import java.util.Stack;
+import java.util.StringTokenizer;
+
+import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.soap.MTOM;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
+import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
+
+/**
+ * Builds the DDBeans metadata used for generating the jboss-cxf.xml deployment descriptor
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 15-Apr-2010
+ *
+ */
+public class MetadataBuilder
+{
+ private static final Logger log = Logger.getLogger(MetadataBuilder.class);
+
+ public MetadataBuilder()
+ {
+
+ }
+
+ public DDBeans build(Deployment dep, String invokerEJB3, String invokerJSE)
+ {
+ DeploymentType depType = dep.getType();
+ DDBeans dd = new DDBeans();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ DDEndpoint ddep = createDDEndpoint(ep.getTargetBeanClass(), (ArchiveDeployment)dep, ep);
+
+ if (depType == DeploymentType.JAXWS_EJB3)
+ {
+ ddep.setInvoker(invokerEJB3);
+ }
+
+ if (depType == DeploymentType.JAXWS_JSE)
+ {
+ ddep.setInvoker(invokerJSE);
+ }
+
+ processWSDDContribution(ddep, (ArchiveDeployment)dep);
+
+ log.info("Add " + ddep);
+ dd.addEndpoint(ddep);
+ }
+ return dd;
+ }
+
+ protected boolean isMtomEnabled(Class<?> beanClass)
+ {
+ BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
+ MTOM mtom = (MTOM)beanClass.getAnnotation(MTOM.class);
+
+ boolean mtomEnabled = mtom != null;
+ if (!mtomEnabled && bindingType != null)
+ {
+ String binding = bindingType.value();
+ mtomEnabled = binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ }
+
+ return mtomEnabled;
+ }
+
+ private void processWSDDContribution(DDEndpoint endpoint, ArchiveDeployment dep)
+ {
+ WebservicesMetaData webservices = WebservicesFactory.loadFromVFSRoot(dep.getRootFile());
+ if (webservices != null)
+ {
+ for (WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions())
+ {
+ for (PortComponentMetaData portComp : wsDesc.getPortComponents())
+ {
+ // We match portComp's by SEI first and portQName second
+ // In the first case the portComp may override the portQName that derives from the annotation
+ String portCompSEI = portComp.getServiceEndpointInterface();
+ boolean doesMatch = portCompSEI != null ? portCompSEI.equals(endpoint.getEpClass().getName()) : false;
+ if (!doesMatch)
+ {
+ doesMatch = portComp.getWsdlPort().equals(endpoint.getPortName());
+ }
+
+ if (doesMatch)
+ {
+ // PortQName overrides
+ if (portComp.getWsdlPort() != null)
+ {
+ if (log.isDebugEnabled())
+ log.debug("Override portName " + endpoint.getPortName() + " with " + portComp.getWsdlPort());
+ endpoint.setPortName(portComp.getWsdlPort());
+ }
+ //ServiceQName overrides
+ if (portComp.getWsdlService() != null)
+ {
+ if (log.isDebugEnabled())
+ log.debug("Override serviceName " + endpoint.getServiceName() + " with " + portComp.getWsdlService());
+ endpoint.setServiceName(portComp.getWsdlService());
+ }
+
+ //TODO implement handler chain override
+
+ // MTOM settings
+ if (portComp.isEnableMtom())
+ {
+ log.debug("Enabling MTOM");
+ endpoint.setMtomEnabled(true);
+ }
+
+ //wsdlLocation override
+ String wsdlFile = portComp.getWebserviceDescription().getWsdlFile();
+ if (wsdlFile != null)
+ {
+ if (log.isDebugEnabled())
+ log.debug("Override wsdlFile location with " + wsdlFile);
+ endpoint.setWsdlLocation(wsdlFile);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected DDEndpoint createDDEndpoint(Class<?> sepClass, ArchiveDeployment dep, Endpoint ep)
+ {
+ WebService anWebService = sepClass.getAnnotation(WebService.class);
+ WebServiceProvider anWebServiceProvider = sepClass.getAnnotation(WebServiceProvider.class);
+
+ Class<?> seiClass = null;
+ String seiName;
+
+ String name = (anWebService != null) ? anWebService.name() : "";
+ if (name.length() == 0)
+ name = JavaUtils.getJustClassName(sepClass);
+
+ String serviceName = (anWebService != null) ? anWebService.serviceName() : anWebServiceProvider.serviceName();
+ if (serviceName.length() == 0)
+ serviceName = JavaUtils.getJustClassName(sepClass) + "Service";
+
+ String serviceNS = (anWebService != null) ? anWebService.targetNamespace() : anWebServiceProvider.targetNamespace();
+ if (serviceNS.length() == 0)
+ serviceNS = getTypeNamespace(JavaUtils.getPackageName(sepClass));
+
+ String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName();
+ if (portName.length() == 0)
+ portName = name + "Port";
+
+ if (anWebService != null && anWebService.endpointInterface().length() > 0)
+ {
+ seiName = anWebService.endpointInterface();
+ ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader();
+ if(null == runtimeClassLoader)
+ throw new IllegalArgumentException("Runtime loader cannot be null");
+
+ try
+ {
+ seiClass = runtimeClassLoader.loadClass(seiName);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ throw new RuntimeException("Cannot load service endpoint interface class!", cnfe);
+ }
+ WebService seiAnnotation = seiClass.getAnnotation(WebService.class);
+
+ if (seiAnnotation == null)
+ throw new RuntimeException("Interface does not have a @WebService annotation: " + seiName);
+
+ if (seiAnnotation.portName().length() > 0 || seiAnnotation.serviceName().length() > 0 || seiAnnotation.endpointInterface().length() > 0)
+ throw new RuntimeException("@WebService cannot have attribute 'portName', 'serviceName', 'endpointInterface' on: " + seiName);
+
+ }
+
+ DDEndpoint result = new DDEndpoint();
+
+ result.setId(ep.getShortName());
+ result.setAddress(ep.getAddress());
+ result.setImplementor(ep.getTargetBeanName());
+ result.setMtomEnabled(isMtomEnabled(ep.getTargetBeanClass()));
+ result.setEpClass(seiClass != null ? seiClass : sepClass);
+ result.setPortName(new QName(serviceNS, portName));
+ result.setServiceName(new QName(serviceNS, serviceName));
+
+ return result;
+ }
+
+
+
+ /**
+ * Extracts the typeNS given the package name
+ * Algorithm is based on the one specified in JAWS v2.0 spec
+ */
+ private static String getTypeNamespace(String packageName)
+ {
+ StringBuilder sb = new StringBuilder("http://");
+
+ //Generate tokens with '.' as delimiter
+ StringTokenizer st = new StringTokenizer(packageName, ".");
+
+ //Have a LIFO queue for the tokens
+ Stack<String> stk = new Stack<String>();
+ while (st != null && st.hasMoreTokens())
+ {
+ stk.push(st.nextToken());
+ }
+
+ String next;
+ while (!stk.isEmpty() && (next = stk.pop()) != null)
+ {
+ if (sb.toString().equals("http://") == false)
+ sb.append('.');
+ sb.append(next);
+ }
+
+ // trailing slash
+ sb.append('/');
+
+ return sb.toString();
+ }
+
+}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-04-15 15:48:09 UTC (rev 12002)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-04-15 15:54:24 UTC (rev 12003)
@@ -24,38 +24,140 @@
import java.io.IOException;
import java.io.Writer;
+import javax.xml.namespace.QName;
+
/**
* Metadata model for cxf.xml
*
* @author Thomas.Diesler(a)jboss.org
* @author ropalka(a)redhat.com
+ * @author alessio.soldano(a)jboss.com
*/
public class DDEndpoint
{
+ //fields mapped to jboss-cxf.xml
private String id;
private String address;
private String implementor;
private String invoker;
private boolean mtomEnabled;
+ private String wsdlLocation;
+ private QName portName;
+ private QName serviceName;
+
+ //additional fields
+ private Class<?> epClass;
+
+ private int counter = 0;
- public DDEndpoint(String id, String address, String implementor, boolean mtomEnabled)
+
+ public QName getPortName()
{
+ return portName;
+ }
+
+ public void setPortName(QName portName)
+ {
+ this.portName = portName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void setServiceName(QName serviceName)
+ {
+ this.serviceName = serviceName;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
this.id = id;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+
+ public void setAddress(String address)
+ {
this.address = address;
+ }
+
+ public String getImplementor()
+ {
+ return implementor;
+ }
+
+ public void setImplementor(String implementor)
+ {
this.implementor = implementor;
- this.mtomEnabled = mtomEnabled;
}
+ public String getWsdlLocation()
+ {
+ return wsdlLocation;
+ }
+
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+ public Class<?> getEpClass()
+ {
+ return epClass;
+ }
+
+ public void setEpClass(Class<?> epClass)
+ {
+ this.epClass = epClass;
+ }
+
+ public String getInvoker()
+ {
+ return invoker;
+ }
+
+ public boolean isMtomEnabled()
+ {
+ return mtomEnabled;
+ }
+
public void setInvoker(String invoker)
{
this.invoker = invoker;
}
+ public void setMtomEnabled(boolean mtomEnabled)
+ {
+ this.mtomEnabled = mtomEnabled;
+ }
+
public void writeTo(Writer writer) throws IOException
{
writer.write("<jaxws:endpoint id='" + this.id + "'");
writer.write(" address='" + this.address + "'");
writer.write(" implementor='" + this.implementor + "'");
+ if (this.serviceName != null)
+ {
+ this.writeQNameElementTo("serviceName", this.serviceName, writer);
+ }
+ if (this.portName != null)
+ {
+ this.writeQNameElementTo("endpointName", this.portName, writer);
+ }
+ if (this.wsdlLocation != null)
+ {
+ writer.write(" wsdlLocation='" + this.wsdlLocation + "'");
+ }
writer.write(">");
if (this.mtomEnabled)
@@ -72,6 +174,13 @@
writer.write("</jaxws:endpoint>");
}
+
+ private void writeQNameElementTo(String elementName, QName qname, Writer writer) throws IOException
+ {
+ String prefix = "ns" + counter++;
+ writer.write(" " + elementName + "='" + prefix + ":" + qname.getLocalPart() + "'");
+ writer.write(" xmlns:" + prefix + "='" + qname.getNamespaceURI() + "'");
+ }
public String toString()
{
@@ -80,6 +189,9 @@
str.append("\n address=" + this.address);
str.append("\n implementor=" + this.implementor);
str.append("\n invoker=" + this.invoker);
+ str.append("\n serviceName=" + this.serviceName);
+ str.append("\n portName=" + this.portName);
+ str.append("\n wsdlLocation=" + this.wsdlLocation);
str.append("\n mtomEnabled=" + this.mtomEnabled);
return str.toString();
}
16 years
JBossWS SVN: r12002 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-15 11:48:09 -0400 (Thu, 15 Apr 2010)
New Revision: 12002
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/Hello.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/HelloBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws2999/
framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/ejb-jar.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/wsdl/
framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/wsdl/HelloService.wsdl
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2999] Adding testcase
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-04-15 15:45:40 UTC (rev 12001)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-04-15 15:48:09 UTC (rev 12002)
@@ -903,6 +903,19 @@
</webinf>
</war>
+ <!-- jaxws-jbws2999 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2999.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2999/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2999/*TestCase.class" />
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2999/META-INF">
+ <include name="ejb-jar.xml" />
+ <include name="webservices.xml" />
+ <include name="wsdl/**" />
+ </metainf>
+ </jar>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/Hello.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/Hello.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/Hello.java 2010-04-15 15:48:09 UTC (rev 12002)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2999;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "Hello", targetNamespace = "http://Hello.org")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public abstract interface Hello {
+
+ @WebMethod
+ @WebResult(name = "result", partName = "result")
+ public abstract String helloEcho(@WebParam(name = "Param1", partName = "Param1") String paramString);
+}
\ No newline at end of file
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/HelloBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/HelloBean.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/HelloBean.java 2010-04-15 15:48:09 UTC (rev 12002)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2999;
+
+import javax.jws.WebService;
+import javax.ejb.Stateless;
+
+@WebService(portName = "JunkPortName",
+ serviceName = "JunkServiceName",
+ targetNamespace = "http://Hello.org",
+ wsdlLocation = "META-INF/wsdl/HelloService.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2999.Hello")
+@Stateless(name = "jbws2999Test")
+public class HelloBean {
+ public String helloEcho(String s) {
+ return s;
+ }
+}
\ No newline at end of file
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2010-04-15 15:48:09 UTC (rev 12002)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxws.jbws2999;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2999] cxf webservices.xml override with jaxws
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 15-Apr-2010
+ */
+public class JBWS2999TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2999TestCase.class, "jaxws-jbws2999.jar");
+ }
+
+ private Hello getPort() throws Exception
+ {
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2999/HelloBean?wsdl");
+ QName serviceName = new QName("http://Hello.org", "HelloService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ return service.getPort(Hello.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ String message = "Hi";
+ String response = getPort().helloEcho(message);
+ assertEquals(message, response);
+ }
+
+}
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/ejb-jar.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/ejb-jar.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/ejb-jar.xml 2010-04-15 15:48:09 UTC (rev 12002)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+ <display-name>WSEjbOverrideWSRefHCWithDDsTest_ejb</display-name>
+ <enterprise-beans>
+ <session>
+ <display-name>jbws2999Test</display-name>
+ <ejb-name>jbws2999Test</ejb-name>
+ <ejb-class>org.jboss.test.ws.jaxws.jbws2999.HelloBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <security-identity>
+ <description></description>
+ <use-caller-identity></use-caller-identity>
+ </security-identity>
+ </session>
+ </enterprise-beans>
+
+ <assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>jbws2999Test</ejb-name>
+ <method-name>helloEcho</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ </assembly-descriptor>
+</ejb-jar>
\ No newline at end of file
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/webservices.xml 2010-04-15 15:48:09 UTC (rev 12002)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webservices xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://Hello.org" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" version="1.2">
+ <webservice-description>
+ <webservice-description-name>HelloService</webservice-description-name>
+ <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <port-component>
+ <port-component-name>HelloBean</port-component-name>
+ <wsdl-service>wsdl:HelloService</wsdl-service>
+ <wsdl-port>wsdl:Hello</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.jbws2999.Hello</service-endpoint-interface>
+ <service-impl-bean>
+ <ejb-link>jbws2999Test</ejb-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/wsdl/HelloService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/wsdl/HelloService.wsdl (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2999/META-INF/wsdl/HelloService.wsdl 2010-04-15 15:48:09 UTC (rev 12002)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://Hello.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="HelloService" targetNamespace="http://Hello.org">
+ <types />
+ <message name="Hello_helloRequest">
+ <part name="Param1" type="xsd:string" />
+ </message>
+ <message name="Hello_helloResponse">
+ <part name="result" type="xsd:string" />
+ </message>
+ <portType name="Hello">
+ <operation name="helloEcho" parameterOrder="Param1">
+ <input message="tns:Hello_helloRequest" />
+ <output message="tns:Hello_helloResponse" />
+ </operation>
+ </portType>
+ <binding name="HelloBinding" type="tns:Hello">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
+ <operation name="helloEcho">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal" namespace="http://Hello.org" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://Hello.org" />
+ </output>
+ </operation>
+ </binding>
+ <service name="HelloService">
+ <port name="Hello" binding="tns:HelloBinding">
+ <soap:address location="http://foo:9999/bar"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
16 years
JBossWS SVN: r12001 - common/trunk/src/main/java/org/jboss/wsf/common.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-15 11:45:40 -0400 (Thu, 15 Apr 2010)
New Revision: 12001
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java
Log:
[JBWS-2999] Adding few methods to JavaUtils and fixing some warnings
Modified: common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java 2010-04-15 14:36:57 UTC (rev 12000)
+++ common/trunk/src/main/java/org/jboss/wsf/common/JavaUtils.java 2010-04-15 15:45:40 UTC (rev 12001)
@@ -37,7 +37,7 @@
// provide logging
private static final Logger log = Logger.getLogger(JavaUtils.class);
- private static HashMap<String, Class> primitiveNames = new HashMap<String, Class>(8);
+ private static HashMap<String, Class<?>> primitiveNames = new HashMap<String, Class<?>>(8);
private static HashMap<String, String> primitiveNameDescriptors = new HashMap<String, String>(8);
private static HashSet<String> reservedKeywords = new HashSet<String>(50);
@@ -118,7 +118,7 @@
*
* @param typeName maybe the source notation of a primitve, class name, array of both
*/
- public static Class loadJavaType(String typeName) throws ClassNotFoundException
+ public static Class<?> loadJavaType(String typeName) throws ClassNotFoundException
{
return loadJavaType(typeName, null);
}
@@ -128,12 +128,12 @@
*
* @param typeName maybe the source notation of a primitve, class name, array of both
*/
- public static Class loadJavaType(String typeName, ClassLoader classLoader) throws ClassNotFoundException
+ public static Class<?> loadJavaType(String typeName, ClassLoader classLoader) throws ClassNotFoundException
{
if (classLoader == null)
classLoader = Thread.currentThread().getContextClassLoader();
- Class javaType = primitiveNames.get(typeName);
+ Class<?> javaType = primitiveNames.get(typeName);
if (javaType == null)
javaType = getArray(typeName, classLoader);
@@ -154,14 +154,14 @@
/**
* True if the given class is a primitive or array of which.
*/
- public static boolean isPrimitive(Class javaType)
+ public static boolean isPrimitive(Class<?> javaType)
{
return javaType.isPrimitive() || (javaType.isArray() && isPrimitive(javaType.getComponentType()));
}
- public static Class getPrimitiveType(String javaType)
+ public static Class<?> getPrimitiveType(String javaType)
{
- Class type = primitiveNames.get(javaType);
+ Class<?> type = primitiveNames.get(javaType);
if (type != null)
return type;
@@ -178,7 +178,7 @@
return type;
}
- private static Class getArray(String javaType, ClassLoader loader) throws ClassNotFoundException
+ private static Class<?> getArray(String javaType, ClassLoader loader) throws ClassNotFoundException
{
if (javaType.charAt(0) == '[')
return getArrayFromJVMName(javaType, loader);
@@ -189,9 +189,9 @@
return null;
}
- private static Class getArrayFromJVMName(String javaType, ClassLoader loader) throws ClassNotFoundException
+ private static Class<?> getArrayFromJVMName(String javaType, ClassLoader loader) throws ClassNotFoundException
{
- Class componentType;
+ Class<?> componentType;
int componentStart = javaType.lastIndexOf('[') + 1;
switch (javaType.charAt(componentStart))
{
@@ -217,12 +217,12 @@
return Array.newInstance(componentType, new int[componentStart]).getClass();
}
- private static Class getArrayFromSourceName(String javaType, ClassLoader loader) throws ClassNotFoundException
+ private static Class<?> getArrayFromSourceName(String javaType, ClassLoader loader) throws ClassNotFoundException
{
int arrayStart = javaType.indexOf('[');
String componentName = javaType.substring(0, arrayStart);
- Class componentType = primitiveNames.get(componentName);
+ Class<?> componentType = primitiveNames.get(componentName);
if (componentType == null)
{
if (loader == null)
@@ -236,12 +236,47 @@
return Array.newInstance(componentType, new int[dimensions]).getClass();
}
+
+ /**
+ * Given a class, strip out the package name
+ *
+ * @param cls
+ * @return just the classname
+ */
+ public static String getJustClassName(Class<?> cls)
+ {
+ if (cls == null)
+ return null;
+ if (cls.isArray())
+ {
+ Class<?> c = cls.getComponentType();
+ return getJustClassName(c.getName());
+ }
+
+ return getJustClassName(cls.getName());
+ }
+
/**
+ * Given a FQN of a class, strip out the package name
+ *
+ * @param classname
+ * @return just the classname
+ */
+ public static String getJustClassName(String classname)
+ {
+ int index = classname.lastIndexOf('.');
+ if (index < 0)
+ index = 0;
+ else index = index + 1;
+ return classname.substring(index);
+ }
+
+ /**
* Get the corresponding primitive for a give wrapper type.
* Also handles arrays of which.
*/
- public static Class getPrimitiveType(Class javaType)
+ public static Class<?> getPrimitiveType(Class<?> javaType)
{
if (javaType == Integer.class)
return int.class;
@@ -279,7 +314,7 @@
if (javaType.isArray() && javaType.getComponentType().isArray())
{
- Class compType = getPrimitiveType(javaType.getComponentType());
+ Class<?> compType = getPrimitiveType(javaType.getComponentType());
return Array.newInstance(compType, 0).getClass();
}
@@ -294,7 +329,7 @@
if (value == null)
return null;
- Class javaType = value.getClass();
+ Class<?> javaType = value.getClass();
if (javaType.isArray())
{
int length = Array.getLength(value);
@@ -314,7 +349,7 @@
* Get the corresponding wrapper type for a give primitive.
* Also handles arrays of which.
*/
- public static Class getWrapperType(Class javaType)
+ public static Class<?> getWrapperType(Class<?> javaType)
{
if (javaType == int.class)
return Integer.class;
@@ -352,7 +387,7 @@
if (javaType.isArray() && javaType.getComponentType().isArray())
{
- Class compType = getWrapperType(javaType.getComponentType());
+ Class<?> compType = getWrapperType(javaType.getComponentType());
return Array.newInstance(compType, 0).getClass();
}
@@ -367,7 +402,7 @@
if (value == null)
return null;
- Class javaType = value.getClass();
+ Class<?> javaType = value.getClass();
if (javaType.isArray())
{
int length = Array.getLength(value);
@@ -383,7 +418,7 @@
return value;
}
- public static Object syncArray(Object array, Class target)
+ public static Object syncArray(Object array, Class<?> target)
{
return (JavaUtils.isPrimitive(target)) ? JavaUtils.getPrimitiveValueArray(array) : JavaUtils.getWrapperValueArray(array);
}
@@ -392,7 +427,7 @@
* Return true if the dest class is assignable from the src.
* Also handles arrays and primitives.
*/
- public static boolean isAssignableFrom(Class dest, Class src)
+ public static boolean isAssignableFrom(Class<?> dest, Class<?> src)
{
if (dest == null)
throw new IllegalArgumentException("Destination class cannot be null");
@@ -425,7 +460,7 @@
// TODO Don't use a ClassLoader for this, we need to just convert it
try
{
- Class javaType = loadJavaType(typeName, loader);
+ Class<?> javaType = loadJavaType(typeName, loader);
typeName = getSourceName(javaType);
}
catch (Exception e)
@@ -481,13 +516,13 @@
return out.append("]").toString();
}
- public static String getSourceName(Class type)
+ public static String getSourceName(Class<?> type)
{
if (! type.isArray())
return type.getName();
String arrayNotation = "";
- Class component = type;
+ Class<?> component = type;
while(component.isArray())
{
component = component.getComponentType();
@@ -544,15 +579,15 @@
* @param t type to erase
* @return erased type
*/
- public static Class erasure(Type type)
+ public static Class<?> erasure(Type type)
{
if (type instanceof ParameterizedType)
{
return erasure(((ParameterizedType)type).getRawType());
}
- if (type instanceof TypeVariable)
+ if (type instanceof TypeVariable<?>)
{
- return erasure(((TypeVariable)type).getBounds()[0]);
+ return erasure(((TypeVariable<?>)type).getBounds()[0]);
}
if (type instanceof WildcardType)
{
@@ -564,7 +599,7 @@
}
// Only type left is class
- return (Class)type;
+ return (Class<?>)type;
}
public static String[] getRawParameterTypeArguments(ParameterizedType type)
@@ -573,7 +608,7 @@
String[] ret = new String[arguments.length];
for (int i = 0; i < arguments.length; i++)
{
- Class raw = erasure(arguments[i]);
+ Class<?> raw = erasure(arguments[i]);
ret[i] = raw.getName();
}
@@ -599,7 +634,7 @@
*/
public static boolean isJBossRepositoryClassLoader(ClassLoader loader)
{
- Class clazz = loader.getClass();
+ Class<?> clazz = loader.getClass();
while (!clazz.getName().startsWith("java"))
{
if ("org.jboss.mx.loading.RepositoryClassLoader".equals(clazz.getName()))
16 years
JBossWS SVN: r12000 - stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-04-15 10:36:57 -0400 (Thu, 15 Apr 2010)
New Revision: 12000
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Restore deploy-jboss510 ant target to working order.
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-15 05:47:00 UTC (rev 11999)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-15 14:36:57 UTC (rev 12000)
@@ -30,8 +30,8 @@
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
<include>javax.xml:jaxrpc-api:jar</include>
- <!-- <include>org.jboss.ws:jbossws-spi:jar</include> -->
- <!-- <include>org.jboss.ws:jbossws-common:jar</include> -->
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
<include>junit:junit:jar</include>
<include>org.apache.neethi:neethi:jar</include>
<include>javax.xml.soap:saaj-api:jar</include>
@@ -85,7 +85,6 @@
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<dependencySets>
- <!-- Do not include juddi-service as it has not changed
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
@@ -94,12 +93,13 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
+ <!-- Do not include juddi-service as it has not changed
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
- <include>juddi:juddi:jar</include>
+ <include>juddi:juddi:jar</include> -->
</includes>
</dependencySet>
- -->
+
<!-- [JBWS-2505] -->
<!-- START -->
<!--
16 years
JBossWS SVN: r11999 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-15 01:47:00 -0400 (Thu, 15 Apr 2010)
New Revision: 11999
Added:
stack/native/trunk/.gitignore
Log:
adding ignores file
Added: stack/native/trunk/.gitignore
===================================================================
--- stack/native/trunk/.gitignore (rev 0)
+++ stack/native/trunk/.gitignore 2010-04-15 05:47:00 UTC (rev 11999)
@@ -0,0 +1,45 @@
+
+# /
+/target.properties
+/.settings
+/target
+/profiles.xml
+/clipboard.*
+
+# /modules/client/
+/modules/client/target
+
+# /modules/core/
+/modules/core/target
+
+# /modules/endorsed/
+/modules/endorsed/target
+
+# /modules/management/
+/modules/management/target
+
+# /modules/resources/
+/modules/resources/target
+
+# /modules/services/
+/modules/services/target
+
+# /modules/testsuite/framework-tests/
+/modules/testsuite/framework-tests/target
+/modules/testsuite/framework-tests/wsprovide
+/modules/testsuite/framework-tests/work
+/modules/testsuite/framework-tests/wsconsume
+/modules/testsuite/framework-tests/*.log
+/modules/testsuite/framework-tests/*.txt
+
+# /modules/testsuite/framework-tests/src/test/
+/modules/testsuite/framework-tests/src/test/ant-import
+/modules/testsuite/framework-tests/src/test/java
+/modules/testsuite/framework-tests/src/test/resources
+
+# /modules/testsuite/native-tests/
+/modules/testsuite/native-tests/target
+/modules/testsuite/native-tests/tools
+/modules/testsuite/native-tests/wstools
+/modules/testsuite/native-tests/*.log
+/modules/testsuite/native-tests/*.txt
16 years
JBossWS SVN: r11998 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-15 01:46:41 -0400 (Thu, 15 Apr 2010)
New Revision: 11998
Added:
stack/metro/trunk/.gitignore
Log:
adding ignores file
Added: stack/metro/trunk/.gitignore
===================================================================
--- stack/metro/trunk/.gitignore (rev 0)
+++ stack/metro/trunk/.gitignore 2010-04-15 05:46:41 UTC (rev 11998)
@@ -0,0 +1,32 @@
+
+# /
+/.settings
+/target
+/target.properties
+/profiles.xml
+
+# /modules/client/
+/modules/client/target
+
+# /modules/management/
+/modules/management/target
+
+# /modules/resources/
+/modules/resources/target
+
+# /modules/server/
+/modules/server/target
+
+# /modules/testsuite/framework-tests/
+/modules/testsuite/framework-tests/target
+
+# /modules/testsuite/framework-tests/src/test/
+/modules/testsuite/framework-tests/src/test/ant-import
+/modules/testsuite/framework-tests/src/test/java
+/modules/testsuite/framework-tests/src/test/resources
+
+# /modules/testsuite/metro-tests/
+/modules/testsuite/metro-tests/target
+
+# /modules/wsit/
+/modules/wsit/target
16 years
JBossWS SVN: r11997 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-15 01:46:24 -0400 (Thu, 15 Apr 2010)
New Revision: 11997
Added:
stack/cxf/trunk/.gitignore
Log:
adding ignores file
Added: stack/cxf/trunk/.gitignore
===================================================================
--- stack/cxf/trunk/.gitignore (rev 0)
+++ stack/cxf/trunk/.gitignore 2010-04-15 05:46:24 UTC (rev 11997)
@@ -0,0 +1,40 @@
+
+# /
+/ant.properties
+/clipboard.*
+/target
+/.settings
+/profiles.xml
+/target.properties
+/transaction.log
+
+# /modules/
+/modules/target
+
+# /modules/client/
+/modules/client/target
+
+# /modules/management/
+/modules/management/target
+
+# /modules/resources/
+/modules/resources/target
+
+# /modules/server/
+/modules/server/target
+
+# /modules/testsuite/
+/modules/testsuite/target
+
+# /modules/testsuite/cxf-tests/
+/modules/testsuite/cxf-tests/target
+
+# /modules/testsuite/framework-tests/
+/modules/testsuite/framework-tests/target
+/modules/testsuite/framework-tests/org
+/modules/testsuite/framework-tests/transaction.log
+
+# /modules/testsuite/framework-tests/src/test/
+/modules/testsuite/framework-tests/src/test/ant-import
+/modules/testsuite/framework-tests/src/test/java
+/modules/testsuite/framework-tests/src/test/resources
16 years
JBossWS SVN: r11996 - container/jboss60/branches/jbossws-jboss600M2.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-15 01:45:53 -0400 (Thu, 15 Apr 2010)
New Revision: 11996
Added:
container/jboss60/branches/jbossws-jboss600M2/.gitignore
Log:
adding ignores file
Added: container/jboss60/branches/jbossws-jboss600M2/.gitignore
===================================================================
--- container/jboss60/branches/jbossws-jboss600M2/.gitignore (rev 0)
+++ container/jboss60/branches/jbossws-jboss600M2/.gitignore 2010-04-15 05:45:53 UTC (rev 11996)
@@ -0,0 +1,4 @@
+
+# /
+/.settings
+/target
16 years
JBossWS SVN: r11995 - in container/jboss50/branches: jbossws-jboss510 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-15 01:45:16 -0400 (Thu, 15 Apr 2010)
New Revision: 11995
Added:
container/jboss50/branches/jbossws-jboss501/.gitignore
container/jboss50/branches/jbossws-jboss510/.gitignore
Log:
adding ignores file
Added: container/jboss50/branches/jbossws-jboss501/.gitignore
===================================================================
--- container/jboss50/branches/jbossws-jboss501/.gitignore (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/.gitignore 2010-04-15 05:45:16 UTC (rev 11995)
@@ -0,0 +1,4 @@
+
+# /
+/.settings
+/target
Added: container/jboss50/branches/jbossws-jboss510/.gitignore
===================================================================
--- container/jboss50/branches/jbossws-jboss510/.gitignore (rev 0)
+++ container/jboss50/branches/jbossws-jboss510/.gitignore 2010-04-15 05:45:16 UTC (rev 11995)
@@ -0,0 +1,4 @@
+
+# /
+/.settings
+/target
16 years
JBossWS SVN: r11994 - framework/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-15 01:44:15 -0400 (Thu, 15 Apr 2010)
New Revision: 11994
Added:
framework/trunk/.gitignore
Log:
adding ignores file
Added: framework/trunk/.gitignore
===================================================================
--- framework/trunk/.gitignore (rev 0)
+++ framework/trunk/.gitignore 2010-04-15 05:44:15 UTC (rev 11994)
@@ -0,0 +1,9 @@
+
+# /
+/target
+/profiles.xml
+/.settings
+
+# /hudson/
+/hudson/ant.properties
+/hudson/target
16 years