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/16 02:49:46 UTC
svn commit: r219272 - in /webservices/muse/trunk: maven.xml project.xml
src/webapp/WEB-INF/web.xml src/webapp/index.html
Author: ips
Date: Fri Jul 15 17:49:46 2005
New Revision: 219272
URL: http://svn.apache.org/viewcvs?rev=219272&view=rev
Log:
upgraded to Axis 1.2.1 and fixed error in web.xml
Modified:
webservices/muse/trunk/maven.xml
webservices/muse/trunk/project.xml
webservices/muse/trunk/src/webapp/WEB-INF/web.xml
webservices/muse/trunk/src/webapp/index.html
Modified: webservices/muse/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/maven.xml?rev=219272&r1=219271&r2=219272&view=diff
==============================================================================
--- webservices/muse/trunk/maven.xml (original)
+++ webservices/muse/trunk/maven.xml Fri Jul 15 17:49:46 2005
@@ -97,7 +97,6 @@
<attainGoal name="clean:clean"/>
</preGoal>
-
<!-- ================================================================== -->
<!-- W A R : W E B A P P -->
<!-- P O S T - G O A L -->
@@ -134,22 +133,23 @@
</postGoal>
<goal name="extract-wsdl-jar">
- <echo>Extracting WSDLs from ${wsdljar} to ${wsdl.extract.location.dir} ...</echo>
+ <echo>Extracting WSDLs from ${wsdljar} to ${spec.wsdl.dest.dir} ...</echo>
<mkdir dir="${maven.build.dir}/temp-wsdl" />
- <mkdir dir="${wsdl.extract.location.dir}" />
+ <mkdir dir="${spec.wsdl.dest.dir}" />
+ <j:set var="temp.wsdl.dir" value="${maven.build.dir}/temp-wsdl" />
<unzip src="${wsdljar}"
- dest="${maven.build.dir}/temp-wsdl">
+ dest="${temp.wsdl.dir}">
<patternset>
- <include name="**/*.wsdl"/>
- <include name="**/*.xsd"/>
+ <include name="**/*.wsdl" />
+ <include name="**/*.xsd" />
</patternset>
</unzip>
- <copy todir="${wsdl.extract.location.dir}">
- <fileset dir="${maven.build.dir}/temp-wsdl/schema/src" />
+ <copy todir="${spec.wsdl.dest.dir}">
+ <fileset dir="${temp.wsdl.dir}/schemaorg_apache_xmlbeans/src" />
</copy>
- <delete dir="${maven.build.dir}/temp-wsdl" />
+ <delete dir="${temp.wsdl.dir}" />
</goal>
-
+
<goal name="deploy">
<mkdir dir="${env.CATALINA_HOME}/webapps/${webapp.name}/WEB-INF/lib" />
<copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${env.CATALINA_HOME}/webapps/${webapp.name}/WEB-INF/lib" overwrite="true" verbose="true" />
@@ -159,36 +159,46 @@
<!-- D I S T : P R E P A R E - B I N - F I L E S Y S T E M -->
<!-- P O S T - G O A L -->
<!-- ================================================================== -->
- <!-- Copy the following into the binary distribution directory: -->
- <!-- webapps/muse/, docs/, examples/, readme.htm, and util.xml -->
+ <!-- Copy the following from src/ into the binary dist dir: -->
+ <!-- docs/, examples/, template/, and webapps/muse/ -->
<!-- ================================================================== -->
<postGoal name="dist:prepare-bin-filesystem">
+ <attainGoal name="war:webapp" />
+ <attainGoal name="website" />
+
<!-- delete the project jar that dist:prepare-bin-filesystem placed in the dist dir -->
<delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
-
- <attainGoal name="war:webapp" />
- <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/${webapp.name}" />
- <copy todir="${maven.dist.bin.assembly.dir}/webapps/${webapp.name}">
- <fileset dir="${maven.war.webapp.dir}" />
- </copy>
- <attainGoal name="website" />
+ <copy todir="${maven.dist.bin.assembly.dir}">
+ <fileset dir="${basedir}">
+ <include name="README*" />
+ </fileset>
+ </copy>
+
<property name="docs.assembly.dir" location="${maven.dist.bin.assembly.dir}/docs" />
<delete dir="${docs.assembly.dir}" />
<mkdir dir="${docs.assembly.dir}" />
<copy todir="${docs.assembly.dir}">
<fileset dir="${site.dest.dir}" />
</copy>
+
+ <property name="template.assembly.dir" location="${maven.dist.bin.assembly.dir}/template" />
+ <delete dir="${template.assembly.dir}" />
+ <mkdir dir="${template.assembly.dir}" />
+ <copy todir="${template.assembly.dir}">
+ <fileset dir="${maven.src.dir}/template" />
+ </copy>
+
+ <property name="webapp.assembly.dir" location="${maven.dist.bin.assembly.dir}/webapps/${webapp.name}" />
+ <delete dir="${webapp.assembly.dir}" />
+ <mkdir dir="${webapp.assembly.dir}" />
+ <copy todir="${webapp.assembly.dir}">
+ <fileset dir="${maven.war.webapp.dir}" />
+ </copy>
<property name="tutorial.assembly.dir" location="${docs.assembly.dir}/tutorial" />
-
- <copy todir="${maven.dist.bin.assembly.dir}">
- <fileset dir="${basedir}">
- <include name="README.html" />
- </fileset>
- </copy>
-
+
</postGoal>
<!-- ================================================================== -->
Modified: webservices/muse/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/project.xml?rev=219272&r1=219271&r2=219272&view=diff
==============================================================================
--- webservices/muse/trunk/project.xml (original)
+++ webservices/muse/trunk/project.xml Fri Jul 15 17:49:46 2005
@@ -193,7 +193,7 @@
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
<url>http://ws.apache.org/axis/</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=219272&r1=219271&r2=219272&view=diff
==============================================================================
--- webservices/muse/trunk/src/webapp/WEB-INF/web.xml (original)
+++ webservices/muse/trunk/src/webapp/WEB-INF/web.xml Fri Jul 15 17:49:46 2005
@@ -9,6 +9,9 @@
<listener>
<listener-class>org.apache.ws.resource.webapp.WsrfServletContextListener</listener-class>
+ </listener>
+
+ <listener>
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
</listener>
@@ -18,12 +21,12 @@
<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
</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>
Modified: webservices/muse/trunk/src/webapp/index.html
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/webapp/index.html?rev=219272&r1=219271&r2=219272&view=diff
==============================================================================
--- webservices/muse/trunk/src/webapp/index.html (original)
+++ webservices/muse/trunk/src/webapp/index.html Fri Jul 15 17:49:46 2005
@@ -1,16 +1,15 @@
<html>
<head>
-<meta http-equiv="Content-Type"
-content="text/html; charset=iso-8859-1">
-<title>Apache-Muse</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Apache Muse</title>
</head>
<body bgcolor="#FFFFFF">
<h1 align="center"><a href="http://ws.apache.org/ws-fx/muse/"><img class="logoImage" alt="Muse" src="images/muse-logo.jpg" border="0"></a></h1>
-<p>Hello! <em>Welcome</em> to MUSE.</p>
+<p>Hello! <em>Welcome</em> to Muse.</p>
<p>What do you want to do today?</p>
@@ -23,7 +22,7 @@
<li><a href="fingerprint.jsp">View system info</a>
the list of deployed jars</li>
<li><a href="http://ws.apache.org/ws-fx/muse/">Visit</a>
- the Apache-Muse Home Page</li>
+ the Apache Muse Home Page</li>
</ul>
If the validation page displays an exception instead of a
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org