You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by ip...@apache.org on 2005/07/15 01:24:36 UTC
svn commit: r219135 - in /webservices/muse/trunk: project.xml
src/webapp/WEB-INF/web.xml wsdm-xbeans/project.xml
Author: ips
Date: Thu Jul 14 16:24:36 2005
New Revision: 219135
URL: http://svn.apache.org/viewcvs?rev=219135&view=rev
Log:
upgraded to XMLBeans 2.0 final
Modified:
webservices/muse/trunk/project.xml
webservices/muse/trunk/src/webapp/WEB-INF/web.xml
webservices/muse/trunk/wsdm-xbeans/project.xml
Modified: webservices/muse/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/project.xml?rev=219135&r1=219134&r2=219135&view=diff
==============================================================================
--- webservices/muse/trunk/project.xml (original)
+++ webservices/muse/trunk/project.xml Thu Jul 14 16:24:36 2005
@@ -226,6 +226,28 @@
</properties>
</dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/cli/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ <url>http://jakarta.apache.org/commons/collections/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
@@ -409,6 +431,18 @@
<comment>We are maintaining beta-2 because -> 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.24</version>
+ <url>http://jetty.mortbay.org/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <war.bundle>false</war.bundle>
+ <usage>required by the JettyAxisServer class</usage>
+ </properties>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -457,29 +491,7 @@
<usage>Needed for working with WSDL files as objects.</usage>
</properties>
</dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/cli/</url>
- <properties>
- <license>ApacheLicense-2.0.txt</license>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <url>http://jakarta.apache.org/commons/collections/</url>
- <properties>
- <license>ApacheLicense-2.0.txt</license>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
+
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -495,7 +507,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/muse/trunk/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/webapp/WEB-INF/web.xml?rev=219135&r1=219134&r2=219135&view=diff
==============================================================================
--- webservices/muse/trunk/src/webapp/WEB-INF/web.xml (original)
+++ webservices/muse/trunk/src/webapp/WEB-INF/web.xml Thu Jul 14 16:24:36 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 Muse</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/muse/trunk/wsdm-xbeans/project.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/wsdm-xbeans/project.xml?rev=219135&r1=219134&r2=219135&view=diff
==============================================================================
--- webservices/muse/trunk/wsdm-xbeans/project.xml (original)
+++ webservices/muse/trunk/wsdm-xbeans/project.xml Thu Jul 14 16:24:36 2005
@@ -52,7 +52,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>
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org