You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/10/20 05:22:54 UTC
svn commit: r1186606 - in /geronimo/server/branches/3.0-beta-1:
framework/modules/geronimo-plugin/src/test/resources/
plugins/welcome/welcome-jetty-server/ plugins/welcome/welcome-tomcat-server/
testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/ ...
Author: rwonly
Date: Thu Oct 20 03:22:54 2011
New Revision: 1186606
URL: http://svn.apache.org/viewvc?rev=1186606&view=rev
Log:
continue code clean up, get rid of the hardcoded "SNAPSHOT" in jaxrpc-war test
Removed:
geronimo/server/branches/3.0-beta-1/plugins/welcome/welcome-jetty-server/pom.sample.xml
geronimo/server/branches/3.0-beta-1/plugins/welcome/welcome-tomcat-server/pom.sample.xml
Modified:
geronimo/server/branches/3.0-beta-1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/branches/3.0-beta-1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta-1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=1186606&r1=1186605&r2=1186606&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta-1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/branches/3.0-beta-1/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Thu Oct 20 03:22:54 2011
@@ -29,7 +29,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-TEST</version>
</geronimo-versions>
<prerequisite>
<id>
@@ -62,7 +62,7 @@
<type>car</type>
</module-id>
<geronimo-versions>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-TEST</version>
</geronimo-versions>
<prerequisite>
<id>
Modified: geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml?rev=1186606&r1=1186605&r2=1186606&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml (original)
+++ geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml Thu Oct 20 03:22:54 2011
@@ -59,7 +59,7 @@
<systemProperties>
<property>
<name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
+ <value>${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
Modified: geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1186606&r1=1186605&r2=1186606&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/3.0-beta-1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Oct 20 03:22:54 2011
@@ -16,8 +16,7 @@
limitations under the License.
-->
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
- >
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:environment>
<dep:moduleId>
<dep:groupId>JEE5</dep:groupId>
@@ -26,16 +25,18 @@
<dep:type>car</dep:type>
</dep:moduleId>
</dep:environment>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <port>
+
+ <context-root>/jaxrpc-war</context-root>
+
+ <service-ref>
+ <service-ref-name>services/Greeter</service-ref-name>
+ <port>
<port-name>GreeterPort</port-name>
<protocol>http</protocol>
<host>localhost</host>
<port>8080</port>
- <uri>/jaxrpc-war-3.0-SNAPSHOT/servlet</uri>
- </port>
- </service-ref>
+ <uri>/jaxrpc-war/servlet</uri>
+ </port>
+ </service-ref>
</web-app>