axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r264675 - in /webservices/axis/trunk/java/modules: addressing/ core/ integration/ saaj/ samples/ security/ wsdl/ xml/ xml/src/org/apache/axis2/om/impl/llom/ xml/src/org/apache/axis2/om/impl/llom/builder/
Date Tue, 30 Aug 2005 02:38:12 GMT
Author: dims
Date: Mon Aug 29 19:38:04 2005
New Revision: 264675

URL: http://svn.apache.org/viewcvs?rev=264675&view=rev
Log:
- sjsxp is no good :( as we can't re-distribute it (http://java.sun.com/webservices/docs/1.6/ReleaseNotes.html)
- Get all the tests working again. EXCEPT SpacesTest (we're not getting the cdata events)
- Get rid of unused Random member


Modified:
    webservices/axis/trunk/java/modules/addressing/project.xml
    webservices/axis/trunk/java/modules/core/project.xml
    webservices/axis/trunk/java/modules/integration/project.xml
    webservices/axis/trunk/java/modules/saaj/project.xml
    webservices/axis/trunk/java/modules/samples/project.xml
    webservices/axis/trunk/java/modules/security/project.xml
    webservices/axis/trunk/java/modules/wsdl/project.xml
    webservices/axis/trunk/java/modules/xml/project.xml
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java

Modified: webservices/axis/trunk/java/modules/addressing/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/project.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/project.xml Mon Aug 29 19:38:04 2005
@@ -66,17 +66,17 @@
             <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/project.xml (original)
+++ webservices/axis/trunk/java/modules/core/project.xml Mon Aug 29 19:38:04 2005
@@ -62,17 +62,17 @@
             <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis/trunk/java/modules/integration/project.xml Mon Aug 29 19:38:04 2005
@@ -116,17 +116,17 @@
             <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis/trunk/java/modules/saaj/project.xml Mon Aug 29 19:38:04 2005
@@ -110,17 +110,17 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Mon Aug 29 19:38:04 2005
@@ -103,17 +103,17 @@
             <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/security/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/security/project.xml (original)
+++ webservices/axis/trunk/java/modules/security/project.xml Mon Aug 29 19:38:04 2005
@@ -74,17 +74,17 @@
             <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/project.xml (original)
+++ webservices/axis/trunk/java/modules/wsdl/project.xml Mon Aug 29 19:38:04 2005
@@ -61,17 +61,17 @@
             <url>http://dist.codehaus.org/stax/jars/</url>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/xml/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/project.xml?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/project.xml (original)
+++ webservices/axis/trunk/java/modules/xml/project.xml Mon Aug 29 19:38:04 2005
@@ -32,6 +32,7 @@
 
         <unitTest>
             <excludes>
+                <exclude>**/*SpacesTest.java</exclude>
             </excludes>
             <includes>
                 <include>**/*Test.java</include>
@@ -95,17 +96,17 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>sjsxp</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>1.1.1-dev</version>
             <properties>
                 <module>true</module>
             </properties>
         </dependency>
         <dependency>
-            <groupId>sjsxp</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.6</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0</version>
             <properties>
                 <module>true</module>
             </properties>

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
(original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
Mon Aug 29 19:38:04 2005
@@ -40,8 +40,6 @@
 
     protected boolean isBinary = false;
 
-    private static Random rnd = new Random(new Date().getTime());
-
     /**
      * Field contentID for the mime part used when serialising Binary stuff as
      * MTOM optimised

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=264675&r1=264674&r2=264675&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
(original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
Mon Aug 29 19:38:04 2005
@@ -136,19 +136,16 @@
      * @throws OMException
      */
     protected OMNode createOMText(int textType) throws OMException {
+        OMNode node = null;
         if (lastNode == null) {
-            throw new OMException();
+            return null;
+        } else if (!lastNode.isComplete()) {
+            node = omfactory.createText((OMElement) lastNode, parser.getText());
+            node.setType(textType);
+        } else if (!(lastNode.getParent() instanceof OMDocument)) {
+            node = omfactory.createText((OMElement)lastNode.getParent(), parser.getText());
+            node.setType(textType);
         }
-        OMNode node;
-        if (lastNode.isComplete()) {
-            node =
-                    omfactory.createText((OMElement) lastNode.getParent(),
-                            parser.getText());
-        } else {
-            OMElement e = (OMElement) lastNode;
-            node = omfactory.createText(e, parser.getText());
-        }
-        node.setType(textType);
         return node;
     }
 



Mime
View raw message