You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by ip...@apache.org on 2005/07/15 01:24:02 UTC

svn commit: r219134 - in /webservices/pubscribe/trunk: project.xml src/webapp/WEB-INF/web.xml wse-xbeans/project.xml wse-xbeans/src/wsdl/wse/WS-Eventing-2004_08.wsdl wsn-xbeans/project.xml

Author: ips
Date: Thu Jul 14 16:24:01 2005
New Revision: 219134

URL: http://svn.apache.org/viewcvs?rev=219134&view=rev
Log:
upgraded to XMLBeans 2.0 final

Modified:
    webservices/pubscribe/trunk/project.xml
    webservices/pubscribe/trunk/src/webapp/WEB-INF/web.xml
    webservices/pubscribe/trunk/wse-xbeans/project.xml
    webservices/pubscribe/trunk/wse-xbeans/src/wsdl/wse/WS-Eventing-2004_08.wsdl
    webservices/pubscribe/trunk/wsn-xbeans/project.xml

Modified: webservices/pubscribe/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/project.xml?rev=219134&r1=219133&r2=219134&view=diff
==============================================================================
--- webservices/pubscribe/trunk/project.xml (original)
+++ webservices/pubscribe/trunk/project.xml Thu Jul 14 16:24:01 2005
@@ -368,19 +368,20 @@
       <properties>
         <license>WerkenPublicLicense-1.3.txt</license>
         <usage>Needed for handling XPath queries with XmlBeans.</usage>
-        <war.bundle>true</war.bundle>
-        <comment>We are maintaining beta-2 because -> beta-6 had an OutOfMemoryError when interacting with XmlCursor.select(..) when using our sushi ResourcePropSet</comment>
+        <war.bundle>false</war.bundle>
+        <comment>We are maintaining beta-3 because -> beta-4 through beta-6 had an OutOfMemoryError when interacting with XmlCursor.select(..) when using our sushi ResourcePropSet</comment>
       </properties>
     </dependency>
 
     <dependency>
       <groupId>jetty</groupId>
       <artifactId>org.mortbay.jetty</artifactId>
-      <version>4.2.22</version>
+      <version>4.2.24</version>
       <url>http://jetty.mortbay.org/</url>
       <properties>
+        <license>ApacheLicense-2.0.txt</license>
         <war.bundle>false</war.bundle>
-        <usage>for the JettyAxisServer in the Application</usage>
+        <usage>required by the JettyAxisServer class</usage>
       </properties>
     </dependency>
 
@@ -449,7 +450,7 @@
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
-      <version>2.0.0-beta1</version>
+      <version>2.0.0</version>
       <url>http://xmlbeans.apache.org/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>

Modified: webservices/pubscribe/trunk/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/webapp/WEB-INF/web.xml?rev=219134&r1=219133&r2=219134&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/webapp/WEB-INF/web.xml (original)
+++ webservices/pubscribe/trunk/src/webapp/WEB-INF/web.xml Thu Jul 14 16:24:01 2005
@@ -1,69 +1,62 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app 
+  PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
-  <display-name>Apache-Axis</display-name>
-    
-    <listener>
-        <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
-    </listener>
- 
-<!-- Wsrf Servlet -->
+
+  <display-name>Apache Pubscribe</display-name>
+
+  <listener>
+    <listener-class>org.apache.ws.resource.webapp.WsrfServletContextListener</listener-class>
+    <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+  </listener>
+
   <servlet>
     <servlet-name>AxisServlet</servlet-name>
     <display-name>Apache-Axis Servlet</display-name>
-    <servlet-class>
-        org.apache.ws.resource.handler.axis.WsrfAxisServlet
-    </servlet-class>
-    <load-on-startup>100</load-on-startup>
+    <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
   </servlet>
-  
-  <!-- uncomment this if you want the admin servlet -->
-  <!--servlet>
-    <servlet-name>AdminServlet</servlet-name>
-    <display-name>Axis Admin Servlet</display-name>
-    <servlet-class>
-        org.apache.axis.transport.http.AdminServlet
-    </servlet-class>
-    <load-on-startup>100</load-on-startup>
-  </servlet-->
 
