geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r546543 - in /geronimo/sandbox/j2g/plugins: org.apache.geronimo.j2g.descriptors.app/test-resources/ org.apache.geronimo.j2g.descriptors.cmp/test-resources/ org.apache.geronimo.j2g.descriptors.ejb/test-resources/ org.apache.geronimo.j2g.desc...
Date Tue, 12 Jun 2007 15:57:53 GMT
Author: pmcmahan
Date: Tue Jun 12 08:57:50 2007
New Revision: 546543

URL: http://svn.apache.org/viewvc?view=rev&rev=546543
Log:
GERONIMO-3157 update unit tests for J2G.  Patch provided by Jason Warner.

Modified:
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/geronimo-application.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/jboss-app.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/ejb-jar.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/jbosscmp-jdbc.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/test-resources/jboss.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/test-resources/jboss-web.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jbossmq-destinations-service.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-ds.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test/org/apache/geronimo/j2g/util/descriptors/xml/test/TestXMLConversionHelper.java

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/geronimo-application.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/geronimo-application.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/geronimo-application.xml
Tue Jun 12 08:57:50 2007
@@ -1,20 +1,4 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <sys:environment>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/jboss-app.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/jboss-app.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/jboss-app.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/test-resources/jboss-app.xml
Tue Jun 12 08:57:50 2007
@@ -1,24 +1,22 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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
 
-<!DOCTYPE jboss-app
-    PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+     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. -->
+  
+<!--DOCTYPE ejb-jar PUBLIC
+      "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+      "http://java.sun.com/dtd/ejb-jar_2_0.dtd" -->
 
 <jboss-app>
     <security-domain>securiyDomain</security-domain>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/ejb-jar.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/ejb-jar.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/ejb-jar.xml
Tue Jun 12 08:57:50 2007
@@ -145,7 +145,6 @@
             <ejb-relationship-role-name>gangster-belongs-to-org</ejb-relationship-role-name>
             
             <multiplicity>Many</multiplicity> 
-            <cascade-delete/>
             
             <relationship-role-source>   
                <ejb-name>GangsterEJB</ejb-name> 

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/jbosscmp-jdbc.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/jbosscmp-jdbc.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/jbosscmp-jdbc.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test-resources/jbosscmp-jdbc.xml
Tue Jun 12 08:57:50 2007
@@ -1,24 +1,23 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
- <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jbosscmp-jdbc PUBLIC   
-   "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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. -->
+  
+<!--DOCTYPE ejb-jar PUBLIC
+      "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+      "http://java.sun.com/dtd/ejb-jar_2_0.dtd" -->
+
 
 <jbosscmp-jdbc>
    <defaults>
@@ -43,7 +42,6 @@
          <cmp-field>
             <field-name>description</field-name>
             <column-name>desc</column-name>
-            <not-null/>
          </cmp-field>
       </entity>
 
@@ -58,7 +56,6 @@
          <cmp-field>
             <field-name>name</field-name>
             <column-name>name</column-name>
-            <not-null/>
          </cmp-field>
          <cmp-field>
             <field-name>nickName</field-name>
@@ -94,7 +91,6 @@
    <relationships>
       <ejb-relation>
          <ejb-relation-name>Organization-Gangster</ejb-relation-name>
-         <foreign-key-mapping/>
 
          <ejb-relationship-role> 
             <ejb-relationship-role-name>org-has-gangsters</ejb-relationship-role-name>
@@ -108,7 +104,6 @@
 
          <ejb-relationship-role> 
             <ejb-relationship-role-name>gangster-belongs-to-org</ejb-relationship-role-name>
-            <key-fields/>
          </ejb-relationship-role> 
       </ejb-relation> 
 
@@ -141,22 +136,16 @@
 
       <ejb-relation>
          <ejb-relation-name>Organization-Boss</ejb-relation-name>
-         <foreign-key-mapping/>
-
+		 
          <ejb-relationship-role> 
             <ejb-relationship-role-name>organization-has-a-boss</ejb-relationship-role-name>
