JBossWS SVN: r17298 - in thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627: rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-02-12 09:24:29 -0500 (Tue, 12 Feb 2013)
New Revision: 17298
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java
Removed:
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java
Modified:
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
Log:
[JBPAPP-10627] Changes to ensure @XMLJavaTypeAdapter is picked up in Exception classes as well as changes for property order of exception types
Property changes on: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627
___________________________________________________________________
Added: svn:mergeinfo
+ /thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129:17139-17140,17225,17231-17235
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-02-12 13:20:24 UTC (rev 17297)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -33,14 +33,13 @@
import java.util.Set;
import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import javax.xml.namespace.QName;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -196,13 +195,19 @@
if (anns != null) {
for (Annotation a : anns) {
if (XmlJavaTypeAdapter.class.isAssignableFrom(a.annotationType())) {
- inspectTypeAdapter(((XmlJavaTypeAdapter)a).value());
+ Type t = Utils.getTypeFromXmlAdapter((XmlJavaTypeAdapter)a);
+ if (t != null) {
+ addType(t);
+ }
}
}
}
XmlJavaTypeAdapter xjta = clazz.getAnnotation(XmlJavaTypeAdapter.class);
if (xjta != null) {
- inspectTypeAdapter(xjta.value());
+ Type t = Utils.getTypeFromXmlAdapter(xjta);
+ if (t != null) {
+ addType(t);
+ }
}
}
@@ -285,9 +290,10 @@
}
}
XmlJavaTypeAdapter xjta = cls.getAnnotation(XmlJavaTypeAdapter.class);
- if (xjta != null) {
- Class<? extends XmlAdapter> c2 = xjta.value();
- inspectTypeAdapter(c2);
+ if (xjta != null && Utils.getTypeFromXmlAdapter(xjta) != null) {
+ Type t = Utils.getTypeFromXmlAdapter(xjta);
+ addType(t);
+ return;
}
} else if (classes.contains(cls)) {
return;
@@ -299,16 +305,24 @@
}
}
- private void inspectTypeAdapter(Class<? extends XmlAdapter> aclass) {
- Class<?> c2 = aclass;
- Type sp = c2.getGenericSuperclass();
- while (!XmlAdapter.class.equals(c2) && c2 != null) {
- sp = c2.getGenericSuperclass();
- c2 = c2.getSuperclass();
+ static XmlJavaTypeAdapter getFieldXJTA(final Field f) {
+ XmlJavaTypeAdapter adapter = f.getAnnotation(XmlJavaTypeAdapter.class);
+ if (adapter == null) {
+ adapter = f.getType().getAnnotation(XmlJavaTypeAdapter.class);
}
- if (sp instanceof ParameterizedType) {
- addType(((ParameterizedType)sp).getActualTypeArguments()[0]);
+ if (adapter == null) {
+ XmlJavaTypeAdapters adapters =
+ f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class);
+ if (adapters != null) {
+ for (XmlJavaTypeAdapter candidate : adapters.value()) {
+ if (candidate != null && candidate.type().equals(f.getType())) {
+ adapter = candidate;
+ break;
+ }
+ }
+ }
}
+ return adapter;
}
private void walkReferences(Class<?> cls) {
@@ -325,11 +339,7 @@
//We'll grab the public field/method types and then add the ObjectFactory stuff
//as well as look for jaxb.index files in those packages.
- XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class);
- if (accessorType == null && cls.getPackage() != null) {
- accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class);
- }
- XmlAccessType accessType = accessorType != null ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER;
+ XmlAccessType accessType = Utils.getXmlAccessType(cls);
if (accessType != XmlAccessType.PROPERTY) { // only look for fields if we are instructed to
//fields are accessible even if not public, must look at the declared fields
@@ -368,9 +378,6 @@
&& !Modifier.isPublic(field.getModifiers())) {
return false;
}
- if (field.getAnnotation(XmlJavaTypeAdapter.class) != null) {
- return false;
- }
if (accessType == XmlAccessType.NONE
|| accessType == XmlAccessType.PROPERTY) {
return checkJaxbAnnotation(field.getAnnotations());
@@ -397,12 +404,6 @@
return false;
}
- boolean isPropGetter = method.getName().startsWith("get") || method.getName().startsWith("is");
-
- if (!isPropGetter
- || method.getAnnotation(XmlJavaTypeAdapter.class) != null) {
- return false;
- }
int beginIndex = 3;
if (method.getName().startsWith("is")) {
beginIndex = 2;
@@ -428,7 +429,7 @@
* @param annotations the array of annotations from the class member
* @return true if JAXB annotations are present, false otherwise
*/
- private static boolean checkJaxbAnnotation(Annotation[] annotations) {
+ static boolean checkJaxbAnnotation(Annotation[] annotations) {
// must check if there are any jaxb annotations
Package jaxbAnnotationsPackage = XmlElement.class.getPackage();
for (Annotation annotation : annotations) {
@@ -438,4 +439,4 @@
}
return false;
}
-}
\ No newline at end of file
+}
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java 2013-02-12 13:20:24 UTC (rev 17297)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -48,7 +48,7 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import javax.xml.bind.attachment.AttachmentMarshaller;
import javax.xml.bind.attachment.AttachmentUnmarshaller;
@@ -65,7 +65,6 @@
import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.SOAPConstants;
@@ -335,12 +334,7 @@
try {
writer.writeStartElement("ns1", qn.getLocalPart(), qn.getNamespaceURI());
Class<?> cls = part.getTypeClass();
- XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class);
- if (accessorType == null && cls.getPackage() != null) {
- accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class);
- }
- XmlAccessType accessType = accessorType != null
- ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER;
+ XmlAccessType accessType = Utils.getXmlAccessType(cls);
String namespace = part.getElementQName().getNamespaceURI();
SchemaInfo sch = part.getMessageInfo().getOperation().getInterface()
@@ -353,33 +347,31 @@
LOG.warning("Schema associated with " + namespace + " is null");
}
- for (Field f : cls.getDeclaredFields()) {
- if (JAXBContextInitializer.isFieldAccepted(f, accessType)) {
+ for (Field f : Utils.getFields(cls, accessType)) {
+ XmlAttribute at = f.getAnnotation(XmlAttribute.class);
+ if (at == null) {
QName fname = new QName(namespace, f.getName());
f.setAccessible(true);
if (JAXBSchemaInitializer.isArray(f.getGenericType())) {
- writeArrayObject(marshaller, writer, fname, f.get(elValue));
+ writeArrayObject(marshaller, writer, fname, f.get(elValue));
} else {
- writeObject(marshaller, writer, new JAXBElement(fname, String.class,
- f.get(elValue)));
+ Object o = Utils.getFieldValue(f, elValue);
+ writeObject(marshaller, writer, new JAXBElement(fname, String.class, o));
}
}
}
- for (Method m : cls.getMethods()) {
- if (JAXBContextInitializer.isMethodAccepted(m, accessType)) {
- int idx = m.getName().startsWith("get") ? 3 : 2;
- String name = m.getName().substring(idx);
- name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
- QName mname = new QName(namespace, name);
- if (JAXBSchemaInitializer.isArray(m.getGenericReturnType())) {
- writeArrayObject(marshaller, writer, mname, m.invoke(elValue));
- } else {
- writeObject(marshaller, writer, new JAXBElement(mname, String.class,
- m.invoke(elValue)));
- }
+ for (Method m : Utils.getGetters(cls, accessType)) {
+ int idx = m.getName().startsWith("get") ? 3 : 2;
+ String name = m.getName().substring(idx);
+ name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
+ QName mname = new QName(namespace, name);
+ if (JAXBSchemaInitializer.isArray(m.getGenericReturnType())) {
+ writeArrayObject(marshaller, writer, mname, m.invoke(elValue));
+ } else {
+ Object o = Utils.getMethodValue(m, elValue);
+ writeObject(marshaller, writer, new JAXBElement(mname, String.class, o));
}
}
-
writer.writeEndElement();
writer.flush();
} catch (Exception e) {
@@ -448,55 +440,43 @@
obj = cons.newInstance(new Object[1]);
}
- XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class);
- if (accessorType == null && cls.getPackage() != null) {
- accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class);
- }
- XmlAccessType accessType = accessorType != null
- ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER;
+ XmlAccessType accessType = Utils.getXmlAccessType(cls);
reader.nextTag();
while (reader.getEventType() == XMLStreamReader.START_ELEMENT) {
QName q = reader.getName();
- try {
- Field f = cls.getField(q.getLocalPart());
+ String fieldName = q.getLocalPart();
+ Field f = Utils.getField(cls, accessType, fieldName);
+ if (f != null) {
Type type = f.getGenericType();
- if (JAXBContextInitializer.isFieldAccepted(f, accessType)) {
- f.setAccessible(true);
- if (JAXBSchemaInitializer.isArray(type)) {
- Class<?> compType = JAXBSchemaInitializer
- .getArrayComponentType(type);
- List<Object> ret = unmarshallArray(u, reader,
- q,
- compType,
- createList(type));
- Object o = ret;
- if (!isList(type)) {
- if (compType.isPrimitive()) {
- o = java.lang.reflect.Array.newInstance(compType, ret.size());
- for (int x = 0; x < ret.size(); x++) {
- Array.set(o, x, ret.get(x));
- }
- } else {
- o = ret.toArray((Object[])Array.newInstance(compType, ret.size()));
+ f.setAccessible(true);
+ if (JAXBSchemaInitializer.isArray(type)) {
+ Class<?> compType = JAXBSchemaInitializer.getArrayComponentType(type);
+ List<Object> ret = unmarshallArray(u, reader, q, compType, createList(type));
+ Object o = ret;
+ if (!isList(type)) {
+ if (compType.isPrimitive()) {
+ o = java.lang.reflect.Array.newInstance(compType, ret.size());
+ for (int x = 0; x < ret.size(); x++) {
+ Array.set(o, x, ret.get(x));
}
+ } else {
+ o = ret.toArray((Object[]) Array.newInstance(compType, ret.size()));
}
-
- f.set(obj, o);
- } else {
- f.set(obj, u.unmarshal(reader, f.getType()));
}
+ f.set(obj, o);
+ } else {
+ Object o = getElementValue(u.unmarshal(reader, Utils.getFieldType(f)));
+ Utils.setFieldValue(f, obj, o);
}
- } catch (NoSuchFieldException ex) {
+ } else {
String s = Character.toUpperCase(q.getLocalPart().charAt(0))
+ q.getLocalPart().substring(1);
- Method m = null;
- try {
- m = cls.getMethod("get" + s);
- } catch (NoSuchMethodException mex) {
- m = cls.getMethod("is" + s);
+ Method m = Utils.getMethod(cls, accessType, "get" + s);
+ if (m == null) {
+ m = Utils.getMethod(cls, accessType, "is" + s);
}
Type type = m.getGenericReturnType();
- Method m2 = cls.getMethod("set" + s, m.getReturnType());
+ Method m2 = Utils.getMethod(cls, accessType, "set" + s, m.getReturnType());
if (JAXBSchemaInitializer.isArray(type)) {
Class<?> compType = JAXBSchemaInitializer
.getArrayComponentType(type);
@@ -518,8 +498,8 @@
m2.invoke(obj, o);
} else {
- Object o = getElementValue(u.unmarshal(reader, m.getReturnType()));
- m2.invoke(obj, o);
+ Object o = getElementValue(u.unmarshal(reader, Utils.getMethodReturnType(m)));
+ Utils.setMethodValue(m, m2, obj, o);
}
}
}
@@ -527,7 +507,8 @@
} catch (Exception e) {
throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e);
}
- }
+ }
+
private static void writeObject(Marshaller u, Object source, Object mObj) throws Fault, JAXBException {
if (source instanceof XMLStreamWriter) {
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java 2013-02-12 13:20:24 UTC (rev 17297)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -26,13 +26,22 @@
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.annotation.XmlAccessOrder;
import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorOrder;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -368,7 +377,7 @@
MessagePartInfo part = fault.getMessageParts().get(0);
Class<?> cls = part.getTypeClass();
Class<?> cl2 = (Class)fault.getProperty(Class.class.getName());
- if (cls != cl2) {
+ if (cls != cl2) {
QName name = (QName)fault.getProperty("elementName");
part.setElementQName(name);
JAXBBeanInfo beanInfo = getBeanInfo(cls);
@@ -427,6 +436,8 @@
XmlSchemaSequence seq = new XmlSchemaSequence();
ct.setParticle(seq);
+ List<XmlSchemaElement> elementList = new ArrayList<XmlSchemaElement>();
+
Method methods[] = cls.getMethods();
for (Method m : methods) {
if (m.getName().startsWith("get")
@@ -454,15 +465,38 @@
el.setSchemaTypeName(typeName);
}
- seq.getItems().add(el);
+ elementList.add(el);
} catch (Exception e) {
//not mappable
}
}
}
+ XmlAccessorOrder xmlAccessorOrder = cls.getAnnotation(XmlAccessorOrder.class);
+ XmlType xmlTypeAnno = cls.getAnnotation(XmlType.class);
+ String[] propertyOrder = null;
+
+ if (xmlTypeAnno != null && xmlTypeAnno.propOrder().length > 0) {
+ propertyOrder = xmlTypeAnno.propOrder();
+ //TODO: handle @XmlAccessOrder
+ }
+
+ if (propertyOrder != null && propertyOrder.length == elementList.size()) {
+ sortItems(elementList, propertyOrder);
+ } else if (propertyOrder != null && propertyOrder.length != elementList.size()) {
+ LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements: "
+ + Arrays.toString(propertyOrder));
+ }
+
+ if (xmlAccessorOrder != null && xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL)
+ && propertyOrder == null) {
+ sort(elementList);
+ }
+
+ for (XmlSchemaElement elem : elementList) {
+ seq.getItems().add(elem);
+ }
}
}
-
private void buildExceptionType(MessagePartInfo part, Class<?> cls) {
SchemaInfo schemaInfo = null;
@@ -472,6 +506,15 @@
break;
}
}
+ XmlAccessorOrder xmlAccessorOrder = cls.getAnnotation(XmlAccessorOrder.class);
+ XmlType xmlTypeAnno = cls.getAnnotation(XmlType.class);
+ String[] propertyOrder = null;
+
+ if (xmlTypeAnno != null && xmlTypeAnno.propOrder().length > 0) {
+ propertyOrder = xmlTypeAnno.propOrder();
+ //TODO: handle @XmlAccessOrder
+ }
+
XmlSchema schema;
if (schemaInfo == null) {
schema = schemas.newXmlSchemaInCollection(part.getElementQName().getNamespaceURI());
@@ -521,32 +564,47 @@
if (accessorType == null && cls.getPackage() != null) {
accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class);
}
- XmlAccessType accessType = accessorType != null ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER;
+ XmlAccessType accessType = Utils.getXmlAccessType(cls);
+
+ List<XmlSchemaElement> elementList = new ArrayList<XmlSchemaElement>();
+
+ for (Field f : Utils.getFields(cls, accessType)) {
+ //map field
+ Type type = Utils.getFieldType(f);
+ JAXBBeanInfo beanInfo = getBeanInfo(type);
+ if (beanInfo != null) {
+ addElement(elementList, beanInfo, new QName(namespace, f.getName()), isArray(type));
+ }
+ }
+ for (Method m : Utils.getGetters(cls, accessType)) {
+ //map method
+ Type type = Utils.getMethodReturnType(m);
+ JAXBBeanInfo beanInfo = getBeanInfo(type);
+ if (beanInfo != null) {
+ int idx = m.getName().startsWith("get") ? 3 : 2;
+ String name = m.getName().substring(idx);
+ name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
+ addElement(elementList, beanInfo, new QName(namespace, name), isArray(type));
+ }
+ }
+
+ if (propertyOrder != null && propertyOrder.length == elementList.size()) {
+ sortItems(elementList, propertyOrder);
+ } else if (propertyOrder != null && propertyOrder.length != elementList.size()) {
+ LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements: "
+ + Arrays.toString(propertyOrder));
+ }
- for (Field f : cls.getDeclaredFields()) {
- if (JAXBContextInitializer.isFieldAccepted(f, accessType)) {
- //map field
- Type type = f.getGenericType();
- JAXBBeanInfo beanInfo = getBeanInfo(type);
- if (beanInfo != null) {
- addElement(seq, beanInfo, new QName(namespace, f.getName()), isArray(type));
- }
- }
+ if (xmlAccessorOrder != null && xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL)
+ && propertyOrder == null) {
+ sort(elementList);
}
- for (Method m : cls.getMethods()) {
- if (JAXBContextInitializer.isMethodAccepted(m, accessType)) {
- //map field
- Type type = m.getGenericReturnType();
- JAXBBeanInfo beanInfo = getBeanInfo(type);
- if (beanInfo != null) {
- int idx = m.getName().startsWith("get") ? 3 : 2;
- String name = m.getName().substring(idx);
- name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
- addElement(seq, beanInfo, new QName(namespace, name), isArray(type));
- }
- }
+
+ for (XmlSchemaElement elem : elementList) {
+ seq.getItems().add(elem);
}
+
part.setProperty(JAXBDataBinding.class.getName() + ".CUSTOM_EXCEPTION", Boolean.TRUE);
}
@@ -561,7 +619,7 @@
return false;
}
- public void addElement(XmlSchemaSequence seq, JAXBBeanInfo beanInfo,
+ public void addElement(List<XmlSchemaElement> elementList, JAXBBeanInfo beanInfo,
QName name, boolean isArray) {
XmlSchemaElement el = new XmlSchemaElement();
el.setName(name.getLocalPart());
@@ -591,7 +649,7 @@
el.setSchemaTypeName(typeName);
}
- seq.getItems().add(el);
+ elementList.add(el);
}
@@ -609,4 +667,25 @@
}
return isExist;
}
+
+ //sort to Alphabetical order
+ private void sort(final List<XmlSchemaElement> elementList) {
+ Collections.sort(elementList, new Comparator<XmlSchemaElement>() {
+ public int compare(XmlSchemaElement e1, XmlSchemaElement e2) {
+ return e1.getName().compareTo(e2.getName());
+ }
+ });
+ }
+
+ private void sortItems(List<XmlSchemaElement> elementList, String[] propOrder) {
+ final List<String> propList = Arrays.asList(propOrder);
+
+ Collections.sort(elementList, new Comparator<XmlSchemaElement>() {
+ public int compare(XmlSchemaElement el1, XmlSchemaElement el2) {
+ int index1 = propList.indexOf(el1.getName());
+ int index2 = propList.indexOf(el2.getName());
+ return index1 - index2;
+ }
+ });
+ }
}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java (from rev 17140, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -0,0 +1,310 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxb;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+
+/**
+ * JAXB reflection utilities.
+ */
+final class Utils {
+ private Utils() {
+ }
+
+ static XmlAccessType getXmlAccessType(Class<?> cls) {
+ XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class);
+ if (accessorType == null && cls.getPackage() != null) {
+ accessorType = cls.getPackage().getAnnotation(XmlAccessorType.class);
+ }
+ return accessorType != null
+ ? accessorType.value() : XmlAccessType.PUBLIC_MEMBER;
+ }
+
+ static Collection<Field> getFields(Class<?> cls, XmlAccessType accessType) {
+ return getFieldsInternal(cls, accessType);
+ }
+
+ private static Collection<Field> getFieldsInternal(Class<?> cls, XmlAccessType accessType) {
+ Set<Field> fields = new HashSet<Field>();
+ Class<?> superClass = cls.getSuperclass();
+ if (superClass != null && !superClass.equals(Object.class) && !superClass.equals(Throwable.class)) {
+ // process super class until java.lang.Object or java.lang.Throwable is not reached
+ fields.addAll(getFieldsInternal(superClass, accessType));
+ }
+ // process current class
+ for (Field field : cls.getDeclaredFields()) {
+ if (JAXBContextInitializer.isFieldAccepted(field, accessType)) {
+ fields.add(field);
+ }
+ }
+ return fields;
+ }
+
+ private static Collection<Method> getMethods(Class<?> cls,
+ XmlAccessType accessType, boolean acceptSetters) {
+ return getMethodsInternal(cls, accessType, acceptSetters);
+ }
+
+ private static Collection<Method> getMethodsInternal(Class<?> cls, XmlAccessType accessType,
+ boolean acceptSetters) {
+ Set<Method> methods = new HashSet<Method>();
+ Class<?> superClass = cls.getSuperclass();
+ if (superClass != null && !superClass.equals(Object.class) && !superClass.equals(Throwable.class)) {
+ // process super class until java.lang.Object or java.lang.Throwable is not reached
+ methods.addAll(getMethodsInternal(superClass, accessType, acceptSetters));
+ }
+ // process current class
+ for (Method method : cls.getDeclaredMethods()) {
+ if (isMethodAccepted(method, accessType, acceptSetters)) {
+ methods.add(method);
+ }
+ }
+ return methods;
+ }
+
+ static Method getMethod(Class<?> cls, XmlAccessType accessType, String methodName,
+ Class<?>... paramTypes) {
+ for (Method m : getMethods(cls, accessType, true)) {
+ if (m.getName().equals(methodName) && Arrays.equals(m.getParameterTypes(), paramTypes)) {
+ return m;
+ }
+ }
+ return null;
+ }
+
+ static Field getField(Class<?> cls, XmlAccessType accessType, String fieldName) {
+ for (final Field f : getFields(cls, accessType)) {
+ if (f.getName().equals(fieldName)) {
+ return f;
+ }
+ }
+ return null;
+ }
+
+ static Collection<Method> getGetters(Class<?> cls, XmlAccessType accessType) {
+ return getMethods(cls, accessType, false);
+ }
+
+ static boolean isMethodAccepted(Method method, XmlAccessType accessType, boolean acceptSetters) {
+ // ignore bridge, static, @XmlTransient methods plus methods declared in Throwable
+ if (method.isBridge()
+ || Modifier.isStatic(method.getModifiers())
+ || method.isAnnotationPresent(XmlTransient.class)
+ || method.getDeclaringClass().equals(Throwable.class)) {
+ return false;
+ }
+ // Allow only public methods if PUBLIC_MEMBER access is requested
+ if (accessType == XmlAccessType.PUBLIC_MEMBER && !Modifier.isPublic(method.getModifiers())) {
+ return false;
+ }
+ if (isGetter(method)) {
+ // does nothing
+ } else if (isSetter(method)) {
+ if (!acceptSetters) {
+ return false;
+ }
+ } else {
+ // we accept only getters and setters
+ return false;
+ }
+ // let JAXB annotations decide if NONE or FIELD access is requested
+ if (accessType == XmlAccessType.NONE || accessType == XmlAccessType.FIELD) {
+ return JAXBContextInitializer.checkJaxbAnnotation(method.getAnnotations());
+ }
+ // method accepted
+ return true;
+ }
+
+ private static boolean isGetter(Method m) {
+ if (m.getReturnType() != Void.class
+ && m.getReturnType() != Void.TYPE
+ && m.getParameterTypes().length == 0) {
+ Method setter = getSetter(m);
+ if (setter != null) {
+ return !setter.isAnnotationPresent(XmlTransient.class);
+ }
+ }
+ return false;
+ }
+
+ private static Method getSetter(Method m) {
+ final int index = getterIndex(m.getName());
+ if (index != -1) {
+ String setterName = "set" + m.getName().substring(index);
+ Class<?> paramTypes = m.getReturnType();
+ return getDeclaredMethod(m.getDeclaringClass(), setterName, paramTypes);
+ }
+ return null;
+ }
+
+ private static boolean isSetter(Method m) {
+ Class<?> declaringClass = m.getDeclaringClass();
+ boolean isVoidReturnType = m.getReturnType() == Void.class || m.getReturnType() == Void.TYPE;
+ if (isVoidReturnType && m.getParameterTypes().length == 1 && m.getName().startsWith("set")) {
+ String getterName = "get" + m.getName().substring(3);
+ Class<?> setterParamType = m.getParameterTypes()[0];
+ Method getter = getDeclaredMethod(declaringClass, getterName);
+ if (getter != null && getter.getReturnType().equals(setterParamType)
+ && !getter.isAnnotationPresent(XmlTransient.class)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static int getterIndex(String methodName) {
+ if (methodName.startsWith("is")) {
+ return 2;
+ }
+ if (methodName.startsWith("get")) {
+ return 3;
+ }
+ return -1;
+ }
+
+ private static Method getDeclaredMethod(Class<?> cls, String methodName, Class<?>... paramTypes) {
+ try {
+ return cls.getDeclaredMethod(methodName, paramTypes);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ static Class<?> getFieldType(Field f) {
+ XmlJavaTypeAdapter adapter = getFieldXJTA(f);
+ Class<?> adapterType = getTypeFromXmlAdapter(adapter);
+ return adapterType != null ? adapterType : f.getType();
+ }
+
+ static Class<?> getMethodReturnType(Method m) {
+ XmlJavaTypeAdapter adapter = getMethodXJTA(m);
+ Class<?> adapterType = getTypeFromXmlAdapter(adapter);
+ return adapterType != null ? adapterType : m.getReturnType();
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ static Object getFieldValue(Field f, Object target) throws Exception {
+ XmlJavaTypeAdapter adapterAnnotation = getFieldXJTA(f);
+ XmlAdapter adapter = getXmlAdapter(adapterAnnotation);
+ return adapter != null ? adapter.marshal(f.get(target)) : f.get(target);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ static Object getMethodValue(Method m, Object target) throws Exception {
+ XmlJavaTypeAdapter adapterAnnotation = getMethodXJTA(m);
+ XmlAdapter adapter = getXmlAdapter(adapterAnnotation);
+ return adapter != null ? adapter.marshal(m.invoke(target)) : m.invoke(target);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ static void setFieldValue(Field f, Object target, Object value) throws Exception {
+ XmlJavaTypeAdapter xjta = getFieldXJTA(f);
+ XmlAdapter adapter = getXmlAdapter(xjta);
+ f.set(target, adapter != null ? adapter.unmarshal(value) : value);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ static void setMethodValue(Method getter, Method setter, Object target, Object value) throws Exception {
+ XmlJavaTypeAdapter xjta = getMethodXJTA(getter);
+ XmlAdapter adapter = getXmlAdapter(xjta);
+ setter.invoke(target, adapter != null ? adapter.unmarshal(value) : value);
+ }
+
+ @SuppressWarnings("rawtypes")
+ static XmlAdapter getXmlAdapter(XmlJavaTypeAdapter adapterAnnotation)
+ throws InstantiationException, IllegalAccessException {
+ return adapterAnnotation != null ? adapterAnnotation.value().newInstance() : null;
+ }
+
+ static XmlJavaTypeAdapter getFieldXJTA(final Field f) {
+ XmlJavaTypeAdapter adapter = f.getAnnotation(XmlJavaTypeAdapter.class);
+ if (adapter == null) {
+ adapter = f.getType().getAnnotation(XmlJavaTypeAdapter.class);
+ }
+ if (adapter == null) {
+ XmlJavaTypeAdapters adapters =
+ f.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class);
+ if (adapters != null) {
+ for (XmlJavaTypeAdapter candidate : adapters.value()) {
+ if (candidate != null && candidate.type().equals(f.getType())) {
+ adapter = candidate;
+ break;
+ }
+ }
+ }
+ }
+ return adapter;
+ }
+
+ static XmlJavaTypeAdapter getMethodXJTA(final Method m) {
+ XmlJavaTypeAdapter adapter = m.getAnnotation(XmlJavaTypeAdapter.class);
+ if (adapter == null) {
+ Method setter = getSetter(m);
+ adapter = setter.getAnnotation(XmlJavaTypeAdapter.class);
+ }
+ if (adapter == null) {
+ adapter = m.getReturnType().getAnnotation(XmlJavaTypeAdapter.class);
+ }
+ if (adapter == null) {
+ XmlJavaTypeAdapters adapters =
+ m.getDeclaringClass().getPackage().getAnnotation(XmlJavaTypeAdapters.class);
+ if (adapters != null) {
+ for (XmlJavaTypeAdapter candidate : adapters.value()) {
+ if (candidate != null && candidate.type().equals(m.getGenericReturnType())) {
+ adapter = candidate;
+ break;
+ }
+ }
+ }
+ }
+ return adapter;
+ }
+
+ static Class<?> getTypeFromXmlAdapter(XmlJavaTypeAdapter xjta) {
+ if (xjta != null) {
+ Class<?> c2 = xjta.value();
+ Type sp = c2.getGenericSuperclass();
+ while (!XmlAdapter.class.equals(c2) && c2 != null) {
+ sp = c2.getGenericSuperclass();
+ c2 = c2.getSuperclass();
+ }
+ if (sp instanceof ParameterizedType) {
+ return (Class<?>)((ParameterizedType)sp).getActualTypeArguments()[0];
+ }
+ }
+ return null;
+ }
+
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java 2013-01-11 23:52:05 UTC (rev 17235)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tools.fortest.exception;
-
-import javax.jws.WebService;
-
-@WebService(targetNamespace = "http://cxf.apache.org/test/HelloService", name = "HelloService")
-public interface Echo {
- String echo(String request) throws MyException;
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java (from rev 17235, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://cxf.apache.org/test/HelloService", name = "HelloService")
+public interface Echo {
+ String echo(String request) throws MyException;
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java 2013-01-11 23:52:05 UTC (rev 17235)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tools.fortest.exception;
-
-import javax.jws.WebService;
-
-@WebService(serviceName = "HelloService",
- portName = "HelloPort",
- endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo",
- targetNamespace = "http://cxf.apache.org/test/HelloService")
-public class EchoImpl {
- public String echo(String request) throws MyException {
- return "Response";
-
- }
-
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java (from rev 17235, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/EchoImpl.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+import javax.jws.WebService;
+
+@WebService(serviceName = "HelloService",
+ portName = "HelloPort",
+ endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo",
+ targetNamespace = "http://cxf.apache.org/test/HelloService")
+public class EchoImpl {
+ public String echo(String request) throws MyException {
+ return "Response";
+
+ }
+
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java 2013-01-11 23:52:05 UTC (rev 17235)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tools.fortest.exception;
-
-import javax.xml.bind.annotation.XmlType;
-
-(a)javax.xml.ws.WebFault
-@XmlType(namespace = "http://cxf.apache.org/test/HelloService",
- name = "MyException",
- propOrder = { "summary", "from", "id" })
-public class MyException extends SuperException {
- private static final long serialVersionUID = 8575109064272599936L;
- private String summary;
- private String from;
-
- public MyException(String message) {
- super(message);
- }
-
- public void setSummary(String summary) {
- this.summary = summary;
- }
-
- public void setFrom(String from) {
- this.from = from;
- }
-
- public String getSummary() {
- return summary;
- }
-
- public String getFrom() {
- return from;
- }
-
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java (from rev 17235, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/MyException.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+import javax.xml.bind.annotation.XmlType;
+
+(a)javax.xml.ws.WebFault
+@XmlType(namespace = "http://cxf.apache.org/test/HelloService",
+ name = "MyException",
+ propOrder = { "summary", "from", "id" })
+public class MyException extends SuperException {
+ private static final long serialVersionUID = 8575109064272599936L;
+ private String summary;
+ private String from;
+
+ public MyException(String message) {
+ super(message);
+ }
+
+ public void setSummary(String summary) {
+ this.summary = summary;
+ }
+
+ public void setFrom(String from) {
+ this.from = from;
+ }
+
+ public String getSummary() {
+ return summary;
+ }
+
+ public String getFrom() {
+ return from;
+ }
+
+}
Deleted: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java 2013-01-11 23:52:05 UTC (rev 17235)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.tools.fortest.exception;
-
-public class SuperException extends Exception {
- private static final long serialVersionUID = 1L;
- private int id;
-
- public SuperException(String message) {
- super(message);
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public int getId() {
- return id;
- }
-}
Copied: thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java (from rev 17235, thirdparty/cxf/branches/cxf-2.2.12-patch02_JBPAPP-10129/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java)
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/SuperException.java 2013-02-12 14:24:29 UTC (rev 17298)
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.fortest.exception;
+
+public class SuperException extends Exception {
+ private static final long serialVersionUID = 1L;
+ private int id;
+
+ public SuperException(String message) {
+ super(message);
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+}
11 years, 2 months
- 1
- 0
JBossWS SVN: r17297 - in stack/native/branches/jbossws-native-4.1.x/modules: resources/src/main/resources/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-12 08:20:24 -0500 (Tue, 12 Feb 2013)
New Revision: 17297
Modified:
stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml
stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
svn merge -r 17295:17296 https://svn.jboss.org/repos/jbossws/stack/native/trunk .
Modified: stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-12 09:03:50 UTC (rev 17296)
+++ stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-12 13:20:24 UTC (rev 17297)
@@ -39,11 +39,16 @@
<taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/>
<antcall target="deploy-jbossws-native-modules" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss713"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss713">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -61,11 +66,16 @@
<taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/>
<antcall target="deploy-jbossws-native-modules" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss720"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules/system/layers/base">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss720">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -94,7 +104,7 @@
<target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713">
<fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -114,8 +124,8 @@
</fileset>
</copy>
<!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss720.home}/modules">
- <fileset dir="${deploy.structure}/modules">
+ <installModules targetDir="${jboss720.home}/modules/system/layers/base/">
+ <fileset dir="${deploy.structure}/modules/system/layers/base">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
@@ -123,7 +133,7 @@
<target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720">
<fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss720.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
</project>
Modified: stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-12 09:03:50 UTC (rev 17296)
+++ stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-12 13:20:24 UTC (rev 17297)
@@ -78,11 +78,6 @@
<exclude name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
- <copy toDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -100,7 +95,7 @@
<target name="deploy-jbossws-native-modules">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
+ <macro-deploy-jbossws-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
</target>
<!-- ================================================================== -->
@@ -113,23 +108,22 @@
<attribute name="modifyjbossintegration"/>
<sequential>
- <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
+ <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
<loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/>
- <property name="jboss.modules" value="@{targetdir}/modules"/>
-
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}">
+ <fileset dir="@{targetdir}">
<include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
</fileset>
</delete>
+ <property name="jboss.modules" value="@{targetdir}"/>
<antcall target="remove-jboss-integration-module">
<param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
</antcall>
<!-- delete content of last deployment -->
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}" includes="${jbossws.modules.conf}"/>
+ <fileset dir="@{targetdir}" includes="${jbossws.modules.conf}"/>
</delete>
</sequential>
</macrodef>
11 years, 2 months
- 1
- 0
JBossWS SVN: r17296 - in stack/native/trunk/modules: resources/src/main/resources/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-12 04:03:50 -0500 (Tue, 12 Feb 2013)
New Revision: 17296
Modified:
stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Changes on deployment macros to copy modules' content on new AS720 structure (see AS7-6344)
Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-12 08:13:20 UTC (rev 17295)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-12 09:03:50 UTC (rev 17296)
@@ -39,11 +39,16 @@
<taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/>
<antcall target="deploy-jbossws-native-modules" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss713"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss713">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -61,11 +66,16 @@
<taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/>
<antcall target="deploy-jbossws-native-modules" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss720"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules/system/layers/base">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss720">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -94,7 +104,7 @@
<target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713">
<fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -114,8 +124,8 @@
</fileset>
</copy>
<!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss720.home}/modules">
- <fileset dir="${deploy.structure}/modules">
+ <installModules targetDir="${jboss720.home}/modules/system/layers/base/">
+ <fileset dir="${deploy.structure}/modules/system/layers/base">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
@@ -123,7 +133,7 @@
<target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720">
<fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss720.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
</project>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-12 08:13:20 UTC (rev 17295)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-12 09:03:50 UTC (rev 17296)
@@ -78,11 +78,6 @@
<exclude name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
- <copy toDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -100,7 +95,7 @@
<target name="deploy-jbossws-native-modules">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
+ <macro-deploy-jbossws-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
</target>
<!-- ================================================================== -->
@@ -113,23 +108,22 @@
<attribute name="modifyjbossintegration"/>
<sequential>
- <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
+ <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
<loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/>
- <property name="jboss.modules" value="@{targetdir}/modules"/>
-
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}">
+ <fileset dir="@{targetdir}">
<include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
</fileset>
</delete>
+ <property name="jboss.modules" value="@{targetdir}"/>
<antcall target="remove-jboss-integration-module">
<param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
</antcall>
<!-- delete content of last deployment -->
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}" includes="${jbossws.modules.conf}"/>
+ <fileset dir="@{targetdir}" includes="${jbossws.modules.conf}"/>
</delete>
</sequential>
</macrodef>
11 years, 2 months
- 1
- 0
JBossWS SVN: r17295 - stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-12 03:13:20 -0500 (Tue, 12 Feb 2013)
New Revision: 17295
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
Log:
Fixing regression due to previous merge
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-02-11 09:57:59 UTC (rev 17294)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-02-12 08:13:20 UTC (rev 17295)
@@ -27,6 +27,8 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.stack.cxf.CXFInstanceProvider;
+import org.jboss.wsf.stack.cxf.Messages;
+import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
/**
@@ -39,6 +41,7 @@
@Override
public void start(final Deployment dep)
{
+ boolean springAvailable = SpringUtils.isSpringAvailable();
for (final Endpoint ep : dep.getService().getEndpoints())
{
final ServerFactoryBean factory = ep.getAttachment(ServerFactoryBean.class);
11 years, 2 months
- 1
- 0
JBossWS SVN: r17294 - framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1611.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-11 04:57:59 -0500 (Mon, 11 Feb 2013)
New Revision: 17294
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java
Log:
Synch test with upstream (cfr shared-testsuite rev. 16643)
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java 2013-02-11 09:47:10 UTC (rev 17293)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java 2013-02-11 09:57:59 UTC (rev 17294)
@@ -26,6 +26,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.Action;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
@@ -41,6 +42,7 @@
@Resource
WebServiceContext wsctx;
+ @Action(input="uri:placeBuyOrder")
@WebMethod
public String ping()
{
11 years, 2 months
- 1
- 0
JBossWS SVN: r17293 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-02-11 04:47:10 -0500 (Mon, 11 Feb 2013)
New Revision: 17293
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10628/
Log:
[JBPAPP-10628] Create one off patch branch
11 years, 2 months
- 1
- 0
JBossWS SVN: r17292 - in thirdparty/cxf/branches/cxf-2.2.12: api and 88 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 11:28:36 -0500 (Fri, 08 Feb 2013)
New Revision: 17292
Modified:
thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-test/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml
thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml
Log:
Bump up version to 2.2.12-patch-07-SNAPSHOT as patch06 has already been taken by productization
Modified: thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/api/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,13 +22,13 @@
<artifactId>cxf-api</artifactId>
<packaging>jar</packaging>
<name>Apache CXF API</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/buildtools/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -20,13 +20,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-buildtools</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Buildtools</name>
<url>http://cxf.apache.org</url>
<packaging>jar</packaging>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/common/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Common Utilities</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Common</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/schemas/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,13 +22,13 @@
<artifactId>cxf-common-schemas</artifactId>
<packaging>jar</packaging>
<name>Apache CXF Common Schemas</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org/</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/wstx-msv-validation/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xerces-xsd-validation/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,13 +22,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xerces-xsd-validation</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XML Schema Validation with Xerces</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC Boolean Getter Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/boolean-test/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC Boolean Getter Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/bug671/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-bug671</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC Plugin To Workaround JAXB Bug 671</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/dv-test/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-dv-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC Default Value Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC Plugins</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-ts</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC toString Plugin</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xjc/ts-test/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-ts-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XJC toString Plugin Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/common/xsd/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-xsd</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Common XSD2Java Plugins</name>
<url>http://cxf.apache.org</url>
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/all/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle</artifactId>
<packaging>bundle</packaging>
<name>Apache CXF Bundle Jar</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<properties>
<bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/jaxrs/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle-jaxrs</artifactId>
<packaging>bundle</packaging>
<name>Apache CXF JAX-RS Bundle Jar</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<properties>
<bundle.symbolic.name>${project.groupId}.bundle-jaxrs</bundle.symbolic.name>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/minimal/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle-minimal</artifactId>
<packaging>bundle</packaging>
<name>Apache CXF Minimal Bundle Jar</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<properties>
<bundle.symbolic.name>${project.groupId}.bundle-minimal</bundle.symbolic.name>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/bundle/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -23,13 +23,13 @@
<artifactId>cxf-bundle-parent</artifactId>
<packaging>pom</packaging>
<name>Apache CXF Bundle Parent</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/manifest/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -23,13 +23,13 @@
<artifactId>cxf-distribution-manifest</artifactId>
<packaging>jar</packaging>
<name>Apache CXF Manifest Jar</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/distribution/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,13 +22,13 @@
<artifactId>apache-cxf</artifactId>
<packaging>pom</packaging>
<name>Apache CXF Distribution</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/integration/jbi/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-jbi</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF JBI Integration</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/integration/jca/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-jca</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF JCA Connection</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/integration/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Integration</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.archetype</groupId>
<artifactId>cxf-jaxws-javafirst</artifactId>
<name>Apache CXF Archetype - Simple JAX-WS Java First</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<properties>
<maven.test.skip>true</maven.test.skip>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/archetypes/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-archetypes</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Maven Archetypes</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/codegen-plugin/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,7 +22,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Code Generation Maven2 Plugins</name>
<url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/corba/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-corbatools-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF CORBA Tools Maven2 Plugins</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/java2ws-plugin/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,7 +22,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-java2ws-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Java2WS Maven2 Plugin</name>
<url>http://cxf.apache.org</url>
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-maven-plugins</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Maven Plugins</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/wsdl-validator-plugin/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -3,7 +3,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-wsdl-validator-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF WSDL Validator Maven2 Plugin</name>
<url>http://cxf.apache.org</url>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-plugin/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,7 +22,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xml2fastinfoset-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF XML to FastInfoset Maven2 Plugin</name>
<url>http://cxf.apache.org</url>
<prerequisites>
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-test/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/maven-plugins/xml2fastinfoset-test/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<dependencies>
Modified: thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/parent/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -20,13 +20,13 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Parent</name>
<url>http://cxf.apache.org</url>
Modified: thirdparty/cxf/branches/cxf-2.2.12/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF</name>
<description>Apache CXF is an open-source services framework that aids in
the development of services using front-end programming APIs, like JAX-WS
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/coloc/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/corba/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/http/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/jbi/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/object/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/soap/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/bindings/xml/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/core/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime Core</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/aegis/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/xmlbeans/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxrs/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime JAX-RS Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime JAX-WS Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/js/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-js</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime JavaScript Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/simple/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime Simple Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/javascript/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/management/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime Management</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/testsupport/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -3,14 +3,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-testsupport</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Test Case Support</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-jetty/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime HTTP Jetty Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/http-osgi/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-osgi</artifactId>
<packaging>bundle</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF HTTP Transport for OSGi</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jbi/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jbi</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime JBI Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/jms/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime JMS Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/transports/local/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Runtime Local Transport</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/addr/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/rm/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<repositories>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/databinding/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-databinding</artifactId>
<name>Apache CXF Databinding System Tests</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxrs/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-jaxrs</artifactId>
<name>Apache CXF JAX-RS System Tests</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-jaxws</artifactId>
<name>Apache CXF JAX-WS System Tests</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF System Tests</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/transports/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-transports</artifactId>
<name>Apache CXF Transport System Tests</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/uncategorized/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-uncategorized</artifactId>
<name>Apache CXF Uncategorized System Tests</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/ws-specs/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<parent>
<artifactId>cxf-parent</artifactId>
<groupId>org.apache.cxf</groupId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests-ws-specs</artifactId>
<name>Apache CXF WS-* Specifications System Tests</name>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<url>http://cxf.apache.org</url>
<build>
<plugins>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/codegen/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-codegen</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Test for reading wsdl from repo and generating code from it</name>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<build>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/java2ws/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-java2ws</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Test for writing wsdl to repo</name>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
<build>
Modified: thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/wsdl_maven/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-wsdl-maven</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF System Tests for WSDL generation and retrieval</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf.systests</groupId>
<artifactId>cxf-systests</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/testutils/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Test Utilities</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/common/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools Common</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/corba/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -22,14 +22,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-corba</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools CORBA</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-javato</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools JavaTo</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/javato/ws/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools JavaTo WS</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/validator/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-validator</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools Validator</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/core/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo Core</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/databinding/jaxb/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo JAXB Databinding</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/javascript/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-frontend-javascript</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDL to JavaScript Front End</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo JAXWS Frontend</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/misc/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-misctools</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo Misctools</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto</artifactId>
<packaging>pom</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
</parent>
<modules>
Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml 2013-02-08 16:14:15 UTC (rev 17291)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/pom.xml 2013-02-08 16:28:36 UTC (rev 17292)
@@ -21,14 +21,14 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-test</artifactId>
<packaging>jar</packaging>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<name>Apache CXF Command Line Tools WSDLTo Test</name>
<url>http://cxf.apache.org</url>
<parent>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-parent</artifactId>
- <version>2.2.12-patch-06-SNAPSHOT</version>
+ <version>2.2.12-patch-07-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
11 years, 3 months
- 1
- 0
JBossWS SVN: r17291 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/dist/src/main/distro and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 11:14:15 -0500 (Fri, 08 Feb 2013)
New Revision: 17291
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java
Log:
Merged revisions 17260,17277 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17260 | alessio.soldano(a)jboss.com | 2013-01-25 19:21:16 +0100 (Fri, 25 Jan 2013) | 2 lines
Minor cleanups
.......
r17277 | alessio.soldano(a)jboss.com | 2013-02-07 19:29:48 +0100 (Thu, 07 Feb 2013) | 2 lines
Changes on deployment macros to copy modules' content on new AS720 structure (see AS7-6344)
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Modified: svnmerge-integrated
- /stack/cxf/trunk:1-17199,17279
+ /stack/cxf/trunk:1-17199,17260-17277,17279
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17279
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17260-17277,17279
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-08 16:08:31 UTC (rev 17290)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-08 16:14:15 UTC (rev 17291)
@@ -46,11 +46,16 @@
</fileset>
</jandex>
<antcall target="deploy-jbossws-cxf-modules" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss710"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss710">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -79,7 +84,7 @@
<target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
<fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss711.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -108,7 +113,7 @@
<target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712">
<fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss712.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -137,7 +142,7 @@
<target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713">
<fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -162,11 +167,16 @@
</fileset>
</jandex>
<antcall target="deploy-jbossws-cxf-modules" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss720"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules/system/layers/base">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss720">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -186,8 +196,8 @@
</fileset>
</copy>
<!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss720.home}/modules">
- <fileset dir="${deploy.structure}/modules">
+ <installModules targetDir="${jboss720.home}/modules/system/layers/base/">
+ <fileset dir="${deploy.structure}/modules/system/layers/base">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
@@ -195,7 +205,7 @@
<target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720">
<fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss720.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
</target>
<!-- ================================================================== -->
@@ -211,7 +221,7 @@
<target name="install-spring-module71x" if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="modules-jbossid" value="jboss710"/>
</antcall>
@@ -219,7 +229,7 @@
<target name="install-spring-module72x" if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
+ <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="modules-jbossid" value="jboss720"/>
</antcall>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-08 16:08:31 UTC (rev 17290)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-08 16:14:15 UTC (rev 17291)
@@ -142,11 +142,6 @@
<exclude name="**/spring/**/module.xml"/>
</fileset>
</installModules>
- <copy toDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -164,7 +159,7 @@
<target name="deploy-jbossws-cxf-modules">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
+ <macro-deploy-jbossws-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
</target>
<!-- ================================================================== -->
@@ -194,7 +189,7 @@
<target name="deploy-spring-module">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-install-spring-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" modules-jbossid="${modules-jbossid}"/>
+ <macro-install-spring-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" modules-jbossid="${modules-jbossid}"/>
</target>
<!-- ================================================================== -->
@@ -207,24 +202,23 @@
<attribute name="modifyjbossintegration"/>
<sequential>
- <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
+ <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/>
<loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/>
- <property name="jboss.modules" value="@{targetdir}/modules"/>
-
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}">
+ <fileset dir="@{targetdir}">
<include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
<include name="**/org/jboss/as/webservices/main/jbossws-jboss*"/>
</fileset>
</delete>
+ <property name="jboss.modules" value="@{targetdir}"/>
<antcall target="remove-jboss-integration-module">
<param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
</antcall>
<!-- delete content of last deployment -->
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}" includes="${jbossws.modules.conf}"/>
+ <fileset dir="@{targetdir}" includes="${jbossws.modules.conf}"/>
</delete>
</sequential>
</macrodef>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2013-02-08 16:08:31 UTC (rev 17290)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2013-02-08 16:14:15 UTC (rev 17291)
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-02-08 16:08:31 UTC (rev 17290)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-02-08 16:14:15 UTC (rev 17291)
@@ -27,8 +27,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.stack.cxf.CXFInstanceProvider;
-import org.jboss.wsf.stack.cxf.Messages;
-import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
/**
@@ -41,7 +39,6 @@
@Override
public void start(final Deployment dep)
{
- boolean springAvailable = SpringUtils.isSpringAvailable();
for (final Endpoint ep : dep.getService().getEndpoints())
{
final ServerFactoryBean factory = ep.getAttachment(ServerFactoryBean.class);
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java 2013-02-08 16:08:31 UTC (rev 17290)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java 2013-02-08 16:14:15 UTC (rev 17291)
@@ -27,8 +27,8 @@
import org.apache.cxf.ws.addressing.soap.MAPCodec;
/**
- * This intercetpor adds the context property decoupled_fault_support
- * to enable decoupled faultTo. This is an optinal feature in cxf and we
+ * This interceptor adds the context property decoupled_fault_support
+ * to enable decoupled faultTo. This is an optional feature in cxf and we
* need this to be default to make it same behavior with native stack.
* @author <a href="mailto:ema@redhat.com>Jim Ma</a>
*/
11 years, 3 months
- 1
- 0
JBossWS SVN: r17290 - stack/cxf/branches/jbossws-cxf-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 11:08:31 -0500 (Fri, 08 Feb 2013)
New Revision: 17290
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
Log:
Movint to latest shared-testsuite snapshot
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-08 16:06:37 UTC (rev 17289)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-08 16:08:31 UTC (rev 17290)
@@ -63,7 +63,7 @@
<jbossws.spi.version>2.1.1.Final</jbossws.spi.version>
<jbossws.common.version>2.1.1.Final</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.1.1.Final</jbossws.shared.testsuite.version>
+ <jbossws.shared.testsuite.version>4.1.2-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss711.version>4.1.1.Final</jbossws.jboss711.version>
<jbossws.jboss712.version>4.1.1.Final</jbossws.jboss712.version>
<jbossws.jboss713.version>4.1.1.Final</jbossws.jboss713.version>
11 years, 3 months
- 1
- 0
JBossWS SVN: r17289 - shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 11:06:37 -0500 (Fri, 08 Feb 2013)
New Revision: 17289
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Further changes related to AS7-6344 to fix binary distribution testsuite
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-08 15:48:20 UTC (rev 17288)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-08 16:06:37 UTC (rev 17289)
@@ -107,11 +107,6 @@
<property name="jboss.lib" value="${jboss.home}/lib"/>
- <!-- Java Endorsed -->
- <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
- <isset property="jboss.home"/>
- </condition>
-
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -138,6 +133,11 @@
<target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x">
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
+ <isset property="jboss.home"/>
+ </condition>
+
<path id="integration.target.javac.classpath">
<fileset dir="${jboss.home}/modules/javax/activation/api/main/">
<include name="activation-*.jar"/>
@@ -293,32 +293,37 @@
<target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x">
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/">
+ <isset property="jboss.home"/>
+ </condition>
+
<path id="integration.target.javac.classpath">
- <fileset dir="${jboss.home}/modules/javax/activation/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/">
<include name="activation-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
<include name="mail-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
<include name="jboss-common-core-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
<include name="picketlink-core*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
<include name="jboss-ejb-api_3.1_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb3/main/">
<include name="jboss-ejb3-ext-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/annotation/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/">
<include name="jboss-annotations-api_1.1_spec-*.jar"/>
</fileset>
</path>
@@ -336,110 +341,110 @@
<pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
<pathelement location="${jboss.home}/jboss-modules.jar"/>
- <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller/main/">
<include name="jboss-as-controller-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/">
<include name="jboss-as-controller-client-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/">
<include name="jboss-as-server-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/">
<include name="jboss-as-protocol-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/">
<include name="jboss-dmr-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/">
<include name="jboss-marshalling-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/">
<include name="slf4j-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/">
<include name="jcl-over-slf4j-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/">
<include name="slf4j-jboss-logmanager-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/">
<include name="jboss-logmanager-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/log4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/log4j/main/">
<include name="log4j-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
<include name="mail-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/transaction/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/">
<include name="jboss-transaction-api_1.1_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/threads/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/">
<include name="jboss-threads-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketbox/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/">
<include name="picketbox-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
<include name="picketlink-core*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
<include name="jboss-ejb-api_3.1_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb-client/main/">
<include name="jboss-ejb-client-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xerces/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/">
<include name="xercesImpl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
<include name="jboss-common-core-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/javassist/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/javassist/main/">
<include name="javassist-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/security/jacc/api/main/">
<include name="jboss-jacc-api*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting3/main/">
<include name="jboss-remoting-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/river/main/">
<include name="jboss-marshalling-river-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remoting-jmx/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/">
<include name="remoting-jmx-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/netty/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/netty/main/">
<include name="netty-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/">
<include name="jbossxb-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/joda/time/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/">
<include name="joda-time-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xalan/main/">
<include name="serializer-*.jar"/>
<include name="xalan-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/">
<include name="xnio-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/">
<include name="xnio-nio-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/">
<include name="jboss-remote-naming-*.jar"/>
</fileset>
<pathelement location="${tools.jar}"/>
11 years, 3 months
- 1
- 0