geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r561821 [4/12] - in /geronimo/sandbox/j2g: ./ configurator/ doc/ plugins/ plugins/org.apache.geronimo.j2g.common/ plugins/org.apache.geronimo.j2g.descriptors/ plugins/org.apache.geronimo.j2g.descriptors/src/ plugins/org.apache.geronimo.j2g....
Date Wed, 01 Aug 2007 15:05:17 GMT
Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java Wed Aug  1 08:05:12 2007
@@ -1,154 +1,154 @@
-/**
- *  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.
- */
-package org.apache.geronimo.j2g.descriptors.web;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.j2g.common.ConsoleOutput;
-import org.apache.geronimo.j2g.common.IFileMigration;
-import org.apache.geronimo.j2g.common.IOutput;
-import org.apache.geronimo.j2g.common.Tool;
-import org.apache.geronimo.j2g.util.descriptors.Constants;
-import org.apache.geronimo.j2g.util.descriptors.env.EnvirionmentElementProcessor;
-import org.apache.geronimo.j2g.util.descriptors.naming.NamingElementProcessor;
-import org.apache.geronimo.j2g.util.descriptors.security.SecurityElementProcessor;
-import org.apache.geronimo.j2g.util.descriptors.xml.XMLConversionHelper;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.QName;
-
-public class WebDescriptorTool implements IFileMigration {
-
-    private IOutput out;
-
-    private static Log logger = LogFactory.getLog(WebDescriptorTool.class);
-
-    private EnvirionmentElementProcessor envirionmentElementProcessor;
-
-    private SecurityElementProcessor securityElementProcessor;
-
-    private NamingElementProcessor namingElementProcessor;
-
-    public WebDescriptorTool() {
-    	
-    	Tool currentTool = Tool.getCurrent();
-    	if (currentTool != null) {
-    		out = currentTool.getOutput();
-    	} else {
-    		out = new ConsoleOutput();
-    	}
-        envirionmentElementProcessor = new EnvirionmentElementProcessor();
-        securityElementProcessor = new SecurityElementProcessor();
-        namingElementProcessor = new NamingElementProcessor(envirionmentElementProcessor);
-    }
-
-    public boolean migrate(File file, File rootDirectory) {
-
-        boolean migrated = false;
-            String directoryName = file.getParent();
-            String jbossFileName = file.getName();
-            logger.debug("Directory Name ==> " + directoryName + " jboss file Name ==> "
-                    + jbossFileName);
-            if (jbossFileName.equals(Constants.JBOSS_WEB_XML_FILE)) {
-                out.info(WebDescriptorTool.class.getSimpleName(), "Converting Jboss-web.xml file in " + directoryName);
-                try {
-                    Document jbossDocument = XMLConversionHelper.getDocument(file);
-                    Document geronimoDocument = XMLConversionHelper.createNewGeronimoDocument(
-                            Constants.WEB_NAME_SPACE, Constants.GERONIMO_WEB_XML_ROOT_NODE);
-                    migrate(jbossDocument.getRootElement(), geronimoDocument.getRootElement());
-                    String geronimoWebFileName = directoryName + File.separator
-                            + Constants.GERONIMO_WEB_XML_FILE;
-                    XMLConversionHelper.saveGeronimoDocument(geronimoWebFileName, geronimoDocument);
-                    migrated = true;
-                    out.info(WebDescriptorTool.class.getSimpleName(), "Successfully migrated the jboss-web.xml file in "
-                            + directoryName + ", with the error and warning messages as shown");
-                } catch (DocumentException e) {
-                	out.error(WebDescriptorTool.class.getSimpleName(), "Error occured while reading xml descriptor "
-    						+ file.getAbsolutePath()
-    						+ ". It is possible that the migrator cannot download the xml schema or the xml file has incorrectsyntax. Nested exception:"
-    						+ e.getMessage());
-                } catch (IOException e) {
-                    out.error(WebDescriptorTool.class.getSimpleName(), "IO exception " + e.getMessage());
-                }
-            } else if (jbossFileName.equals(Constants.WEB_XML_FILE)){
-                out.info(WebDescriptorTool.class.getSimpleName(), "Converting web.xml file in " + directoryName);
-                out.info(WebDescriptorTool.class.getSimpleName(), "Nothing to convert. No changes are required for this file");
-            }
-        return migrated;
-    }
-
-    private void migrate(Element jbossRootElement, Element geronimoRootElement) {
-
-        // migrate the web descriptor componets here
-        Element jbossRootChildElement;
-        for (Iterator iter = jbossRootElement.elements().iterator(); iter.hasNext();) {
-            jbossRootChildElement = (Element) iter.next();
-            if (jbossRootChildElement.getName().equals("context-root")) {
-                QName qname = new QName("context-root", geronimoRootElement.getNamespace());
-                Element contextRootElement = geronimoRootElement.addElement(qname);
-                contextRootElement.setText(jbossRootChildElement.getText());
-            } else if (jbossRootChildElement.getName().equals("security-domain")) {
-                QName qname = new QName("security-realm-name", geronimoRootElement.getNamespace());
-                Element realmNameElement = geronimoRootElement.addElement(qname);
-                realmNameElement.setText(jbossRootChildElement.getText());
-                securityElementProcessor.setSecurityDomain(jbossRootChildElement.getText());
-            } else if (jbossRootChildElement.getName().equals("security-role")) {
-                Element geronimoRoleMapping = securityElementProcessor
-                        .getGeronimoSecurityRoleElement(geronimoRootElement);
-                securityElementProcessor.migrateSecurityRole(jbossRootChildElement,
-                        geronimoRoleMapping);
-            } else if (jbossRootChildElement.getName().equals("resource-ref")) {
-                QName qname = new QName("resource-ref", geronimoRootElement
-                        .getNamespaceForPrefix(Constants.NAMING_NAME_SPACE_PREFIX));
-                Element geronimoResourceRef = geronimoRootElement.addElement(qname);
-                namingElementProcessor.migrateResourceRef(jbossRootChildElement,
-                        geronimoResourceRef);
-            } else if (jbossRootChildElement.getName().equals("ejb-ref")) {
-                out.error(WebDescriptorTool.class.getSimpleName(), 
-                        "The Element 'ejb-ref' is not supported. It is not possible to determine the EJB name "
-                                + "from the jndi name. Please migrate this element manually",
-                        XMLConversionHelper.getLineNumber(jbossRootChildElement),
-                        XMLConversionHelper.getColumnNumber(jbossRootChildElement));
-                logger
-                        .debug("The Element 'ejb-ref' is not supported. It is not possible to determine the EJB name "
-                                + "from the jndi name. Please migrate this element manually");
-            } else if (jbossRootChildElement.getName().equals("ejb-local-ref")) {
-                out.error(WebDescriptorTool.class.getSimpleName(), 
-                        "The Element 'ejb-local-ref' is not supported. It is not possible to determine the EJB name "
-                                + "from the jndi name. Please migrate this element manually",
-                        XMLConversionHelper.getLineNumber(jbossRootChildElement),
-                        XMLConversionHelper.getColumnNumber(jbossRootChildElement));
-                logger
-                        .debug("The Element 'ejb-local-ref' is not supported. It is not possible to determine the EJB name "
-                                + "from the jndi name. Please migrate this element manually");
-            } else {
-                out.warn(WebDescriptorTool.class.getSimpleName(), 
-                        "The Element '" + jbossRootChildElement.getName() + "' is not supported. ",
-                        XMLConversionHelper.getLineNumber(jbossRootChildElement),
-                        XMLConversionHelper.getColumnNumber(jbossRootChildElement));
-                logger.debug("The Element '" + jbossRootChildElement.getName()
-                        + "' is not supported. ");
-            }
-        }
-    }
-
-}
+/**
+ *  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.
+ */
+package org.apache.geronimo.j2g.descriptors.web;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.j2g.common.ConsoleOutput;
+import org.apache.geronimo.j2g.common.IFileMigration;
+import org.apache.geronimo.j2g.common.IOutput;
+import org.apache.geronimo.j2g.common.Tool;
+import org.apache.geronimo.j2g.util.descriptors.Constants;
+import org.apache.geronimo.j2g.util.descriptors.env.EnvirionmentElementProcessor;
+import org.apache.geronimo.j2g.util.descriptors.naming.NamingElementProcessor;
+import org.apache.geronimo.j2g.util.descriptors.security.SecurityElementProcessor;
+import org.apache.geronimo.j2g.util.descriptors.xml.XMLConversionHelper;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.QName;
+
+public class WebDescriptorTool implements IFileMigration {
+
+    private IOutput out;
+
+    private static Log logger = LogFactory.getLog(WebDescriptorTool.class);
+
+    private EnvirionmentElementProcessor envirionmentElementProcessor;
+
+    private SecurityElementProcessor securityElementProcessor;
+
+    private NamingElementProcessor namingElementProcessor;
+
+    public WebDescriptorTool() {
+    	
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
+        envirionmentElementProcessor = new EnvirionmentElementProcessor();
+        securityElementProcessor = new SecurityElementProcessor();
+        namingElementProcessor = new NamingElementProcessor(envirionmentElementProcessor);
+    }
+
+    public boolean migrate(File file, File rootDirectory) {
+
+        boolean migrated = false;
+            String directoryName = file.getParent();
+            String jbossFileName = file.getName();
+            logger.debug("Directory Name ==> " + directoryName + " jboss file Name ==> "
+                    + jbossFileName);
+            if (jbossFileName.equals(Constants.JBOSS_WEB_XML_FILE)) {
+                out.info(WebDescriptorTool.class.getSimpleName(), "Converting Jboss-web.xml file in " + directoryName);
+                try {
+                    Document jbossDocument = XMLConversionHelper.getDocument(file);
+                    Document geronimoDocument = XMLConversionHelper.createNewGeronimoDocument(
+                            Constants.WEB_NAME_SPACE, Constants.GERONIMO_WEB_XML_ROOT_NODE);
+                    migrate(jbossDocument.getRootElement(), geronimoDocument.getRootElement());
+                    String geronimoWebFileName = directoryName + File.separator
+                            + Constants.GERONIMO_WEB_XML_FILE;
+                    XMLConversionHelper.saveGeronimoDocument(geronimoWebFileName, geronimoDocument);
+                    migrated = true;
+                    out.info(WebDescriptorTool.class.getSimpleName(), "Successfully migrated the jboss-web.xml file in "
+                            + directoryName + ", with the error and warning messages as shown");
+                } catch (DocumentException e) {
+                	out.error(WebDescriptorTool.class.getSimpleName(), "Error occured while reading xml descriptor "
+    						+ file.getAbsolutePath()
+    						+ ". It is possible that the migrator cannot download the xml schema or the xml file has incorrectsyntax. Nested exception:"
+    						+ e.getMessage());
+                } catch (IOException e) {
+                    out.error(WebDescriptorTool.class.getSimpleName(), "IO exception " + e.getMessage());
+                }
+            } else if (jbossFileName.equals(Constants.WEB_XML_FILE)){
+                out.info(WebDescriptorTool.class.getSimpleName(), "Converting web.xml file in " + directoryName);
+                out.info(WebDescriptorTool.class.getSimpleName(), "Nothing to convert. No changes are required for this file");
+            }
+        return migrated;
+    }
+
+    private void migrate(Element jbossRootElement, Element geronimoRootElement) {
+
+        // migrate the web descriptor componets here
+        Element jbossRootChildElement;
+        for (Iterator iter = jbossRootElement.elements().iterator(); iter.hasNext();) {
+            jbossRootChildElement = (Element) iter.next();
+            if (jbossRootChildElement.getName().equals("context-root")) {
+                QName qname = new QName("context-root", geronimoRootElement.getNamespace());
+                Element contextRootElement = geronimoRootElement.addElement(qname);
+                contextRootElement.setText(jbossRootChildElement.getText());
+            } else if (jbossRootChildElement.getName().equals("security-domain")) {
+                QName qname = new QName("security-realm-name", geronimoRootElement.getNamespace());
+                Element realmNameElement = geronimoRootElement.addElement(qname);
+                realmNameElement.setText(jbossRootChildElement.getText());
+                securityElementProcessor.setSecurityDomain(jbossRootChildElement.getText());
+            } else if (jbossRootChildElement.getName().equals("security-role")) {
+                Element geronimoRoleMapping = securityElementProcessor
+                        .getGeronimoSecurityRoleElement(geronimoRootElement);
+                securityElementProcessor.migrateSecurityRole(jbossRootChildElement,
+                        geronimoRoleMapping);
+            } else if (jbossRootChildElement.getName().equals("resource-ref")) {
+                QName qname = new QName("resource-ref", geronimoRootElement
+                        .getNamespaceForPrefix(Constants.NAMING_NAME_SPACE_PREFIX));
+                Element geronimoResourceRef = geronimoRootElement.addElement(qname);
+                namingElementProcessor.migrateResourceRef(jbossRootChildElement,
+                        geronimoResourceRef);
+            } else if (jbossRootChildElement.getName().equals("ejb-ref")) {
+                out.error(WebDescriptorTool.class.getSimpleName(), 
+                        "The Element 'ejb-ref' is not supported. It is not possible to determine the EJB name "
+                                + "from the jndi name. Please migrate this element manually",
+                        XMLConversionHelper.getLineNumber(jbossRootChildElement),
+                        XMLConversionHelper.getColumnNumber(jbossRootChildElement));
+                logger
+                        .debug("The Element 'ejb-ref' is not supported. It is not possible to determine the EJB name "
+                                + "from the jndi name. Please migrate this element manually");
+            } else if (jbossRootChildElement.getName().equals("ejb-local-ref")) {
+                out.error(WebDescriptorTool.class.getSimpleName(), 
+                        "The Element 'ejb-local-ref' is not supported. It is not possible to determine the EJB name "
+                                + "from the jndi name. Please migrate this element manually",
+                        XMLConversionHelper.getLineNumber(jbossRootChildElement),
+                        XMLConversionHelper.getColumnNumber(jbossRootChildElement));
+                logger
+                        .debug("The Element 'ejb-local-ref' is not supported. It is not possible to determine the EJB name "
+                                + "from the jndi name. Please migrate this element manually");
+            } else {
+                out.warn(WebDescriptorTool.class.getSimpleName(), 
+                        "The Element '" + jbossRootChildElement.getName() + "' is not supported. ",
+                        XMLConversionHelper.getLineNumber(jbossRootChildElement),
+                        XMLConversionHelper.getColumnNumber(jbossRootChildElement));
+                logger.debug("The Element '" + jbossRootChildElement.getName()
+                        + "' is not supported. ");
+            }
+        }
+    }
+
+}

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml Wed Aug  1 08:05:12 2007
@@ -1,242 +1,242 @@
-<?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" -->
-
-<ejb-jar>
-   <display-name>CMP 2.0 Lab Jar</display-name>
-
-   <enterprise-beans>
-      <session>
-         <description>JUnit Session Bean Test Runner</description>
-         <ejb-name>EJBTestRunnerEJB</ejb-name>
-         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
-         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
-         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Bean</transaction-type>
-      </session>
-
-      <entity>
-         <display-name>Organization Entity Bean</display-name>
-         <ejb-name>OrganizationEJB</ejb-name>
-
-         <local-home>org.jboss.docs.cmp2.crimeportal.OrganizationHome</local-home>
-         <local>org.jboss.docs.cmp2.crimeportal.Organization</local>
-         <ejb-class>org.jboss.docs.cmp2.crimeportal.OrganizationBean</ejb-class>
-
-         <persistence-type>Container</persistence-type>
-         <prim-key-class>java.lang.String</prim-key-class>
-         <reentrant>False</reentrant> 
-         <cmp-version>2.x</cmp-version>
-         <abstract-schema-name>organization</abstract-schema-name>
-
-         <cmp-field><field-name>name</field-name></cmp-field>
-         <cmp-field><field-name>description</field-name></cmp-field>
-
-         <primkey-field>name</primkey-field>
-      </entity>
-
-      <entity>
-         <display-name>Gangster Entity Bean</display-name>
-         <ejb-name>GangsterEJB</ejb-name>
-
-         <local-home>org.jboss.docs.cmp2.crimeportal.GangsterHome</local-home>
-         <local>org.jboss.docs.cmp2.crimeportal.Gangster</local>
-         <ejb-class>org.jboss.docs.cmp2.crimeportal.GangsterBean</ejb-class>
-
-         <persistence-type>Container</persistence-type>
-         <prim-key-class>java.lang.Integer</prim-key-class>
-         <reentrant>False</reentrant> 
-         <cmp-version>2.x</cmp-version>
-         <abstract-schema-name>gangster</abstract-schema-name>
-         
-         <cmp-field><field-name>gangsterId</field-name></cmp-field>
-         <cmp-field><field-name>name</field-name></cmp-field>
-         <cmp-field><field-name>nickName</field-name></cmp-field>
-         <cmp-field><field-name>badness</field-name></cmp-field>
-         
-         <primkey-field>gangsterId</primkey-field>
-
-         <query>
-            <query-method>
-               <method-name>findBadDudes</method-name>
-               <method-params><method-param>int</method-param></method-params>
-            </query-method>
-            <ejb-ql><![CDATA[
-               SELECT OBJECT(g)
-               FROM gangster g
-               WHERE g.badness > ?1
-            ]]></ejb-ql>
-         </query>
-
-         <query>
-            <query-method>
-               <method-name>ejbSelectBoss</method-name>
-               <method-params>
-                  <method-param>java.lang.String</method-param>
-               </method-params>
-            </query-method>
-            <ejb-ql><![CDATA[
-               SELECT DISTINCT underling.organization.theBoss
-               FROM gangster underling
-               WHERE underling.name = ?1 OR underling.nickName = ?1
-            ]]></ejb-ql>
-         </query>
-      </entity>
-
-      <entity>
-         <display-name>Job Entity Bean</display-name>
-         <ejb-name>JobEJB</ejb-name>
-
-         <local-home>org.jboss.docs.cmp2.crimeportal.JobHome</local-home>
-         <local>org.jboss.docs.cmp2.crimeportal.Job</local>
-         <ejb-class>org.jboss.docs.cmp2.crimeportal.JobBean</ejb-class>
-
-         <persistence-type>Container</persistence-type>
-         <prim-key-class>java.lang.String</prim-key-class>
-         <reentrant>False</reentrant> 
-         <cmp-version>2.x</cmp-version>
-         <abstract-schema-name>job</abstract-schema-name>
-         
-         <cmp-field><field-name>name</field-name></cmp-field>
-         <cmp-field><field-name>score</field-name></cmp-field>
-         <cmp-field><field-name>setupCost</field-name></cmp-field>
-         
-         <primkey-field>name</primkey-field>
-      </entity>
-   </enterprise-beans>
-
-   <relationships>
-      <ejb-relation>
-         <ejb-relation-name>Organization-Gangster</ejb-relation-name>
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>org-has-gangsters</ejb-relationship-role-name>
-
-            <multiplicity>One</multiplicity> 
-
-            <relationship-role-source> 
-               <ejb-name>OrganizationEJB</ejb-name> 
-            </relationship-role-source> 
-            
-            <cmr-field>
-               <cmr-field-name>memberGangsters</cmr-field-name> 
-               <cmr-field-type>java.util.Set</cmr-field-type> 
-            </cmr-field> 
-         </ejb-relationship-role> 
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>gangster-belongs-to-org</ejb-relationship-role-name>
-            
-            <multiplicity>Many</multiplicity> 
-            
-            <relationship-role-source>   
-               <ejb-name>GangsterEJB</ejb-name> 
-            </relationship-role-source> 
-          
-            <cmr-field> 
-               <cmr-field-name>organization</cmr-field-name>
-            </cmr-field> 
-         </ejb-relationship-role> 
-      </ejb-relation> 
-
-      <ejb-relation>
-         <ejb-relation-name>Gangster-Jobs</ejb-relation-name>
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>gangster-has-jobs</ejb-relationship-role-name>
-
-            <multiplicity>Many</multiplicity> 
-
-            <relationship-role-source> 
-               <ejb-name>GangsterEJB</ejb-name> 
-            </relationship-role-source> 
-            
-            <cmr-field>
-               <cmr-field-name>jobs</cmr-field-name> 
-               <cmr-field-type>java.util.Set</cmr-field-type> 
-            </cmr-field> 
-         </ejb-relationship-role> 
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>job-has-gangsters</ejb-relationship-role-name>
-            
-            <multiplicity>Many</multiplicity> 
-            
-            <relationship-role-source>   
-               <ejb-name>JobEJB</ejb-name> 
-            </relationship-role-source> 
-          
-            <cmr-field> 
-               <cmr-field-name>gangsters</cmr-field-name>
-               <cmr-field-type>java.util.Set</cmr-field-type> 
-            </cmr-field> 
-         </ejb-relationship-role> 
-      </ejb-relation> 
-
-      <ejb-relation>
-         <ejb-relation-name>Organization-Boss</ejb-relation-name>
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>organization-has-a-boss</ejb-relationship-role-name>
-
-            <multiplicity>One</multiplicity> 
-
-            <relationship-role-source> 
-               <ejb-name>OrganizationEJB</ejb-name> 
-            </relationship-role-source> 
-            
-            <cmr-field>
-               <cmr-field-name>theBoss</cmr-field-name> 
-            </cmr-field> 
-         </ejb-relationship-role> 
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>boss-runs-an-organization</ejb-relationship-role-name>
-            
-            <multiplicity>One</multiplicity> 
-            
-            <relationship-role-source>   
-               <ejb-name>GangsterEJB</ejb-name> 
-            </relationship-role-source> 
-
-         </ejb-relationship-role> 
-      </ejb-relation> 
-   </relationships>
-
-   <assembly-descriptor>
-
-      <container-transaction>
-         <method>
-            <ejb-name>OrganizationEJB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>GangsterEJB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <method>
-            <ejb-name>JobEJB</ejb-name>
-            <method-name>*</method-name>
-         </method>
-         <trans-attribute>Required</trans-attribute>
-      </container-transaction>
-
-   </assembly-descriptor>
-</ejb-jar>
+<?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" -->
+
+<ejb-jar>
+   <display-name>CMP 2.0 Lab Jar</display-name>
+
+   <enterprise-beans>
+      <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+
+      <entity>
+         <display-name>Organization Entity Bean</display-name>
+         <ejb-name>OrganizationEJB</ejb-name>
+
+         <local-home>org.jboss.docs.cmp2.crimeportal.OrganizationHome</local-home>
+         <local>org.jboss.docs.cmp2.crimeportal.Organization</local>
+         <ejb-class>org.jboss.docs.cmp2.crimeportal.OrganizationBean</ejb-class>
+
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant> 
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>organization</abstract-schema-name>
+
+         <cmp-field><field-name>name</field-name></cmp-field>
+         <cmp-field><field-name>description</field-name></cmp-field>
+
+         <primkey-field>name</primkey-field>
+      </entity>
+
+      <entity>
+         <display-name>Gangster Entity Bean</display-name>
+         <ejb-name>GangsterEJB</ejb-name>
+
+         <local-home>org.jboss.docs.cmp2.crimeportal.GangsterHome</local-home>
+         <local>org.jboss.docs.cmp2.crimeportal.Gangster</local>
+         <ejb-class>org.jboss.docs.cmp2.crimeportal.GangsterBean</ejb-class>
+
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Integer</prim-key-class>
+         <reentrant>False</reentrant> 
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>gangster</abstract-schema-name>
+         
+         <cmp-field><field-name>gangsterId</field-name></cmp-field>
+         <cmp-field><field-name>name</field-name></cmp-field>
+         <cmp-field><field-name>nickName</field-name></cmp-field>
+         <cmp-field><field-name>badness</field-name></cmp-field>
+         
+         <primkey-field>gangsterId</primkey-field>
+
+         <query>
+            <query-method>
+               <method-name>findBadDudes</method-name>
+               <method-params><method-param>int</method-param></method-params>
+            </query-method>
+            <ejb-ql><![CDATA[
+               SELECT OBJECT(g)
+               FROM gangster g
+               WHERE g.badness > ?1
+            ]]></ejb-ql>
+         </query>
+
+         <query>
+            <query-method>
+               <method-name>ejbSelectBoss</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[
+               SELECT DISTINCT underling.organization.theBoss
+               FROM gangster underling
+               WHERE underling.name = ?1 OR underling.nickName = ?1
+            ]]></ejb-ql>
+         </query>
+      </entity>
+
+      <entity>
+         <display-name>Job Entity Bean</display-name>
+         <ejb-name>JobEJB</ejb-name>
+
+         <local-home>org.jboss.docs.cmp2.crimeportal.JobHome</local-home>
+         <local>org.jboss.docs.cmp2.crimeportal.Job</local>
+         <ejb-class>org.jboss.docs.cmp2.crimeportal.JobBean</ejb-class>
+
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant> 
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>job</abstract-schema-name>
+         
+         <cmp-field><field-name>name</field-name></cmp-field>
+         <cmp-field><field-name>score</field-name></cmp-field>
+         <cmp-field><field-name>setupCost</field-name></cmp-field>
+         
+         <primkey-field>name</primkey-field>
+      </entity>
+   </enterprise-beans>
+
+   <relationships>
+      <ejb-relation>
+         <ejb-relation-name>Organization-Gangster</ejb-relation-name>
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>org-has-gangsters</ejb-relationship-role-name>
+
+            <multiplicity>One</multiplicity> 
+
+            <relationship-role-source> 
+               <ejb-name>OrganizationEJB</ejb-name> 
+            </relationship-role-source> 
+            
+            <cmr-field>
+               <cmr-field-name>memberGangsters</cmr-field-name> 
+               <cmr-field-type>java.util.Set</cmr-field-type> 
+            </cmr-field> 
+         </ejb-relationship-role> 
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>gangster-belongs-to-org</ejb-relationship-role-name>
+            
+            <multiplicity>Many</multiplicity> 
+            
+            <relationship-role-source>   
+               <ejb-name>GangsterEJB</ejb-name> 
+            </relationship-role-source> 
+          
+            <cmr-field> 
+               <cmr-field-name>organization</cmr-field-name>
+            </cmr-field> 
+         </ejb-relationship-role> 
+      </ejb-relation> 
+
+      <ejb-relation>
+         <ejb-relation-name>Gangster-Jobs</ejb-relation-name>
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>gangster-has-jobs</ejb-relationship-role-name>
+
+            <multiplicity>Many</multiplicity> 
+
+            <relationship-role-source> 
+               <ejb-name>GangsterEJB</ejb-name> 
+            </relationship-role-source> 
+            
+            <cmr-field>
+               <cmr-field-name>jobs</cmr-field-name> 
+               <cmr-field-type>java.util.Set</cmr-field-type> 
+            </cmr-field> 
+         </ejb-relationship-role> 
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>job-has-gangsters</ejb-relationship-role-name>
+            
+            <multiplicity>Many</multiplicity> 
+            
+            <relationship-role-source>   
+               <ejb-name>JobEJB</ejb-name> 
+            </relationship-role-source> 
+          
+            <cmr-field> 
+               <cmr-field-name>gangsters</cmr-field-name>
+               <cmr-field-type>java.util.Set</cmr-field-type> 
+            </cmr-field> 
+         </ejb-relationship-role> 
+      </ejb-relation> 
+
+      <ejb-relation>
+         <ejb-relation-name>Organization-Boss</ejb-relation-name>
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>organization-has-a-boss</ejb-relationship-role-name>
+
+            <multiplicity>One</multiplicity> 
+
+            <relationship-role-source> 
+               <ejb-name>OrganizationEJB</ejb-name> 
+            </relationship-role-source> 
+            
+            <cmr-field>
+               <cmr-field-name>theBoss</cmr-field-name> 
+            </cmr-field> 
+         </ejb-relationship-role> 
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>boss-runs-an-organization</ejb-relationship-role-name>
+            
+            <multiplicity>One</multiplicity> 
+            
+            <relationship-role-source>   
+               <ejb-name>GangsterEJB</ejb-name> 
+            </relationship-role-source> 
+
+         </ejb-relationship-role> 
+      </ejb-relation> 
+   </relationships>
+
+   <assembly-descriptor>
+
+      <container-transaction>
+         <method>
+            <ejb-name>OrganizationEJB</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>GangsterEJB</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <method>
+            <ejb-name>JobEJB</ejb-name>
+            <method-name>*</method-name>
+         </method>
+         <trans-attribute>Required</trans-attribute>
+      </container-transaction>
+
+   </assembly-descriptor>
+</ejb-jar>

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/ejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml Wed Aug  1 08:05:12 2007
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-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>
-    <sys:moduleId>
-      <sys:groupId>j2g</sys:groupId>
-      <sys:artifactId>web-module</sys:artifactId>
-      <sys:version>1.0</sys:version>
-      <sys:type>war</sys:type>
-    </sys:moduleId>
-    <sys:dependencies>
-      <sys:dependency>
-        <sys:groupId>j2g.jdbc</sys:groupId>
-        <sys:artifactId>TestDB</sys:artifactId>
-        <sys:version>1.0</sys:version>
-        <sys:type>rar</sys:type>
-      </sys:dependency>
-    </sys:dependencies>
-  </sys:environment>
-  <security-realm-name>securityDomation</security-realm-name>
-  <context-root>/myApp</context-root>
-  <naming:resource-ref>
-    <naming:ref-name>resource1</naming:ref-name>
-    <naming:resource-link>TestDB</naming:resource-link>
-  </naming:resource-ref>
-  <security:security>
-    <security:default-principal>
-      <security:realm-principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="anonymous" domain-name="securityDomation" realm-name="securityDomation"/>
-    </security:default-principal>
-    <security:role-mappings>
-      <security:role role-name="amila1">
-        <security:realm-principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="amila1" domain-name="securityDomation" realm-name="securityDomation"/>
-      </security:role>
-      <security:role role-name="amila2">
-        <security:realm-principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="amila2" domain-name="securityDomation" realm-name="securityDomation"/>
-      </security:role>
-    </security:role-mappings>
-  </security:security>
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-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>
+    <sys:moduleId>
+      <sys:groupId>j2g</sys:groupId>
+      <sys:artifactId>web-module</sys:artifactId>
+      <sys:version>1.0</sys:version>
+      <sys:type>war</sys:type>
+    </sys:moduleId>
+    <sys:dependencies>
+      <sys:dependency>
+        <sys:groupId>j2g.jdbc</sys:groupId>
+        <sys:artifactId>TestDB</sys:artifactId>
+        <sys:version>1.0</sys:version>
+        <sys:type>rar</sys:type>
+      </sys:dependency>
+    </sys:dependencies>
+  </sys:environment>
+  <security-realm-name>securityDomation</security-realm-name>
+  <context-root>/myApp</context-root>
+  <naming:resource-ref>
+    <naming:ref-name>resource1</naming:ref-name>
+    <naming:resource-link>TestDB</naming:resource-link>
+  </naming:resource-ref>
+  <security:security>
+    <security:default-principal>
+      <security:realm-principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="anonymous" domain-name="securityDomation" realm-name="securityDomation"/>
+    </security:default-principal>
+    <security:role-mappings>
+      <security:role role-name="amila1">
+        <security:realm-principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="amila1" domain-name="securityDomation" realm-name="securityDomation"/>
+      </security:role>
+      <security:role role-name="amila2">
+        <security:realm-principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="amila2" domain-name="securityDomation" realm-name="securityDomation"/>
+      </security:role>
+    </security:role-mappings>
+  </security:security>
+</web-app>

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml Wed Aug  1 08:05:12 2007
@@ -1,42 +1,42 @@
-<?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-app>
-    <security-domain>securiyDomain</security-domain>
-    <unauthenticated-principal>amila</unauthenticated-principal>
-    <jmx-name>messaging</jmx-name>
-    <module>
-        <service>mailservice.sar</service>
-    </module>
-    <module>
-        <har>hibanate.sar</har>
-    </module>
-    <security-role>
-        <role-name>admin</role-name>
-        <principal-name>amila</principal-name>
-        <principal-name>rasika</principal-name>
-    </security-role>
-    <security-role>
-        <role-name>manager</role-name>
-        <principal-name>sandakith</principal-name>
-        <principal-name>sris</principal-name>
-    </security-role>
-
+<?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-app>
+    <security-domain>securiyDomain</security-domain>
+    <unauthenticated-principal>amila</unauthenticated-principal>
+    <jmx-name>messaging</jmx-name>
+    <module>
+        <service>mailservice.sar</service>
+    </module>
+    <module>
+        <har>hibanate.sar</har>
+    </module>
+    <security-role>
+        <role-name>admin</role-name>
+        <principal-name>amila</principal-name>
+        <principal-name>rasika</principal-name>
+    </security-role>
+    <security-role>
+        <role-name>manager</role-name>
+        <principal-name>sandakith</principal-name>
+        <principal-name>sris</principal-name>
+    </security-role>
+
 </jboss-app>

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss-app.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml Wed Aug  1 08:05:12 2007
@@ -1,40 +1,40 @@
-<?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>
-   <enterprise-beans>
-      <session>
-         <ejb-name>EJBTestRunnerEJB</ejb-name>
-         <jndi-name>ejb/EJBTestRunner</jndi-name>
-      </session>
-      <entity>
-         <ejb-name>OrganizationEJB</ejb-name>
-         <local-jndi-name>crimeportal/Organization</local-jndi-name>
-      </entity>
-      <entity>
-         <ejb-name>GangsterEJB</ejb-name>
-         <local-jndi-name>crimeportal/Gangster</local-jndi-name>
-      </entity>
-      <entity>
-         <ejb-name>JobEJB</ejb-name>
-         <local-jndi-name>crimeportal/Job</local-jndi-name>
-      </entity>
-   </enterprise-beans>
-</jboss>
+<?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>
+   <enterprise-beans>
+      <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+      <entity>
+         <ejb-name>OrganizationEJB</ejb-name>
+         <local-jndi-name>crimeportal/Organization</local-jndi-name>
+      </entity>
+      <entity>
+         <ejb-name>GangsterEJB</ejb-name>
+         <local-jndi-name>crimeportal/Gangster</local-jndi-name>
+      </entity>
+      <entity>
+         <ejb-name>JobEJB</ejb-name>
+         <local-jndi-name>crimeportal/Job</local-jndi-name>
+      </entity>
+   </enterprise-beans>
+</jboss>

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jboss.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml Wed Aug  1 08:05:12 2007
@@ -1,151 +1,151 @@
-<?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>
-      <datasource>java:/DefaultDS</datasource>
-      <datasource-mapping>Hypersonic SQL</datasource-mapping>
-      <create-table>true</create-table>
-      <remove-table>true</remove-table>
-      <pk-constraint>true</pk-constraint>
-      <preferred-relation-mapping>foreign-key</preferred-relation-mapping>
-   </defaults>
-
-   <enterprise-beans>
-
-      <entity>
-         <ejb-name>OrganizationEJB</ejb-name>
-         <table-name>organization</table-name>
-
-         <cmp-field>
-            <field-name>name</field-name>
-            <column-name>name</column-name>
-         </cmp-field>
-         <cmp-field>
-            <field-name>description</field-name>
-            <column-name>desc</column-name>
-         </cmp-field>
-      </entity>
-
-      <entity>
-         <ejb-name>GangsterEJB</ejb-name>
-         <table-name>gangster</table-name>
-
-         <cmp-field>
-            <field-name>gangsterId</field-name>
-            <column-name>id</column-name>
-         </cmp-field>
-         <cmp-field>
-            <field-name>name</field-name>
-            <column-name>name</column-name>
-         </cmp-field>
-         <cmp-field>
-            <field-name>nickName</field-name>
-            <column-name>nick_name</column-name>
-            <jdbc-type>VARCHAR</jdbc-type>
-            <sql-type>VARCHAR(64)</sql-type>
-         </cmp-field>
-         <cmp-field>
-            <field-name>badness</field-name>
-            <column-name>badness</column-name>
-         </cmp-field>
-      </entity>
-
-      <entity>
-         <ejb-name>JobEJB</ejb-name>
-         <table-name>job</table-name>
-
-         <cmp-field>
-            <field-name>name</field-name>
-            <column-name>name</column-name>
-         </cmp-field>
-         <cmp-field>
-            <field-name>score</field-name>
-            <column-name>score</column-name>
-         </cmp-field>
-         <cmp-field>
-            <field-name>setupCost</field-name>
-            <column-name>setup_cost</column-name>
-         </cmp-field>
-      </entity>
-   </enterprise-beans>
-
-   <relationships>
-      <ejb-relation>
-         <ejb-relation-name>Organization-Gangster</ejb-relation-name>
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>org-has-gangsters</ejb-relationship-role-name>
-            <key-fields>
-               <key-field>
-                  <field-name>name</field-name>
-                  <column-name>organization</column-name>
-               </key-field>
-            </key-fields>
-         </ejb-relationship-role> 
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>gangster-belongs-to-org</ejb-relationship-role-name>
-         </ejb-relationship-role> 
-      </ejb-relation> 
-
-      <ejb-relation>
-         <ejb-relation-name>Gangster-Jobs</ejb-relation-name>
-         <relation-table-mapping>
-            <table-name>gangster_job</table-name>
-         </relation-table-mapping>
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>gangster-has-jobs</ejb-relationship-role-name>
-            <key-fields>
-               <key-field>
-                  <field-name>gangsterId</field-name>
-                  <column-name>gangster</column-name>
-               </key-field>
-            </key-fields>
-         </ejb-relationship-role> 
-
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>job-has-gangsters</ejb-relationship-role-name>
-            <key-fields>
-               <key-field>
-                  <field-name>name</field-name>
-                  <column-name>job</column-name>
-               </key-field>
-            </key-fields>
-         </ejb-relationship-role> 
-      </ejb-relation> 
-
-      <ejb-relation>
-         <ejb-relation-name>Organization-Boss</ejb-relation-name>
-		 
-         <ejb-relationship-role> 
-            <ejb-relationship-role-name>organization-has-a-boss</ejb-relationship-role-name>
-			<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>
+<?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>
+      <datasource>java:/DefaultDS</datasource>
+      <datasource-mapping>Hypersonic SQL</datasource-mapping>
+      <create-table>true</create-table>
+      <remove-table>true</remove-table>
+      <pk-constraint>true</pk-constraint>
+      <preferred-relation-mapping>foreign-key</preferred-relation-mapping>
+   </defaults>
+
+   <enterprise-beans>
+
+      <entity>
+         <ejb-name>OrganizationEJB</ejb-name>
+         <table-name>organization</table-name>
+
+         <cmp-field>
+            <field-name>name</field-name>
+            <column-name>name</column-name>
+         </cmp-field>
+         <cmp-field>
+            <field-name>description</field-name>
+            <column-name>desc</column-name>
+         </cmp-field>
+      </entity>
+
+      <entity>
+         <ejb-name>GangsterEJB</ejb-name>
+         <table-name>gangster</table-name>
+
+         <cmp-field>
+            <field-name>gangsterId</field-name>
+            <column-name>id</column-name>
+         </cmp-field>
+         <cmp-field>
+            <field-name>name</field-name>
+            <column-name>name</column-name>
+         </cmp-field>
+         <cmp-field>
+            <field-name>nickName</field-name>
+            <column-name>nick_name</column-name>
+            <jdbc-type>VARCHAR</jdbc-type>
+            <sql-type>VARCHAR(64)</sql-type>
+         </cmp-field>
+         <cmp-field>
+            <field-name>badness</field-name>
+            <column-name>badness</column-name>
+         </cmp-field>
+      </entity>
+
+      <entity>
+         <ejb-name>JobEJB</ejb-name>
+         <table-name>job</table-name>
+
+         <cmp-field>
+            <field-name>name</field-name>
+            <column-name>name</column-name>
+         </cmp-field>
+         <cmp-field>
+            <field-name>score</field-name>
+            <column-name>score</column-name>
+         </cmp-field>
+         <cmp-field>
+            <field-name>setupCost</field-name>
+            <column-name>setup_cost</column-name>
+         </cmp-field>
+      </entity>
+   </enterprise-beans>
+
+   <relationships>
+      <ejb-relation>
+         <ejb-relation-name>Organization-Gangster</ejb-relation-name>
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>org-has-gangsters</ejb-relationship-role-name>
+            <key-fields>
+               <key-field>
+                  <field-name>name</field-name>
+                  <column-name>organization</column-name>
+               </key-field>
+            </key-fields>
+         </ejb-relationship-role> 
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>gangster-belongs-to-org</ejb-relationship-role-name>
+         </ejb-relationship-role> 
+      </ejb-relation> 
+
+      <ejb-relation>
+         <ejb-relation-name>Gangster-Jobs</ejb-relation-name>
+         <relation-table-mapping>
+            <table-name>gangster_job</table-name>
+         </relation-table-mapping>
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>gangster-has-jobs</ejb-relationship-role-name>
+            <key-fields>
+               <key-field>
+                  <field-name>gangsterId</field-name>
+                  <column-name>gangster</column-name>
+               </key-field>
+            </key-fields>
+         </ejb-relationship-role> 
+
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>job-has-gangsters</ejb-relationship-role-name>
+            <key-fields>
+               <key-field>
+                  <field-name>name</field-name>
+                  <column-name>job</column-name>
+               </key-field>
+            </key-fields>
+         </ejb-relationship-role> 
+      </ejb-relation> 
+
+      <ejb-relation>
+         <ejb-relation-name>Organization-Boss</ejb-relation-name>
+		 
+         <ejb-relationship-role> 
+            <ejb-relationship-role-name>organization-has-a-boss</ejb-relationship-role-name>
+			<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>

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/jbosscmp-jdbc.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/openejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/openejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test-resources/openejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java Wed Aug  1 08:05:12 2007
@@ -1,33 +1,33 @@
-/**
- *  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.
- */
- package org.apache.geronimo.j2g.descriptors.app.test;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.j2g.descriptors.app.ApplicationDescriptorTool;
-
-public class TestApplicationDescriptorTool extends TestCase {
-
-    public void testMigrate() {
-        String jbossApplicatinXmlFile = "test-resources/jboss-app.xml";
-        ApplicationDescriptorTool applicationDescriptorTool = new ApplicationDescriptorTool();
-        applicationDescriptorTool.migrate(new File(jbossApplicatinXmlFile), null);
-    }
-
-}
+/**
+ *  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.
+ */
+ package org.apache.geronimo.j2g.descriptors.app.test;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.geronimo.j2g.descriptors.app.ApplicationDescriptorTool;
+
+public class TestApplicationDescriptorTool extends TestCase {
+
+    public void testMigrate() {
+        String jbossApplicatinXmlFile = "test-resources/jboss-app.xml";
+        ApplicationDescriptorTool applicationDescriptorTool = new ApplicationDescriptorTool();
+        applicationDescriptorTool.migrate(new File(jbossApplicatinXmlFile), null);
+    }
+
+}

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/app/test/TestApplicationDescriptorTool.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java Wed Aug  1 08:05:12 2007
@@ -1,34 +1,34 @@
-/**
- *  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.
- */
-
-package org.apache.geronimo.j2g.descriptors.cmp.test;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.j2g.descriptors.comp.CMPDescriptorTool;
-
-public class TestCMPDescriptorsTool extends TestCase {
-
-    public void testMigrate() {
-        File file = new File("test-resources/jbosscmp-jdbc.xml");
-        CMPDescriptorTool cmpDescriptorTool = new CMPDescriptorTool();
-        cmpDescriptorTool.migrate(file, null);
-    }
-    
-}
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.j2g.descriptors.cmp.test;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.geronimo.j2g.descriptors.comp.CMPDescriptorTool;
+
+public class TestCMPDescriptorsTool extends TestCase {
+
+    public void testMigrate() {
+        File file = new File("test-resources/jbosscmp-jdbc.xml");
+        CMPDescriptorTool cmpDescriptorTool = new CMPDescriptorTool();
+        cmpDescriptorTool.migrate(file, null);
+    }
+    
+}

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestCMPDescriptorsTool.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java Wed Aug  1 08:05:12 2007
@@ -1,35 +1,35 @@
-/**
- *  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.
- */
-
-package org.apache.geronimo.j2g.descriptors.cmp.test;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.j2g.descriptors.comp.EJBJarXmlProcessor;
-import org.dom4j.DocumentException;
-
-public class TestEJBjarXmlProcessor extends TestCase {
-
-    public void testGetRelationships(){
-        EJBJarXmlProcessor ejbJarXmlProcessor = new EJBJarXmlProcessor("test-resources/ejb-jar.xml");
-        try {
-            ejbJarXmlProcessor.getRelationships();
-        } catch (DocumentException e) {
-            e.printStackTrace();
-        }
-    }
-}
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.j2g.descriptors.cmp.test;
+
+import junit.framework.TestCase;
+
+import org.apache.geronimo.j2g.descriptors.comp.EJBJarXmlProcessor;
+import org.dom4j.DocumentException;
+
+public class TestEJBjarXmlProcessor extends TestCase {
+
+    public void testGetRelationships(){
+        EJBJarXmlProcessor ejbJarXmlProcessor = new EJBJarXmlProcessor("test-resources/ejb-jar.xml");
+        try {
+            ejbJarXmlProcessor.getRelationships();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+    }
+}

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java Wed Aug  1 08:05:12 2007
@@ -1,33 +1,33 @@
-/**
- *  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.
- */
- package org.apache.geronimo.j2g.descriptors.ejb.test;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.j2g.descriptors.ejb.EJBDescriptorTool;
-
-public class TestEJBDescriptorTool extends TestCase {
-
-    public void testMigrate() {
-        File file = new File("test-resources/jboss.xml");
-        EJBDescriptorTool ejbDescriptorTool = new EJBDescriptorTool();
-        ejbDescriptorTool.migrate(file, null);
-    }
-    
-}
+/**
+ *  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.
+ */
+ package org.apache.geronimo.j2g.descriptors.ejb.test;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.geronimo.j2g.descriptors.ejb.EJBDescriptorTool;
+
+public class TestEJBDescriptorTool extends TestCase {
+
+    public void testMigrate() {
+        File file = new File("test-resources/jboss.xml");
+        EJBDescriptorTool ejbDescriptorTool = new EJBDescriptorTool();
+        ejbDescriptorTool.migrate(file, null);
+    }
+    
+}

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/ejb/test/TestEJBDescriptorTool.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java?view=diff&rev=561821&r1=561820&r2=561821
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java Wed Aug  1 08:05:12 2007
@@ -1,33 +1,33 @@
-/**
- *  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.
- */
- package org.apache.geronimo.j2g.descriptors.web.test;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.geronimo.j2g.descriptors.web.WebDescriptorTool;
-
-public class TestWebDescriptorTool extends TestCase {
-
-    public void testMigration() {
-        File file = new File("test-resources/jboss-web.xml");
-        WebDescriptorTool webMigrationTool = new WebDescriptorTool();
-        webMigrationTool.migrate(file, null);
-    }
-
-}
+/**
+ *  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.
+ */
+ package org.apache.geronimo.j2g.descriptors.web.test;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.geronimo.j2g.descriptors.web.WebDescriptorTool;
+
+public class TestWebDescriptorTool extends TestCase {
+
+    public void testMigration() {
+        File file = new File("test-resources/jboss-web.xml");
+        WebDescriptorTool webMigrationTool = new WebDescriptorTool();
+        webMigrationTool.migrate(file, null);
+    }
+
+}

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/test/org/apache/geronimo/j2g/descriptors/web/test/TestWebDescriptorTool.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.jasper/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Aug  1 08:05:12 2007
@@ -1 +1 @@
-Date Rev
+Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Aug  1 08:05:12 2007
@@ -1 +1 @@
-Date Rev
+Date Author Id Revision HeadURL



Mime
View raw message