-            <key-fields/>
-         </ejb-relationship-role> 
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>boss-runs-an-organization</ejb-relationship-role-name>
-            <key-fields>
-               <key-field>
-                  <field-name>gangsterId</field-name>
-                  <column-name>the_boss</column-name>
-               </key-field>
-            </key-fields>
-         </ejb-relationship-role> 
+			<key-fields>
+			    <key-field>
+				  <field-name>name</field-name>
+				  <column-name>boss</column-name>
+				</key-field>
+			</key-fields>
+         </ejb-relationship-role>  
       </ejb-relation> 
    </relationships>
 </jbosscmp-jdbc>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/test-resources/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/test-resources/jboss.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/test-resources/jboss.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/test-resources/jboss.xml
Tue Jun 12 08:57:50 2007
@@ -1,24 +1,22 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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
 
-<!DOCTYPE jboss PUBLIC
-   "-//JBoss//DTD JBOSS 3.0//EN"
-   "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+     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. -->
+  
+<!--DOCTYPE ejb-jar PUBLIC
+      "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+      "http://java.sun.com/dtd/ejb-jar_2_0.dtd" -->
 
 <jboss>
    <enterprise-beans>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/test-resources/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/test-resources/jboss-web.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/test-resources/jboss-web.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/test-resources/jboss-web.xml
Tue Jun 12 08:57:50 2007
@@ -1,22 +1,22 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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.
- */
- <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN"
-        "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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. -->
+  
+<!--DOCTYPE ejb-jar PUBLIC
+      "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+      "http://java.sun.com/dtd/ejb-jar_2_0.dtd" -->
 
 <jboss-web>
     <security-domain>securityDomation</security-domain>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jbossmq-destinations-service.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jbossmq-destinations-service.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jbossmq-destinations-service.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jbossmq-destinations-service.xml
Tue Jun 12 08:57:50 2007
@@ -14,9 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License. -->
 
-<!DOCTYPE server
+<!--DOCTYPE server
     PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
+    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd"-->
 
 
 <!-- $Id$ -->

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-ds.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-ds.xml?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-ds.xml
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-ds.xml
Tue Jun 12 08:57:50 2007
@@ -14,9 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License. -->
 
-<!DOCTYPE connection-factories
+<!--!DOCTYPE connection-factories
     PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+    "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"-->
 
 
 <connection-factories>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test/org/apache/geronimo/j2g/util/descriptors/xml/test/TestXMLConversionHelper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test/org/apache/geronimo/j2g/util/descriptors/xml/test/TestXMLConversionHelper.java?view=diff&rev=546543&r1=546542&r2=546543
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test/org/apache/geronimo/j2g/util/descriptors/xml/test/TestXMLConversionHelper.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test/org/apache/geronimo/j2g/util/descriptors/xml/test/TestXMLConversionHelper.java
Tue Jun 12 08:57:50 2007
@@ -37,7 +37,7 @@
 
     public void testGetDocument() {
 
-        File file = new File("test-resources/jboss-xml/jboss-web.xml");
+        File file = new File("test-apps/jboss-xml/jboss-web.xml");
         try {
             Document doucument = XMLConversionHelper.getDocument(file);
             System.out.println("Got document");
@@ -49,7 +49,7 @@
 
     public void testGetGeronimoElement() {
 
-        String directoryName = "test-resources/jboss-xml";
+        String directoryName = "test-apps/jboss-xml";
         try {
             Document geronimoDocument = XMLConversionHelper.getOpenEJBJarDocument(directoryName);
             
@@ -63,8 +63,8 @@
     }
 
     public void testSaveOpenEJBDocument(){
-        String fileName = "test-resources/test-app-jboss/openejb-jar-serialized.xml";
-        String directoryName = "test-resources/test-app-jboss";
+        String fileName = "test-apps/test-app-jboss/openejb-jar-serialized.xml";
+        String directoryName = "test-apps/test-app-jboss";
         try {
             Document document = XMLConversionHelper.getOpenEJBJarDocument(directoryName);
             XMLConversionHelper.saveOpenEJBDocument(fileName,document);



Mime
View raw message