cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r513791 - in /incubator/cxf/trunk: ./ api/src/main/java/org/apache/cxf/service/model/ buildtools/ common/common/ common/common/src/test/java/org/apache/cxf/common/classloader/ common/schemas/ rt/databinding/jaxb/src/main/java/org/apache/cxf...
Date Fri, 02 Mar 2007 14:55:06 GMT
Author: dkulp
Date: Fri Mar  2 06:55:05 2007
New Revision: 513791

URL: http://svn.apache.org/viewvc?view=rev&rev=513791
Log:
Update to surefire 2.3


Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
    incubator/cxf/trunk/buildtools/pom.xml
    incubator/cxf/trunk/common/common/pom.xml
    incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java
    incubator/cxf/trunk/common/schemas/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
    incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
    incubator/cxf/trunk/tools/xjc/dv/pom.xml

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Fri
Mar  2 06:55:05 2007
@@ -40,6 +40,17 @@
         this.isAttributeQualified = false;
     }
     
+    public String toString() {
+        StringBuffer buffer = new StringBuffer(this.getClass().getName());
+        buffer.append(" [namespaceURI: ");
+        buffer.append(namespaceUri);
+        buffer.append("] [systemId: ");
+        buffer.append(systemId);
+        buffer.append("]");
+        
+        return buffer.toString();
+    }
+    
     public ServiceInfo getServiceInfo() {
         return serviceInfo;
     }

Modified: incubator/cxf/trunk/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/pom.xml?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/buildtools/pom.xml (original)
+++ incubator/cxf/trunk/buildtools/pom.xml Fri Mar  2 06:55:05 2007
@@ -31,6 +31,11 @@
     <url>http://cwiki.apache.org/CXF</url>
     <packaging>jar</packaging>
 
+
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
     <build>
         <plugins>
             <plugin>

Modified: incubator/cxf/trunk/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/pom.xml?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/common/common/pom.xml (original)
+++ incubator/cxf/trunk/common/common/pom.xml Fri Mar  2 06:55:05 2007
@@ -32,6 +32,10 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+      <maven.test.skip.exec>true</maven.test.skip.exec>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java
(original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/common/classloader/FireWallClassLoaderTest.java
Fri Mar  2 06:55:05 2007
@@ -100,7 +100,4 @@
         return new TestSuite(FireWallClassLoaderTest.class);
     }
 
-    public static void main(String[] args) throws Exception {
-        junit.awtui.TestRunner.main(new String[] {FireWallClassLoaderTest.class.getName()});
-    }
 }

Modified: incubator/cxf/trunk/common/schemas/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/schemas/pom.xml?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/common/schemas/pom.xml (original)
+++ incubator/cxf/trunk/common/schemas/pom.xml Fri Mar  2 06:55:05 2007
@@ -31,6 +31,10 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/common/schemas</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/common/schemas</developerConnection>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Fri Mar  2 06:55:05 2007
@@ -120,7 +120,6 @@
         <url>http://www.apache.org/</url>
     </organization>
 
-
     <modules>
         <module>buildtools</module>
         <module>parent</module>
