geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r816942 [1/2] - in /geronimo/server/trunk: framework/modules/geronimo-service-builder/ plugins/activemq/ plugins/activemq/activemq-webconsole-jetty/ plugins/activemq/activemq-webconsole-tomcat/ plugins/ca-helper/geronimo-ca-helper/ plugins/...
Date Sat, 19 Sep 2009 16:54:02 GMT
Author: djencks
Date: Sat Sep 19 16:53:58 2009
New Revision: 816942

URL: http://svn.apache.org/viewvc?rev=816942&view=rev
Log:
GERONIMO-4566 don't include jsps, welcome file processing is fixed.  Update jetty7 version.  Use all the release versions up for vote, so include repos for them.  Use snapshot xmlbean-maven-plugin. Make more junit-4 friendly by renaming some test helper classes. Mostly merge of rev 816732 from branches/2.2

Added:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java   (contents, props changed)
      - copied, changed from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
Removed:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java
Modified:
    geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
    geronimo/server/trunk/plugins/activemq/pom.xml
    geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
    geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
    geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
    geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java   (props changed)
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/ejb-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-context-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-unit-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-expected-1.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-src.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-builder/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyContainerImpl.java
    geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty7/jetty7/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
    geronimo/server/trunk/plugins/welcome/geronimo-welcome/pom.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Sat Sep 19 16:53:58 2009
@@ -76,20 +76,6 @@
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
             
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml Sat Sep 19 16:53:58 2009
@@ -110,6 +110,86 @@
                     <groupId>javax.xml.bind</groupId>
                     <artifactId>jaxb-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-atom</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-core</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-json</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-server</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey.contribs</groupId>
+                    <artifactId>jersey-spring</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-groovy</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-ruby</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-web</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-all</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-asl</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jettison</groupId>
+                    <artifactId>jettison</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jruby</groupId>
+                    <artifactId>jruby</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>taglibs</groupId>
+                    <artifactId>standard</artifactId>
+                    
+                </exclusion>
             </exclusions>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml Sat Sep 19 16:53:58 2009
@@ -121,6 +121,86 @@
                     <groupId>javax.xml.bind</groupId>
                     <artifactId>jaxb-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-atom</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-core</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-json</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-server</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jersey.contribs</groupId>
+                    <artifactId>jersey-spring</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-groovy</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-ruby</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-web</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-all</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-asl</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jettison</groupId>
+                    <artifactId>jettison</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jruby</groupId>
+                    <artifactId>jruby</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+
+                </exclusion>
+                <exclusion>
+                    <groupId>taglibs</groupId>
+                    <artifactId>standard</artifactId>
+
+                </exclusion>
             </exclusions>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Sat Sep 19 16:53:58 2009
@@ -14,7 +14,9 @@
     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.
---><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,10 +43,10 @@
         <module>activemq-portlets</module>
         <module>activemq-console-jetty</module>
         <module>activemq-console-tomcat</module>
-    <module>activemq-webconsole-jetty</module>
-    <module>activemq-webconsole-tomcat</module>
-    <module>activemq-webconsole</module>
-  </modules>
+        <module>activemq-webconsole-jetty</module>
+        <module>activemq-webconsole-tomcat</module>
+        <module>activemq-webconsole</module>
+    </modules>
 
     <profiles>
         <profile>
@@ -54,9 +56,9 @@
             </modules>
         </profile>
     </profiles>
-    
+
     <properties>
-        <activemqVersion>5.3-SNAPSHOT</activemqVersion>
+        <activemqVersion>5.3.0</activemqVersion>
     </properties>
 
     <dependencyManagement>