- 
+   <servlet>
+     <servlet-name>AdminServlet</servlet-name>
+     <display-name>Axis Admin Servlet</display-name>
+     <servlet-class>org.apache.axis.transport.http.AdminServlet</servlet-class>
+     <load-on-startup>100</load-on-startup>
+   </servlet>
+
   <servlet-mapping>
     <servlet-name>AxisServlet</servlet-name>
     <url-pattern>/services/*</url-pattern>
   </servlet-mapping>
 
-  
- <!-- uncomment this if you want the admin servlet -->
- 
-  <!--servlet-mapping>
-    <servlet-name>AdminServlet</servlet-name>
-    <url-pattern>/servlet/AdminServlet</url-pattern>
-  </servlet-mapping-->
- 
-
-    <session-config>
-        <!-- Default to 5 minute session timeouts -->
-        <session-timeout>5</session-timeout>
-    </session-config>
-
-    <!-- currently the W3C havent settled on a media type for WSDL;
-    http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
-    for now we go with the basic 'it's XML' response -->
+  <!-- uncomment this if you want the Axis admin servlet -->
+  <!--
+   <servlet-mapping>
+     <servlet-name>AdminServlet</servlet-name>
+     <url-pattern>/servlet/AdminServlet</url-pattern>
+   </servlet-mapping>
+  -->
+
+  <session-config>
+    <!-- Default to 5 minute session timeouts -->
+    <session-timeout>5</session-timeout>
+  </session-config>
+
+  <!-- currently the W3C havent settled on a media type for WSDL;
+  http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+  for now we go with the basic 'it's XML' response -->
   <mime-mapping>
     <extension>wsdl</extension>
-     <mime-type>text/xml</mime-type>
+    <mime-type>text/xml</mime-type>
   </mime-mapping>
-  
+
   <mime-mapping>
     <extension>xsd</extension>
     <mime-type>text/xml</mime-type>
   </mime-mapping>
 
-  <welcome-file-list id="WelcomeFileList">
+  <welcome-file-list>
     <welcome-file>index.html</welcome-file>
     <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.jws</welcome-file>

Modified: webservices/pubscribe/trunk/wse-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/wse-xbeans/project.xml?rev=219134&r1=219133&r2=219134&view=diff
==============================================================================
--- webservices/pubscribe/trunk/wse-xbeans/project.xml (original)
+++ webservices/pubscribe/trunk/wse-xbeans/project.xml Thu Jul 14 16:24:01 2005
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
-      <version>2.0.0-beta1</version>
+      <version>2.0.0</version>
       <url>http://xmlbeans.apache.org/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>

Modified: webservices/pubscribe/trunk/wse-xbeans/src/wsdl/wse/WS-Eventing-2004_08.wsdl
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/wse-xbeans/src/wsdl/wse/WS-Eventing-2004_08.wsdl?rev=219134&r1=219133&r2=219134&view=diff
==============================================================================
--- webservices/pubscribe/trunk/wse-xbeans/src/wsdl/wse/WS-Eventing-2004_08.wsdl (original)
+++ webservices/pubscribe/trunk/wse-xbeans/src/wsdl/wse/WS-Eventing-2004_08.wsdl Thu Jul 14 16:24:01 2005
@@ -10,9 +10,8 @@
    xmlns="http://schemas.xmlsoap.org/wsdl/">
 
   <types>
-    <xs:schema
-        targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing" >
-      <xs:include schemaLocation="eventing.xsd" />
+    <xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing">
+      <xs:include schemaLocation="WS-Eventing-2004_08.xsd" />
     </xs:schema>
   </types>
 

Modified: webservices/pubscribe/trunk/wsn-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/wsn-xbeans/project.xml?rev=219134&r1=219133&r2=219134&view=diff
==============================================================================
--- webservices/pubscribe/trunk/wsn-xbeans/project.xml (original)
+++ webservices/pubscribe/trunk/wsn-xbeans/project.xml Thu Jul 14 16:24:01 2005
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
-      <version>2.0.0-beta1</version>
+      <version>2.0.0</version>
       <url>http://xmlbeans.apache.org/</url>
       <properties>
         <license>ApacheLicense-2.0.txt</license>