@@ -361,7 +360,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.1.3</version>
+                    <version>2.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
(original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Fri Mar  2 06:55:05 2007
@@ -185,6 +185,29 @@
 
     private void loadSchemaFromClassPath(String schema, Map<String, SchemaInfo> schemas)
{
         // we can reuse code in javatowsdl tool after tool refactor
+        
+        try {
+            //TODO - until tools  refactor, just use basic URIResolver
+            XmlSchemaCollection schemaCol = new XmlSchemaCollection();
+            URIResolver resolver = new URIResolver(schema);
+
+            Document schemaDoc = DOMUtils.readXml(resolver.getInputStream());
+
+            XmlSchema xmlSchema = schemaCol.read(schemaDoc.getDocumentElement());
+            SchemaInfo schemaInfo = new SchemaInfo(null, xmlSchema.getTargetNamespace());
+
+            schemaInfo.setElement(schemaDoc.getDocumentElement());
+            schemas.put(schemaInfo.getNamespaceURI(), schemaInfo);
+        } catch (IOException e) {
+            LOG.log(Level.SEVERE, e.getMessage());
+            throw new UncheckedException(e);
+        } catch (SAXException e) {
+            LOG.log(Level.SEVERE, e.getMessage());
+            throw new UncheckedException(e);
+        } catch (ParserConfigurationException e) {
+            LOG.log(Level.SEVERE, e.getMessage());
+            throw new UncheckedException(e);
+        }
     }
 
     private void loadSchemaFromFile(String schema, Map<String, SchemaInfo> schemas)
{

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
Fri Mar  2 06:55:05 2007
@@ -105,12 +105,13 @@
         }
         
         serviceInfo = wsdlServiceBuilder.buildService(def, service);
-        String schema1 = getClass().getResource(SCHEMA1).toString();
-        String schema2 = getClass().getResource(SCHEMA2).toString();
         List<String> schemas = new ArrayList<String>();
 
+        String schema1 = getClass().getResource(SCHEMA1).toString();
+        String schema2 = getClass().getResource(SCHEMA2).toString();
         schemas.add(schema1);
         schemas.add(schema2);
+                
         serviceInfo.setProperty(JAXBDataBinding.SCHEMA_RESOURCE, schemas);
         schemaMap = jaxbDataBinding.getSchemas(serviceInfo);
     }

Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
Fri Mar  2 06:55:05 2007
@@ -25,6 +25,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.configuration.spring.ConfigurerImpl;
+import org.apache.cxf.configuration.spring.JaxbClassPathXmlApplicationContext;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.ConduitInitiatorManager;
@@ -36,9 +37,12 @@
 
 public class ApplicationContextTest extends TestCase {
     public void testContext() throws Exception {
-        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
-            new String[] {"META-INF/cxf/cxf.xml", "META-INF/cxf/cxf-extension-http.xml",
-                          "/org/apache/cxf/transport/http/spring/beans.xml", });
+        String s1 = getClass().getResource("/META-INF/cxf/cxf.xml").toString();
+        String s2 = getClass().getResource("/META-INF/cxf/cxf-extension-http.xml").toString();
+        String s3 = getClass().getResource("/org/apache/cxf/transport/http/spring/beans.xml").toString();
+        
+        ClassPathXmlApplicationContext ctx = new JaxbClassPathXmlApplicationContext(
+            new String[] {s1, s2, s3});
         
         ConfigurerImpl cfg = new ConfigurerImpl(ctx);
         

Modified: incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
(original)
+++ incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/spring/ApplicationContextTest.java
Fri Mar  2 06:55:05 2007
@@ -25,6 +25,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.configuration.spring.ConfigurerImpl;
+import org.apache.cxf.configuration.spring.JaxbClassPathXmlApplicationContext;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.ConduitInitiatorManager;
@@ -36,9 +37,12 @@
 
 public class ApplicationContextTest extends TestCase {
     public void testContext() throws Exception {
-        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
-            new String[] {"META-INF/cxf/cxf.xml", "META-INF/cxf/cxf-extension-http.xml",
-                          "/org/apache/cxf/transport/http/spring/beans.xml", });
+        String s1 = getClass().getResource("/META-INF/cxf/cxf.xml").toString();
+        String s2 = getClass().getResource("/META-INF/cxf/cxf-extension-http.xml").toString();
+        String s3 = getClass().getResource("/org/apache/cxf/transport/http/spring/beans.xml").toString();
+        
+        ClassPathXmlApplicationContext ctx = new JaxbClassPathXmlApplicationContext(
+            new String[] {s1, s2, s3});
         
         ConfigurerImpl cfg = new ConfigurerImpl(ctx);
         

Modified: incubator/cxf/trunk/tools/xjc/dv/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/xjc/dv/pom.xml?view=diff&rev=513791&r1=513790&r2=513791
==============================================================================
--- incubator/cxf/trunk/tools/xjc/dv/pom.xml (original)
+++ incubator/cxf/trunk/tools/xjc/dv/pom.xml Fri Mar  2 06:55:05 2007
@@ -32,6 +32,10 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <maven.test.skip>true</maven.test.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>



Mime
View raw message