Modified: geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/geronimo-ca-helper/pom.xml Sat Sep 19 16:53:58 2009
@@ -83,7 +83,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webXml>${project.build.directory}/jspweb.xml</webXml>
-                    <!--<warSourceExcludes>**/*.jsp</warSourceExcludes>-->
+                    <warSourceExcludes>**/*.jsp</warSourceExcludes>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml Sat Sep 19 16:53:58 2009
@@ -59,21 +59,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml Sat Sep 19 16:53:58 2009
@@ -86,21 +86,6 @@
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
 
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Sat Sep 19 16:53:58 2009
@@ -116,7 +116,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webXml>${project.build.directory}/jspweb.xml</webXml>
-                    <!--<warSourceExcludes>**/*.jsp</warSourceExcludes>-->
+                    <warSourceExcludes>**/*.jsp</warSourceExcludes>
                     <webResources>
                         <resource>
                             <filtering>true</filtering>

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml Sat Sep 19 16:53:58 2009
@@ -53,21 +53,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Propchange: geronimo/server/trunk/plugins/cxf/geronimo-cxf-tools/src/main/java/org/apache/geronimo/cxf/tools/Java2WSCommand.java
            ('svn:mergeinfo' removed)

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Sat Sep 19 16:53:58 2009
@@ -84,6 +84,20 @@
 
     <build>
         <plugins>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-surefire-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<excludes>-->
+                        <!--<exclude>**/EJBAnnotationExample</exclude>-->
+                        <!--<exclude>**/HandlerChainAnnotationExample</exclude>-->
+                        <!--<exclude>**/PersistenceContextAnnotationExample</exclude>-->
+                        <!--<exclude>**/PersistenceUnitAnnotationExample</exclude>-->
+                        <!--<exclude>**/SecurityAnnotationExample</exclude>-->
+                        <!--<exclude>**/WebServiceRefAnnotationExample</exclude>-->
+                    <!--</excludes>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -157,21 +171,6 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java Sat Sep 19 16:53:58 2009
@@ -22,7 +22,6 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -39,13 +38,10 @@
 import javax.xml.ws.WebServiceRef;
 import javax.xml.ws.WebServiceRefs;
 
-import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.testsupport.XmlBeansTestSupport;
 import org.apache.geronimo.xbeans.javaee.WebAppDocument;
 import org.apache.geronimo.xbeans.javaee.WebAppType;
 import org.apache.xbean.finder.ClassFinder;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
 
