geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1348577 - in /geronimo/server/branches/3.0-beta/testsuite: deployment-testsuite/url-binding-tests/ javaee6-testsuite/commonannotation1.1-test/ javaee6-testsuite/commonannotation1.1-test/src/main/java/org/apache/geronimo/sample/servlet/ jav...
Date Sun, 10 Jun 2012 12:24:48 GMT
Author: xiaming
Date: Sun Jun 10 12:24:47 2012
New Revision: 1348577

URL: http://svn.apache.org/viewvc?rev=1348577&view=rev
Log:
Fix some small bugs in testsuites

Added:
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
Modified:
    geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DataSourceDefinitionServlet.java
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/java/org/apache/geronimo/testsuite/javaee6/jndiinfer/test/JndiInferTest.java
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/resources/testng.xml
    geronimo/server/branches/3.0-beta/testsuite/webservices-testsuite/pom.xml

Modified: geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml
Sun Jun 10 12:24:47 2012
@@ -119,7 +119,7 @@
                             <goal>undeploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/pom.xml?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/pom.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/pom.xml
Sun Jun 10 12:24:47 2012
@@ -83,7 +83,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DataSourceDefinitionServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DataSourceDefinitionServlet.java?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DataSourceDefinitionServlet.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/java/org/apache/geronimo/sample/servlet/DataSourceDefinitionServlet.java
Sun Jun 10 12:24:47 2012
@@ -34,9 +34,10 @@ public class DataSourceDefinitionServlet
     @Resource(lookup="java:app/MyDataSource")
     DataSource dataSource1;
 
-    @Resource(lookup="osgi:service/mydatasource")
+    @Resource(lookup="java:app/MyDataSource")
     DataSource dataSource2;
 
+    @Override
     DataSource getDataSourceA() {
         return dataSource1;
     }

Modified: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/commonannotation1.1-test/src/main/webapp/WEB-INF/geronimo-web.xml
Sun Jun 10 12:24:47 2012
@@ -18,13 +18,13 @@
 <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:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>${pom.groupId}</dep:groupId>
-      <dep:artifactId>${pom.artifactId}</dep:artifactId>
-      <dep:version>${version}</dep:version>
-      <dep:type>war</dep:type>
+      <dep:groupId>${project.groupId}</dep:groupId>
+      <dep:artifactId>${project.artifactId}</dep:artifactId>
+      <dep:version>${project.version}</dep:version>
+      <dep:type>car</dep:type>
     </dep:moduleId>
   </dep:environment>
 
-   <context-root>/${pom.artifactId}</context-root>
+   <context-root>/${project.artifactId}</context-root>
 
 </web-app>

Modified: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/pom.xml?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/pom.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/pom.xml
Sun Jun 10 12:24:47 2012
@@ -76,7 +76,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Added: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1348577&view=auto
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
Sun Jun 10 12:24:47 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+         
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>${project.groupId}</sys:groupId>
+      <sys:artifactId>${project.artifactId}</sys:artifactId>
+      <sys:version>${project.version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+	<sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>${project.artifactId}</context-root>	
+</web-app>

Propchange: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/java/org/apache/geronimo/testsuite/javaee6/jndiinfer/test/JndiInferTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/java/org/apache/geronimo/testsuite/javaee6/jndiinfer/test/JndiInferTest.java?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/java/org/apache/geronimo/testsuite/javaee6/jndiinfer/test/JndiInferTest.java
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/java/org/apache/geronimo/testsuite/javaee6/jndiinfer/test/JndiInferTest.java
Sun Jun 10 12:24:47 2012
@@ -36,7 +36,7 @@ public class JndiInferTest extends TestS
 
     private void checkReply(String address)
         throws Exception {
-        String warName = System.getProperty("webAppName");
+        String warName = System.getProperty("appContext");
         assertNotNull(warName);
         URL url = new URL(baseURL + warName + address);
        

Modified: geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/resources/testng.xml?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/resources/testng.xml
(original)
+++ geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/src/test/resources/testng.xml
Sun Jun 10 12:24:47 2012
@@ -25,7 +25,7 @@
 <suite name="Suite1" verbose="5">
     <test name="javaee6-testsuite.jndiInfer">
         <packages>
-            <package name="org.apache.geronimo.javaee6.jndiinfer.test"/>
+            <package name="org.apache.geronimo.testsuite.javaee6.jndiinfer.test"/>
         </packages>
     </test>
 </suite>

Modified: geronimo/server/branches/3.0-beta/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/webservices-testsuite/pom.xml?rev=1348577&r1=1348576&r2=1348577&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/webservices-testsuite/pom.xml Sun Jun 10 12:24:47
2012
@@ -39,8 +39,7 @@
     </description>
 
     <modules>        
-<!--        
-        <module>jaxrpc-jaxws-tests</module>
+<!--                
         <module>jaxws-catalog-tests</module>        
 -->
         <module>jaxb-tests</module>
@@ -51,6 +50,7 @@
         <module>jaxws-tests</module>
         <module>jaxws-wsa-tests</module>
         <module>saaj-tests</module>
+        <module>jaxrpc-jaxws-tests</module>
     </modules>
         
     <profiles>



Mime
View raw message