cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmo...@apache.org
Subject svn commit: r979862 [2/19] - in /cxf/sandbox/oauth_1.0a: ./ api/ api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/ws/addressing/ api/src/main/java/org/...
Date Tue, 27 Jul 2010 20:47:12 GMT
Modified: cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/endpoint/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/endpoint/Client.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/endpoint/Client.java (original)
+++ cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/endpoint/Client.java Tue Jul 27 20:46:55 2010
@@ -119,7 +119,7 @@ public interface Client extends Intercep
      * @param params  The params that matches the parts of the input message of the operation.  If the 
      * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form.  If 
      * params are in the wrapped form, use invokeWrapped
-     * @return The return values that matche the parts of the output message of the operation
+     * 
      */
     void invoke(ClientCallback callback,
                     String operationName,
@@ -132,7 +132,7 @@ public interface Client extends Intercep
      * @param params  The params that matches the parts of the input message of the operation.  If the 
      * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form.  If 
      * params are in the wrapped form, use invokeWrapped
-     * @return The return values that matche the parts of the output message of the operation
+     * 
      */
     void invoke(ClientCallback callback,
                     QName operationName,
@@ -145,7 +145,7 @@ public interface Client extends Intercep
      * @param operationName The name of the operation to be invoked. The service namespace will be used
      * when looking up the BindingOperationInfo.
      * @param params  The params that matches the parts of the input message of the operation
-     * @return The return values that matche the parts of the output message of the operation
+     *
      */
     void invokeWrapped(ClientCallback callback,
                            String operationName,
@@ -156,7 +156,7 @@ public interface Client extends Intercep
      * @param callback The callback that is called when the response is ready
      * @param operationName The name of the operation to be invoked
      * @param params  The params that matches the parts of the input message of the operation
-     * @return The return values that matche the parts of the output message of the operation
+     * 
      */
     void invokeWrapped(ClientCallback callback,
                            QName operationName,
@@ -167,11 +167,50 @@ public interface Client extends Intercep
      * @param callback The callback that is called when the response is ready
      * @param oi  The operation to be invoked
      * @param params  The params that matches the parts of the input message of the operation
-     * @return The return values that matche the parts of the output message of the operation
+     *
+     */
+    void invoke(ClientCallback callback,
+                BindingOperationInfo oi,
+                Object... params) throws Exception;
+    
+    /**
+     * Invokes an operation asynchronously
+     * @param callback The callback that is called when the response is ready
+     * @param oi  The operation to be invoked
+     * @param params  The params that matches the parts of the input message of the operation
+     * @param context contextual information for the invocation
+     */
+    void invoke(ClientCallback callback,
+                BindingOperationInfo oi,
+                Object[] params,
+                Map<String, Object> context) throws Exception;  
+    
+    /**
+     * Invokes an operation asynchronously
+     * @param callback The callback that is called when the response is ready
+     * @param oi  The operation to be invoked
+     * @param params  The params that matches the parts of the input message of the operation
+     * @param exchange The Exchange to be used for the invocation
+     *
+     */
+    void invoke(ClientCallback callback,
+                BindingOperationInfo oi,
+                Object[] params,
+                Exchange exchange) throws Exception;  
+    
+    /**
+     * Invokes an operation asynchronously
+     * @param callback The callback that is called when the response is ready
+     * @param oi  The operation to be invoked
+     * @param params  The params that matches the parts of the input message of the operation
+     * @param context  Optional (can be null) contextual information for the invocation
+     * @param exchange Optional (can be null) The Exchange to be used for the invocation  
      */
     void invoke(ClientCallback callback,
                 BindingOperationInfo oi,
-                Object... params) throws Exception;    
+                Object[] params,
+                Map<String, Object> context,
+                Exchange exchange) throws Exception;  
     
     
     /**

Modified: cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Tue Jul 27 20:46:55 2010
@@ -31,6 +31,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
@@ -613,7 +614,11 @@ public class PhaseInterceptorChain imple
             } else {
                 chain.append(", ");
             }
-            chain.append(i.interceptor.getClass().getSimpleName());
+            String nm = i.interceptor.getClass().getSimpleName();
+            if (StringUtils.isEmpty(nm)) {
+                nm = i.interceptor.getId();
+            }
+            chain.append(nm);
             i = i.next;
         }
         chain.append("]\n");

Modified: cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/sandbox/oauth_1.0a/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Tue Jul 27 20:46:55 2010
@@ -46,12 +46,9 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
@@ -235,8 +232,10 @@ public final class EndpointReferenceUtil
     private static final Logger LOG = LogUtils.getL7dLogger(EndpointReferenceUtils.class);
 
     private static final String NS_WSAW_2005 = "http://www.w3.org/2005/02/addressing/wsdl";
-    private static final String WSDL_INSTANCE_NAMESPACE = 
+    private static final String WSDL_INSTANCE_NAMESPACE2 = 
         "http://www.w3.org/2006/01/wsdl-instance";
+    private static final String WSDL_INSTANCE_NAMESPACE = 
+            "http://www.w3.org/ns/wsdl-instance";
     
     private static final QName WSA_WSDL_NAMESPACE_NS =
         new QName("xmlns:" + JAXWSAConstants.WSAW_PREFIX);
@@ -247,6 +246,8 @@ public final class EndpointReferenceUtil
         new QName("xmlns:" + XML_SCHEMA_NAMESPACE_PREFIX);
     private static final String XML_SCHEMA_INSTANCE_NAMESPACE =
         "http://www.w3.org/2001/XMLSchema-instance";
+    private static final QName WSDL_LOCATION2 =
+        new QName(WSDL_INSTANCE_NAMESPACE2, "wsdlLocation");
     private static final QName WSDL_LOCATION =
         new QName(WSDL_INSTANCE_NAMESPACE, "wsdlLocation");
     private static final QName XSI_TYPE = 
@@ -262,25 +263,6 @@ public final class EndpointReferenceUtil
         // Utility class - never constructed
     }
     
-    private static Transformer getTransformer() throws EndpointUtilsException {
-        //To Support IBM JDK 
-        //If use the default transformFactory ,org.apache.xalan.processor.TransformerFactoryImpl \
-        //when transform stuff will lost attributes 
-        if (System.getProperty("java.vendor").indexOf("IBM") > -1) {
-            System.setProperty("javax.xml.transform.TransformerFactory", 
-                               "org.apache.xalan.xsltc.trax.TransformerFactoryImpl");
-        }
-        
-        try {
-            return TransformerFactory.newInstance().newTransformer();
-        } catch (TransformerConfigurationException tce) {
-            throw new EndpointUtilsException(new Message("COULD_NOT_CREATE_TRANSFORMER", LOG),
-                                                         tce);
-        }
-        
-    }
-    
-    
     /**
      * Sets the service and port name of the provided endpoint reference. 
      * @param ref the endpoint reference.
@@ -533,6 +515,9 @@ public final class EndpointReferenceUtil
 
         if (metadata != null) {
             wsdlLocation = metadata.getOtherAttributes().get(WSDL_LOCATION);
+            if (wsdlLocation == null) {
+                wsdlLocation = metadata.getOtherAttributes().get(WSDL_LOCATION2);
+            }
         }
 
         if (null == wsdlLocation) {
@@ -579,8 +564,7 @@ public final class EndpointReferenceUtil
                     if (doTransform) {
                         DOMResult domResult = new DOMResult();
                         domResult.setSystemId(source.getSystemId());
-                        
-                        getTransformer().transform(source, domResult);
+                        node = StaxUtils.read(source);
     
                         node = domResult.getNode();
                     }
@@ -602,7 +586,7 @@ public final class EndpointReferenceUtil
                         anyList.add(node);
                     }
                 }
-            } catch (TransformerException te) {
+            } catch (XMLStreamException te) {
                 throw new EndpointUtilsException(new Message("COULD_NOT_POPULATE_EPR", LOG),
                                                  te);
             }

Modified: cxf/sandbox/oauth_1.0a/api/src/test/java/org/apache/cxf/NSManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/api/src/test/java/org/apache/cxf/NSManagerTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/api/src/test/java/org/apache/cxf/NSManagerTest.java (original)
+++ cxf/sandbox/oauth_1.0a/api/src/test/java/org/apache/cxf/NSManagerTest.java Tue Jul 27 20:46:55 2010
@@ -21,6 +21,8 @@ package org.apache.cxf;
 
 import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.ws.addressing.NSManager;
+
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: cxf/sandbox/oauth_1.0a/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/common/common/pom.xml Tue Jul 27 20:46:55 2010
@@ -90,14 +90,13 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
+            <version>1.2.16</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.5.11</version>
             <optional>true</optional>
         </dependency>
 
@@ -153,7 +152,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -162,6 +161,11 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-annotation_1.0_spec</artifactId>
                 </dependency>
                 <dependency>

Modified: cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original)
+++ cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Tue Jul 27 20:46:55 2010
@@ -95,8 +95,12 @@ public final class LogUtils {
                 }
             }
             if (!StringUtils.isEmpty(cname)) {
-                loggerClass = Class.forName(cname.trim(), true,
-                                            Thread.currentThread().getContextClassLoader());
+                try {
+                    loggerClass = Class.forName(cname.trim(), true,
+                                                Thread.currentThread().getContextClassLoader());
+                } catch (Throwable ex) {
+                    loggerClass = Class.forName(cname.trim());
+                }
                 getLogger(LogUtils.class).fine("Using " + loggerClass.getName() + " for logging.");
             }
         } catch (Throwable ex) {

Modified: cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java (original)
+++ cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java Tue Jul 27 20:46:55 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.common.util;
 
+import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -138,11 +139,10 @@ public class WeakIdentityHashMap<K, V> i
     }
 
     private synchronized void reap() {
-        Object zombie = queue.poll();
+        Reference<? extends K> zombie = queue.poll();
 
         while (zombie != null) {
-            IdentityWeakReference victim = (IdentityWeakReference)zombie;
-            backingStore.remove(victim);
+            backingStore.remove(zombie);
             zombie = queue.poll();
         }
     }

Modified: cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java (original)
+++ cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java Tue Jul 27 20:46:55 2010
@@ -35,6 +35,7 @@ public class DefaultResourceManager impl
 
     protected final List<ResourceResolver> registeredResolvers 
         = new CopyOnWriteArrayList<ResourceResolver>();
+    protected boolean firstCalled;
 
     public DefaultResourceManager() { 
         initializeDefaultResolvers(); 
@@ -47,8 +48,13 @@ public class DefaultResourceManager impl
     public DefaultResourceManager(List<? extends ResourceResolver> resolvers) {
         addResourceResolvers(resolvers);
     }
+    
+    protected void onFirstResolve() {
+        //nothing
+        firstCalled = true;
+    }
  
-    public final <T> T resolveResource(String name, Class<T> type) { 
+    public final <T> T resolveResource(String name, Class<T> type) {
         return findResource(name, type, false, registeredResolvers);
     } 
 
@@ -86,6 +92,9 @@ public class DefaultResourceManager impl
     
     private <T> T findResource(String name, Class<T> type, boolean asStream, 
                                List<ResourceResolver> resolvers) {
+        if (!firstCalled) {
+            onFirstResolve();
+        }
         if (resolvers == null) {
             resolvers = registeredResolvers;
         }

Modified: cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original)
+++ cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Tue Jul 27 20:46:55 2010
@@ -125,6 +125,10 @@ public class URIResolver {
     private void tryFileSystem(String baseUriStr, String uriStr) throws IOException, MalformedURLException {
         try {
             URI relative;
+
+            // It is possible that spaces have been encoded.  We should decode them first.
+            uriStr = uriStr.replaceAll("%20", " ");
+
             File uriFile = new File(uriStr);
             uriFile = new File(uriFile.getAbsolutePath());
 

Modified: cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/sandbox/oauth_1.0a/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Tue Jul 27 20:46:55 2010
@@ -360,6 +360,18 @@ public final class StaxUtils {
         }
         return false;
     }
+    public static void copy(Source source, OutputStream os) throws XMLStreamException {
+        XMLStreamWriter writer = createXMLStreamWriter(os);
+        try {
+            copy(source, writer);
+        } finally {
+            try {
+                writer.flush();
+            } catch (XMLStreamException ex) {
+                //ignore
+            }
+        }
+    }
     public static void copy(Source source, XMLStreamWriter writer) throws XMLStreamException {
         if (source instanceof SAXSource) {
             SAXSource ss = (SAXSource)source;
@@ -783,6 +795,42 @@ public final class StaxUtils {
         }        
     }
 
+    public static Document read(Source s) throws XMLStreamException {
+        XMLStreamReader reader = createXMLStreamReader(s);
+        try {
+            return read(reader);
+        } finally {
+            try {
+                reader.close();
+            } catch (Exception ex) {
+                //ignore
+            }
+        }
+    }
+    public static Document read(InputStream s) throws XMLStreamException {
+        XMLStreamReader reader = createXMLStreamReader(s);
+        try {
+            return read(reader);
+        } finally {
+            try {
+                reader.close();
+            } catch (Exception ex) {
+                //ignore
+            }
+        }
+    }
+    public static Document read(InputSource s) throws XMLStreamException {
+        XMLStreamReader reader = createXMLStreamReader(s);
+        try {
+            return read(reader);
+        } finally {
+            try {
+                reader.close();
+            } catch (Exception ex) {
+                //ignore
+            }
+        }
+    }
     public static Document read(XMLStreamReader reader) throws XMLStreamException {
         return read(reader, false);
     }
@@ -801,7 +849,8 @@ public final class StaxUtils {
     
     public static Document read(DocumentBuilder builder, XMLStreamReader reader, boolean repairing) 
         throws XMLStreamException {
-        Document doc = builder.newDocument();
+        
+        Document doc = builder == null ? DOMUtils.createDocument() : builder.newDocument();
         if (reader.getLocation().getSystemId() != null) {
             try {
                 doc.setDocumentURI(new String(reader.getLocation().getSystemId()));
@@ -886,7 +935,10 @@ public final class StaxUtils {
         if (e.getParentNode() instanceof Element) {
             return isDeclared((Element)e.getParentNode(), namespaceURI, prefix);
         }
-
+        if (StringUtils.isEmpty(prefix) && StringUtils.isEmpty(namespaceURI)) {
+            //A document that probably doesn't have any namespace qualifies elements
+            return true;
+        }
         return false;
     }
     public static void readDocElements(Node parent, XMLStreamReader reader, boolean repairing) 

Propchange: cxf/sandbox/oauth_1.0a/common/common/src/main/resources/
            ('svn:mergeinfo' removed)

Modified: cxf/sandbox/oauth_1.0a/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java (original)
+++ cxf/sandbox/oauth_1.0a/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java Tue Jul 27 20:46:55 2010
@@ -135,5 +135,19 @@ public class URIResolverTest extends Ass
         
     }
 
-
+    @Test
+    public void testBasePathWithSpace() throws Exception {
+        URIResolver wsdlResolver = new URIResolver();
+        // resolve the wsdl
+        wsdlResolver.resolve(null, "wsdl/folder with spaces/foo.wsdl", this.getClass());
+        assertTrue(wsdlResolver.isResolved());
+    }
+    
+    @Test
+    public void testBasePathWithEncodedSpace() throws Exception {
+        URIResolver wsdlResolver = new URIResolver();
+        // resolve the wsdl
+        wsdlResolver.resolve(null, "wsdl/folder%20with%20spaces/foo.wsdl", this.getClass());
+        assertTrue(wsdlResolver.isResolved());
+    }
 }

Modified: cxf/sandbox/oauth_1.0a/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/bundle/all/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/bundle/all/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/bundle/all/pom.xml Tue Jul 27 20:46:55 2010
@@ -31,6 +31,9 @@
         <artifactId>cxf-bundle-parent</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
+    <properties>
+         <bundle.symbolic.name>${project.groupId}.bundle</bundle.symbolic.name>
+     </properties>
 
     <dependencies>
         <dependency>
@@ -249,10 +252,10 @@
                         <Implementation-Title>Apache CXF</Implementation-Title>
                         <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                         <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                        <Implementation-Version>${project.version}</Implementation-Version>
+                        <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
                         <Specification-Title>Apache CXF</Specification-Title>
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                        <Specification-Version>${project.version}</Specification-Version>
+                        <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
                         <DynamicImport-Package>
                             com.sun.xml.bind.api,
                             com.sun.xml.bind.api.*,
@@ -267,6 +270,7 @@
                         <Import-Package>
                             !org.apache.cxf.*,
                             !META-INF.cxf,
+                            !META-INF.cxf.osgi,
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
@@ -277,10 +281,12 @@
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)",
-                            org.apache.abdera*;resolution:=optional,
-                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
+                            org.apache.mina*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.xml.security*;resolution:=optional,
@@ -292,19 +298,20 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",
                             javax.jms;resolution:=optional;version="[0.0,2)",
                             javax.jws*;version="[0.0,3)",
                             javax.mail*;version="[0.0,2)",
-                            javax.servlet.*;version="[0.0,3)",
+                            javax.servlet.*;version="[0.0,4)";resolution:=optional,
                             javax.xml.stream*;version="[0.0,2)",
                             javax.xml.ws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>
-                            org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
+                            org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
                             '=META-INF.cxf.osgi',
                             '=META-INF.cxf'
                         </Export-Package>

Modified: cxf/sandbox/oauth_1.0a/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/bundle/jaxrs/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/bundle/jaxrs/pom.xml Tue Jul 27 20:46:55 2010
@@ -31,6 +31,9 @@
         <artifactId>cxf-bundle-parent</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
+    <properties>
+         <bundle.symbolic.name>${project.groupId}.bundle-jaxrs</bundle.symbolic.name>
+     </properties>
 
 
     <dependencies>
@@ -109,10 +112,10 @@
                         <Implementation-Title>Apache CXF</Implementation-Title>
                         <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                         <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                        <Implementation-Version>${project.version}</Implementation-Version>
+                        <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
                         <Specification-Title>Apache CXF</Specification-Title>
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                        <Specification-Version>${project.version}</Specification-Version>
+                        <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
                         <DynamicImport-Package>
                             com.ctc.wstx.*,
                             org.apache.commons.logging.*,
@@ -123,6 +126,7 @@
                         <Import-Package>
                             !org.apache.cxf.*,
                             !META-INF.cxf,
+                            !META-INF.cxf.osgi,
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
@@ -132,9 +136,10 @@
                             javax.resource*;resolution:=optional,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)",
-                            org.apache.abdera*;resolution:=optional,
-                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
@@ -145,19 +150,20 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",
                             javax.jms;resolution:=optional;version="[0.0,2)",
                             javax.jws*;version="[0.0,3)",
                             javax.mail*;version="[0.0,2)",
-                            javax.servlet.*;version="[0.0,3)",
+                            javax.servlet.*;version="[0.0,4)";resolution:=optional,
                             javax.xml.stream*;version="[0.0,2)",
                             javax.xml.ws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>
-                            org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
+                            org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
                             '=META-INF.cxf.osgi',
                             '=META-INF.cxf'
                         </Export-Package>

Modified: cxf/sandbox/oauth_1.0a/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/bundle/minimal/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/bundle/minimal/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/bundle/minimal/pom.xml Tue Jul 27 20:46:55 2010
@@ -31,6 +31,9 @@
         <artifactId>cxf-bundle-parent</artifactId>
         <version>2.3.0-SNAPSHOT</version>
     </parent>
+    <properties>
+        <bundle.symbolic.name>${project.groupId}.bundle-minimal</bundle.symbolic.name>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -149,10 +152,10 @@
                         <Implementation-Title>Apache CXF</Implementation-Title>
                         <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
                         <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-                        <Implementation-Version>${project.version}</Implementation-Version>
+                        <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
                         <Specification-Title>Apache CXF</Specification-Title>
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
-                        <Specification-Version>${project.version}</Specification-Version>
+                        <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
                         <DynamicImport-Package>
                             com.ctc.wstx.*,
                             com.sun.xml.bind.api,
@@ -167,8 +170,9 @@
                         <Import-Package>
                             !org.apache.cxf.*,
                             !META-INF.cxf,
+                            !META-INF.cxf.osgi,
                             !schemas*,
-                            org.apache.cxf.tools.*;version=${project.version};resolution:=optional,
+                            org.apache.cxf.tools.*;version=${cxf.osgi.version.clean};resolution:=optional,
                             antlr*;resolution:=optional,
                             com.ibm*;resolution:=optional,
                             com.sun*;resolution:=optional,
@@ -179,10 +183,12 @@
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)",
-                            org.apache.abdera*;resolution:=optional,
-                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional;version="[1.0,2)",
+                            org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,
+                            org.apache.commons.pool*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
+                            org.apache.mina*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.xml.security*;resolution:=optional,
@@ -194,19 +200,20 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",
                             javax.jms;resolution:=optional;version="[0.0,2)",
                             javax.jws*;version="[0.0,3)",
                             javax.mail*;version="[0.0,2)",
-                            javax.servlet.*;version="[0.0,3)",
+                            javax.servlet.*;version="[0.0,4)";resolution:=optional,
                             javax.xml.stream*;version="[0.0,2)",
                             javax.xml.ws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>
-                            org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
+                            org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
                             '=META-INF.cxf',
                             '=META-INF.cxf.osgi',
                             '=schemas',

Modified: cxf/sandbox/oauth_1.0a/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/bundle/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/bundle/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/bundle/pom.xml Tue Jul 27 20:46:55 2010
@@ -49,6 +49,80 @@
 
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>create-prop</id>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <tasks>
+                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+                                <property name="mv" value="${project.version}" />
+                                <echo message="Maven version: ${mv}" />
+                                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+                                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+                                <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0" />
+                                <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue="" />
+                                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+                                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                                <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                                <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
+                                <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
+                                <property name="os" value="${ov.p1a}${ov.p2a}" />
+                                <echo message="OSGi version: ${ov}" />
+                                <mkdir dir="target" />
+                                <echo file="target/cxf.osgi.version.txt">
+cxf.osgi.version.clean = ${ov}
+cxf.schema.version = ${os}
+                                </echo>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>target/cxf.osgi.version.txt</file>
+                            </files>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifestEntries>
+                                <Bundle-SymbolicName>${bundle.symbolic.name}.source</Bundle-SymbolicName>
+                                <Eclipse-SourceBundle>${bundle.symbolic.name};version="${cxf.osgi.version.clean}"</Eclipse-SourceBundle>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -113,8 +187,8 @@
 
     <modules>
         <module>all</module>
-        <module>minimal</module> 
-        <module>jaxrs</module> 
-    </modules> 
+        <module>minimal</module>
+        <module>jaxrs</module>
+    </modules>
 
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/manifest/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/manifest/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/manifest/pom.xml Tue Jul 27 20:46:55 2010
@@ -272,7 +272,7 @@
         </dependency>
 
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>
         <dependency>
@@ -310,5 +310,17 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <jaxb.version>${jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+            </properties>
+        </profile>
+    </profiles>
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/pom.xml Tue Jul 27 20:46:55 2010
@@ -288,7 +288,7 @@
         </dependency>
 
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>
     </dependencies>
@@ -405,13 +405,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>process-sources-xsl</id>
@@ -461,4 +454,24 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <jaxb.version>${jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+            </properties>
+        </profile>
+        <profile>
+            <!-- build the samples as well to make sure they really do build -->
+            <id>everything</id>
+            <modules>
+                <module>src/main/release/samples</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/lib/WHICH_JARS?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/lib/WHICH_JARS Tue Jul 27 20:46:55 2010
@@ -23,7 +23,8 @@ The following jars are required for all 
 - jaxb-impl.jar (this is a [6] for normal runtime, but is required for 
                  tooling and the dynamic clients)
 - XmlSchema.jar
-- wstx-asl.jar  [6] or another StAX implementation
+- woodstox-core-asl.jar  [6] or another StAX implementation
+- stax2-api-3.0.1.jar [6] for woodstox above
 - wsdl4j.jar
 
 The following jars are required for XML catalog support:
@@ -33,12 +34,13 @@ For Java2WSDL and WSDL2Java:
 - The above jars
 - jaxb-xjc.jar
 - velocity.jar
+- oro.jar
 - commons-collections.jar
 - commons-lang.jar
 
 For JAX-WS support:
 - geronimo-ws-metadata.jar [6]
-- geronimo-jaxws_2.1_spec-1.0.jar (Or the Sun equivalent) [6]
+- geronimo-jaxws_2.2_spec-1.0.jar (Or the Sun equivalent) [6]
 - saaj-api.jar [6]
 - saaj-impl.jar [6]
 - asm.jar (semi-optional, helps with performance of wrapper types and is 
@@ -55,8 +57,7 @@ For XML Configuration support:
 
 For standalone HTTP support:
 - geronimo-servlet.jar
-- jetty.jar
-- jetty-util.jar
+- jetty-*.jar
 - sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
  
 For Aegis support:
@@ -82,6 +83,7 @@ For JAX-RS support:
 For JMS transport
 - geronimo-jms.jar (Or the Sun equivalent)
 - spring-jms.jar
+- spring-tx.jar
 
 For CORBA support:
 - antlr.jar

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,11 +20,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>aegis</artifactId>
-    <version>1.0</version>
     <name>CXF sample using code first POJO's and the Aegis Binding</name>
+
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
+
     <build>
         <resources>
             <resource>
@@ -32,14 +39,23 @@
             </resource>
         </resources>
         <sourceDirectory>src</sourceDirectory>
+	<testSourceDirectory>testSrc</testSourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+		<version>2.3.1</version>
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<forkMode>always</forkMode>
+				</configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -89,35 +105,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -135,11 +122,17 @@
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-        <!-- Jetty is needed if you're using the CXFServlet -->
+        <!-- The server example in here launches the embedded jetty. Not needed
+	     if you deploy a WAR. -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+	<dependency>
+	  <groupId>junit</groupId>
+	  <artifactId>junit</artifactId>
+	  <version>4.8.1</version>
+	</dependency>
     </dependencies>
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/client/Client.java Tue Jul 27 20:46:55 2010
@@ -21,6 +21,7 @@ package demo.hw.client;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Text;
 
 import org.apache.cxf.aegis.databinding.AegisDatabinding;
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
@@ -48,7 +49,7 @@ public final class Client {
         Document doc = client.getADocument();
         Element e = (Element) doc.getFirstChild();
         System.out.println(e.getTagName());
-        e = (Element) e.getFirstChild();
-        System.out.println(e.getTagName());
+        Text t = (Text) e.getFirstChild();
+        System.out.println(t);
     }
 }

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis/src/demo/hw/server/Server.java Tue Jul 27 20:46:55 2010
@@ -24,7 +24,7 @@ import org.apache.cxf.frontend.ServerFac
 
 public class Server {
 
-    protected Server() throws Exception {
+    public Server() throws Exception {
         HelloWorldImpl helloworldImpl = new HelloWorldImpl();
         ServerFactoryBean svrFactory = new ServerFactoryBean();
         svrFactory.setServiceClass(HelloWorld.class);

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>aegis-standalone</artifactId>
-    <version>1.0</version>
     <name>CXF sample using the Aegis Binding without any webservice</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -90,35 +94,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/ReadZoo.java Tue Jul 27 20:46:55 2010
@@ -20,6 +20,7 @@
 package org.apache.cxf.demo.aegis.commands;
 
 import java.io.FileInputStream;
+import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -48,7 +49,7 @@ public final class ReadZoo {
         AegisContext context;
 
         context = new AegisContext();
-        Set<Class<?>> rootClasses = new HashSet<Class<?>>();
+        Set<Type> rootClasses = new HashSet<Type>();
         rootClasses.add(Zoo.class);
         context.setRootClasses(rootClasses);
         context.initialize();

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/aegis_standalone/src/org/apache/cxf/demo/aegis/commands/WriteZoo.java Tue Jul 27 20:46:55 2010
@@ -32,7 +32,7 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.cxf.aegis.AegisContext;
 import org.apache.cxf.aegis.AegisWriter;
-import org.apache.cxf.aegis.type.Type;
+import org.apache.cxf.aegis.type.AegisType;
 import org.apache.cxf.demo.aegis.types.Animal;
 import org.apache.cxf.demo.aegis.types.Zoo;
 
@@ -54,7 +54,7 @@ public final class WriteZoo {
 
         context = new AegisContext();
         context.setWriteXsiTypes(true);
-        Set<Class<?>> rootClasses = new HashSet<Class<?>>();
+        Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
         rootClasses.add(Zoo.class);
         context.setRootClasses(rootClasses);
         context.initialize();
@@ -64,7 +64,7 @@ public final class WriteZoo {
         IndentingXMLStreamWriter indentWriter = new IndentingXMLStreamWriter(xmlWriter);
 
         Zoo zoo = populateZoo();
-        Type aegisType = context.getTypeMapping().getType(zoo.getClass());
+        AegisType aegisType = context.getTypeMapping().getType(zoo.getClass());
         writer.write(zoo, new QName("urn:aegis:demo", "zoo"), false, indentWriter, aegisType);
         xmlWriter.close();
         output.close();

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/callback/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/callback/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/callback/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/callback/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>callback</artifactId>
-    <version>1.0</version>
     <name>CXF sample using a callbak object</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-CallbackService</id>
@@ -155,35 +159,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/configuration_interceptor/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/configuration_interceptor/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>configuration_interceptor</artifactId>
-    <version>1.0</version>
     <name>CXF Sample of Stream GZIP Interceptor</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -136,35 +140,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-             <id>snapshots</id>
-             <repositories>
-                 <repository>
-                     <id>apache-snapshots</id>
-                     <name>Apache SNAPSHOT Repository</name>
-                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                     <snapshots>
-                         <enabled>true</enabled>
-                     </snapshots>
-                     <releases>
-                         <enabled>false</enabled>
-                     </releases>
-                 </repository>
-             </repositories>
-             <pluginRepositories>
-                 <pluginRepository>
-                     <id>apache-snapshots</id>
-                     <name>Apache Maven Plugin Snapshots</name>
-                     <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                     <releases>
-                         <enabled>false</enabled>
-                     </releases>
-                     <snapshots>
-                         <enabled>true</enabled>
-                     </snapshots>
-                 </pluginRepository>
-             </pluginRepositories>
-         </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/in_jvm_transport/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/in_jvm_transport/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/in_jvm_transport/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/in_jvm_transport/pom.xml Tue Jul 27 20:46:55 2010
@@ -19,11 +19,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
-    <artifactId>wsdl_first</artifactId>
-    <version>1.0</version>
+    <artifactId>in_jvm_transport</artifactId>
     <name>Colocated Demo using Document/Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -85,35 +90,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml Tue Jul 27 20:46:55 2010
@@ -40,7 +40,7 @@
         <include name="FastInfoset-*.jar"/>
         <include name="jaxb*.jar"/>
         <include name="neethi-*.jar"/>
-        <include name="geronimo-jaxws_2.1_spec-1.0.jar"/>
+        <include name="geronimo-jaxws_2.2_spec-1.0.jar"/>
         <include name="geronimo-annotation_1.0_spec-*.jar"/>
         <include name="geronimo-ws-metadata_2.0_spec-*.jar"/>
         <include name="org.apache.servicemix.specs.jbi-api-*.jar"/>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_jaxws</artifactId>
-    <version>1.0</version>
     <name>Java First demo using JAX-WS APIs</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +88,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_jaxws_factory_bean</artifactId>
-    <version>1.0</version>
     <name>Java First demo service using the JAXWSFactoryBeans</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +88,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_pojo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_pojo/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_pojo/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_pojo/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_pojo</artifactId>
-    <version>1.0</version>
     <name>Java First POJO Sample</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -84,35 +89,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>java_first_spring_support</artifactId>
-    <version>1.0</version>
     <name>Spring HTTP Sample</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -101,35 +105,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -142,11 +117,15 @@
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-        <!-- Jetty is needed if you're using the CXFServlet -->
+        <!-- Jetty is needed if you're not using the CXFServlet -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+        </dependency>
     </dependencies>
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/java_first_spring_support/src/demo/spring/servlet/Server.java Tue Jul 27 20:46:55 2010
@@ -18,12 +18,12 @@
  */
 package demo.spring.servlet;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 public class Server {
 
@@ -37,7 +37,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.mortbay.jetty.Server server = new org.mortbay.jetty.Server();
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(9002);

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,12 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_rs_basic</artifactId>
-    <version>1.0</version>
     <name>JAX-RS Basic Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>1.0</jsr311.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -104,35 +107,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -159,7 +133,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml Tue Jul 27 20:46:55 2010
@@ -21,11 +21,14 @@
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>jax_rs_basic_https</artifactId>
     <name>JAX-RS Basic Demo With HTTPS communications</name>
-    <version>1.0</version>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
         <httpclient.version>3.1</httpclient.version>
-        <jsr311.version>1.0</jsr311.version>
     </properties>
 
     <build>
@@ -137,35 +140,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>
@@ -192,7 +166,6 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
         </dependency>
     </dependencies>
 </project>



Mime
View raw message