@@ -54,9 +50,9 @@
  */
 public class AnnotationHelperTest extends XmlBeansTestSupport {
 
-    private Class[] classes = {EJBAnnotationTest.class, HandlerChainAnnotationTest.class,
-        PersistenceContextAnnotationTest.class, PersistenceUnitAnnotationTest.class,
-        WebServiceRefAnnotationTest.class, SecurityAnnotationTest.class};
+    private Class[] classes = {EJBAnnotationExample.class, HandlerChainAnnotationExample.class,
+        PersistenceContextAnnotationExample.class, PersistenceUnitAnnotationExample.class,
+        WebServiceRefAnnotationExample.class, SecurityAnnotationExample.class};
 
     private ClassFinder classFinder = new TestClassFinder(classes);
     private ClassLoader classLoader = this.getClass().getClassLoader();
@@ -92,23 +88,23 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(EJBs.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(EJBAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(EJBAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(EJB.class);
         assertNotNull(annotatedMethods);
         assertEquals(2, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(EJBAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{int.class})));
-        assertTrue(annotatedMethods.contains(EJBAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(EJBAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{int.class})));
+        assertTrue(annotatedMethods.contains(EJBAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(EJB.class);
         assertNotNull(annotatedFields);
         assertEquals(6, annotatedFields.size());
-        assertTrue(annotatedFields.contains(EJBAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(EJBAnnotationTest.class.getDeclaredField("annotatedField2")));
-        assertTrue(annotatedFields.contains(EJBAnnotationTest.class.getDeclaredField("annotatedField3")));
-        assertTrue(annotatedFields.contains(EJBAnnotationTest.class.getDeclaredField("annotatedField4")));
-        assertTrue(annotatedFields.contains(EJBAnnotationTest.class.getDeclaredField("annotatedField5")));
-        assertTrue(annotatedFields.contains(EJBAnnotationTest.class.getDeclaredField("annotatedField6")));
+        assertTrue(annotatedFields.contains(EJBAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(EJBAnnotationExample.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(EJBAnnotationExample.class.getDeclaredField("annotatedField3")));
+        assertTrue(annotatedFields.contains(EJBAnnotationExample.class.getDeclaredField("annotatedField4")));
+        assertTrue(annotatedFields.contains(EJBAnnotationExample.class.getDeclaredField("annotatedField5")));
+        assertTrue(annotatedFields.contains(EJBAnnotationExample.class.getDeclaredField("annotatedField6")));
         
         //-------------------------------------------------
         // Ensure annotations are processed correctly
@@ -137,19 +133,19 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(HandlerChain.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(HandlerChainAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(HandlerChainAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(HandlerChain.class);
         assertNotNull(annotatedMethods);
         assertEquals(3, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
-        assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{int.class})));
+        assertTrue(annotatedMethods.contains(HandlerChainAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(HandlerChainAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{int.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(HandlerChain.class);
         assertNotNull(annotatedFields);
         assertEquals(2, annotatedFields.size());
-        assertTrue(annotatedFields.contains(HandlerChainAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(HandlerChainAnnotationTest.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(HandlerChainAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(HandlerChainAnnotationExample.class.getDeclaredField("annotatedField2")));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly
@@ -178,19 +174,19 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(PersistenceContexts.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(PersistenceContextAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(PersistenceContextAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(PersistenceContext.class);
         assertNotNull(annotatedMethods);
         assertEquals(2, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(PersistenceContextAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
-        assertTrue(annotatedMethods.contains(PersistenceContextAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(PersistenceContextAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(PersistenceContextAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(PersistenceContext.class);
         assertNotNull(annotatedFields);
         assertEquals(2, annotatedFields.size());
-        assertTrue(annotatedFields.contains(PersistenceContextAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(PersistenceContextAnnotationTest.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(PersistenceContextAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(PersistenceContextAnnotationExample.class.getDeclaredField("annotatedField2")));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly
@@ -216,19 +212,19 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(PersistenceUnits.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(PersistenceUnitAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(PersistenceUnitAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(PersistenceUnit.class);
         assertNotNull(annotatedMethods);
         assertEquals(2, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(PersistenceUnitAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{int.class})));
-        assertTrue(annotatedMethods.contains(PersistenceUnitAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{boolean.class})));
+        assertTrue(annotatedMethods.contains(PersistenceUnitAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{int.class})));
+        assertTrue(annotatedMethods.contains(PersistenceUnitAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{boolean.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(PersistenceUnit.class);
         assertNotNull(annotatedFields);
         assertEquals(2, annotatedFields.size());
-        assertTrue(annotatedFields.contains(PersistenceUnitAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(PersistenceUnitAnnotationTest.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(PersistenceUnitAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(PersistenceUnitAnnotationExample.class.getDeclaredField("annotatedField2")));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly
@@ -257,23 +253,23 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(WebServiceRefs.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(WebServiceRefAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(WebServiceRefAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(WebServiceRef.class);
         assertNotNull(annotatedMethods);
         assertEquals(5, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(WebServiceRefAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{boolean.class})));
-        assertTrue(annotatedMethods.contains(WebServiceRefAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
-        assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
-        assertTrue(annotatedMethods.contains(HandlerChainAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{int.class})));
+        assertTrue(annotatedMethods.contains(WebServiceRefAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{boolean.class})));
+        assertTrue(annotatedMethods.contains(WebServiceRefAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(HandlerChainAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(HandlerChainAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{int.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(WebServiceRef.class);
         assertNotNull(annotatedFields);
         assertEquals(4, annotatedFields.size());
-        assertTrue(annotatedFields.contains(WebServiceRefAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(WebServiceRefAnnotationTest.class.getDeclaredField("annotatedField2")));
-        assertTrue(annotatedFields.contains(HandlerChainAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(HandlerChainAnnotationTest.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(WebServiceRefAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(WebServiceRefAnnotationExample.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(HandlerChainAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(HandlerChainAnnotationExample.class.getDeclaredField("annotatedField2")));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly
@@ -302,13 +298,13 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(DeclareRoles.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(SecurityAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(SecurityAnnotationExample.class));
 
         annotatedClasses.clear();
         annotatedClasses = classFinder.findAnnotatedClasses(RunAs.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(SecurityAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(SecurityAnnotationExample.class));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -59,7 +59,7 @@
                 beanName = "beanName7",
                 mappedName = "mappedName7")
        })
-public class EJBAnnotationTest {
+public class EJBAnnotationExample {
 
     @EJB
     String annotatedField1;

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -23,7 +23,7 @@
 import javax.xml.ws.WebServiceRef;
 
 @HandlerChain(file = "annotation/handlers1.xml")            // Ignored by Geronimo at the class-level
-public class HandlerChainAnnotationTest {
+public class HandlerChainAnnotationExample {
 
     @WebServiceRef(name = "WebServiceRef1",
                    value = javax.xml.ws.Service.class,

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -35,7 +35,7 @@
                                                   @PersistenceProperty(name="property4", value="value4")},
                                               type = PersistenceContextType.EXTENDED)
                       })
-public class PersistenceContextAnnotationTest {
+public class PersistenceContextAnnotationExample {
 
     @PersistenceContext(name = "PersistenceContext3",
                         properties={@PersistenceProperty(name="property5", value="value5"),

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -30,7 +30,7 @@
                        @PersistenceUnit( unitName = "unitName3"),
                        @PersistenceUnit(name = "PersistenceUnit4")
                    })
-public class PersistenceUnitAnnotationTest {
+public class PersistenceUnitAnnotationExample {
 
     @PersistenceUnit(name = "PersistenceUnit5",
                      unitName = "unitName5")

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -32,7 +32,7 @@
 
 @DeclareRoles( {"securityRole1", "securityRole2", "securityRole3"} )
 @RunAs("securityRole4")
-public class SecurityAnnotationTest extends HttpServlet {
+public class SecurityAnnotationExample extends HttpServlet {
 
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
 

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -33,7 +33,7 @@
                                     wsdlLocation = "WEB-INF/wsdl/WebServiceRef11.wsdl",
                                     mappedName = "mappedName11")
                  })
-public class WebServiceRefAnnotationTest {
+public class WebServiceRefAnnotationExample {
 
     @WebServiceRef(name = "WebServiceRef12",
                    type = javax.xml.ws.Service.class,

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/ejb-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/ejb-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/ejb-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/ejb-expected.xml Sat Sep 19 16:53:58 2009
@@ -64,7 +64,7 @@
         <local>javax.ejb.EJBLocalHome</local>
         <mapped-name>mappedName10</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationExample</injection-target-class>
             <injection-target-name>AnnotatedMethod1</injection-target-name>
         </injection-target>
     </ejb-local-ref>
@@ -72,11 +72,11 @@
         <ejb-ref-name>myejb1</ejb-ref-name>
         <local>javax.ejb.EJBLocalHome</local>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField3</injection-target-name>
         </injection-target>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField4</injection-target-name>
         </injection-target>
     </ejb-local-ref>
@@ -84,11 +84,11 @@
         <ejb-ref-name>myejb2</ejb-ref-name>
         <remote>javax.ejb.EJBHome</remote>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField5</injection-target-name>
         </injection-target>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField6</injection-target-name>
         </injection-target>
     </ejb-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-expected.xml Sat Sep 19 16:53:58 2009
@@ -59,7 +59,7 @@
         <wsdl-file>WEB-INF/wsdl/WebServiceRef5.wsdl</wsdl-file>
         <mapped-name>mappedName5</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -70,7 +70,7 @@
         <wsdl-file>WEB-INF/wsdl/WebServiceRef6.wsdl</wsdl-file>
         <mapped-name>mappedName6</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </service-ref>
@@ -88,7 +88,7 @@
         </handler-chains>
         <mapped-name>mappedName3</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -97,7 +97,7 @@
         <service-interface>int</service-interface>
         <service-ref-type>int</service-ref-type>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </service-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/handler-chain-src.xml Sat Sep 19 16:53:58 2009
@@ -43,7 +43,7 @@
         <wsdl-file>WEB-INF/wsdl/WebServiceRef5.wsdl</wsdl-file>
         <mapped-name>mappedName5</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -54,7 +54,7 @@
         <wsdl-file>WEB-INF/wsdl/WebServiceRef6.wsdl</wsdl-file>
         <mapped-name>mappedName6</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </service-ref>
@@ -64,7 +64,7 @@
         <service-ref-type>javax.xml.ws.Service</service-ref-type>
         <mapped-name>mappedName3</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -73,7 +73,7 @@
         <service-interface>int</service-interface>
         <service-ref-type>int</service-ref-type>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </service-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-context-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-context-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-context-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-context-expected.xml Sat Sep 19 16:53:58 2009
@@ -61,7 +61,7 @@
             <value>value10</value>
         </persistence-property>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod1</injection-target-name>
         </injection-target>
     </persistence-context-ref>
@@ -69,7 +69,7 @@
         <persistence-context-ref-name>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationTest/annotatedMethod2</persistence-context-ref-name>
         <persistence-context-type>Transaction</persistence-context-type>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </persistence-context-ref>
@@ -85,11 +85,11 @@
             <value>value6</value>
         </persistence-property>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField1</injection-target-name>
         </injection-target>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </persistence-context-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-unit-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-unit-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-unit-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/persistence-unit-expected.xml Sat Sep 19 16:53:58 2009
@@ -42,7 +42,7 @@
         <persistence-unit-ref-name>PersistenceUnit7</persistence-unit-ref-name>
         <persistence-unit-name>unitName7</persistence-unit-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod1</injection-target-name>
         </injection-target>
     </persistence-unit-ref>
@@ -50,7 +50,7 @@
         <persistence-unit-ref-name>PersistenceUnit8</persistence-unit-ref-name>
         <persistence-unit-name>unitName8</persistence-unit-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </persistence-unit-ref>
@@ -58,14 +58,14 @@
         <persistence-unit-ref-name>PersistenceUnit5</persistence-unit-ref-name>
         <persistence-unit-name>unitName5</persistence-unit-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField1</injection-target-name>
         </injection-target>
     </persistence-unit-ref>
     <persistence-unit-ref>
         <persistence-unit-ref-name>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationTest/annotatedField2</persistence-unit-ref-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </persistence-unit-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-expected-1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-expected-1.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-expected-1.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-expected-1.xml Sat Sep 19 16:53:58 2009
@@ -25,7 +25,7 @@
     <description>Empty web application</description>
     <servlet>
         <servlet-name>SecurityAnnotationTest</servlet-name>
-        <servlet-class>org.apache.geronimo.j2ee.deployment.annotation.SecurityAnnotationTest</servlet-class>
+        <servlet-class>org.apache.geronimo.j2ee.deployment.annotation.SecurityAnnotationExample</servlet-class>
         <run-as>
             <role-name>securityRole4</role-name>
         </run-as>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-src.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-src.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-src.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/security-src.xml Sat Sep 19 16:53:58 2009
@@ -25,7 +25,7 @@
     <description>Empty web application</description>
     <servlet>
         <servlet-name>SecurityAnnotationTest</servlet-name>
-        <servlet-class>org.apache.geronimo.j2ee.deployment.annotation.SecurityAnnotationTest</servlet-class>
+        <servlet-class>org.apache.geronimo.j2ee.deployment.annotation.SecurityAnnotationExample</servlet-class>
     </servlet>
 
 </web-app>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/annotation/webservice-ref-expected.xml Sat Sep 19 16:53:58 2009
@@ -51,7 +51,7 @@
         </handler-chains>
         <mapped-name>mappedName</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -70,7 +70,7 @@
         </handler-chains>
         <mapped-name>mappedName</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </service-ref>
@@ -89,7 +89,7 @@
         </handler-chains>
         <mapped-name>mappedName</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod3</injection-target-name>
         </injection-target>
     </service-ref>
@@ -100,7 +100,7 @@
         <wsdl-file>WEB-INF/wsdl/WebServiceRef14.wsdl</wsdl-file>
         <mapped-name>mappedName14</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -111,7 +111,7 @@
         <wsdl-file>WEB-INF/wsdl/WebServiceRef15.wsdl</wsdl-file>
         <mapped-name>mappedName15</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </service-ref>
@@ -130,7 +130,7 @@
         </handler-chains>
         <mapped-name>mappedName</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -149,7 +149,7 @@
         </handler-chains>
         <mapped-name>mappedName</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.HandlerChainAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </service-ref>
@@ -159,7 +159,7 @@
         <service-ref-type>javax.xml.ws.Service</service-ref-type>
         <mapped-name>mappedName12</mapped-name>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField1</injection-target-name>
         </injection-target>
     </service-ref>
@@ -168,7 +168,7 @@
         <service-interface>int</service-interface>
         <service-ref-type>int</service-ref-type>
         <injection-target>
-            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationTest</injection-target-class>
+            <injection-target-class>org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationExample</injection-target-class>
             <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </service-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml Sat Sep 19 16:53:58 2009
@@ -62,21 +62,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java Sat Sep 19 16:53:58 2009
@@ -21,7 +21,6 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -43,7 +42,7 @@
  */
 public class AnnotationHelperTest extends XmlBeansTestSupport {
 
-    private Class[] classes = {ResourceAnnotationTest.class};
+    private Class[] classes = {ResourceAnnotationExample.class};
 
     private ClassFinder classFinder = new ClassFinder(classes);
     private ClassLoader classLoader = this.getClass().getClassLoader();
@@ -57,19 +56,19 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(ResourceAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(ResourceAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(Resource.class);
         assertNotNull(annotatedMethods);
         assertEquals(2, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(ResourceAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
-        assertTrue(annotatedMethods.contains(ResourceAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(ResourceAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1", new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(ResourceAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2", new Class[]{String.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(Resource.class);
         assertNotNull(annotatedFields);
         assertEquals(2, annotatedFields.size());
-        assertTrue(annotatedFields.contains(ResourceAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(ResourceAnnotationTest.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(ResourceAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(ResourceAnnotationExample.class.getDeclaredField("annotatedField2")));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly

Copied: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java (from r816864, geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java?p2=geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java&p1=geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java&r1=816864&r2=816942&rev=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java Sat Sep 19 16:53:58 2009
@@ -33,7 +33,7 @@
                           type = javax.xml.ws.Service.class,
                           authenticationType = Resource.AuthenticationType.APPLICATION)
             })
-public class ResourceAnnotationTest {
+public class ResourceAnnotationExample {
 
     @Resource(name = "Resource3",
               type = java.lang.Object.class,

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/ResourceAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/env-entry-expected.xml Sat Sep 19 16:53:58 2009
@@ -33,7 +33,7 @@
         <env-entry-name>org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationTest/annotatedMethod2</env-entry-name>
         <env-entry-type>java.lang.String</env-entry-type>
         <injection-target>
-             <injection-target-class>org.apache.geronimo.naming.deployment.annotation.ResourceAnnotationTest</injection-target-class>
+             <injection-target-class>org.apache.geronimo.naming.deployment.annotation.ResourceAnnotationExample</injection-target-class>
              <injection-target-name>annotatedMethod2</injection-target-name>
         </injection-target>
     </env-entry>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/resources/annotation/service-ref-expected.xml Sat Sep 19 16:53:58 2009
@@ -35,7 +35,7 @@
         <service-ref-type>javax.xml.ws.Service</service-ref-type>
         <mapped-name>mappedName4</mapped-name>
         <injection-target>
-             <injection-target-class>org.apache.geronimo.naming.deployment.annotation.ResourceAnnotationTest</injection-target-class>
+             <injection-target-class>org.apache.geronimo.naming.deployment.annotation.ResourceAnnotationExample</injection-target-class>
              <injection-target-name>annotatedField2</injection-target-name>
         </injection-target>
     </service-ref>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml?rev=816942&r1=816941&r2=816942&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml Sat Sep 19 16:53:58 2009
@@ -62,21 +62,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
-            
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 



Mime
View raw message