geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r546303 - in /geronimo/sandbox/j2g: ./ plugins/org.apache.geronimo.j2g.descriptors.app/src/org/apache/geronimo/j2g/descriptors/app/ plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/ plugins/org.ap...
Date Mon, 11 Jun 2007 22:11:37 GMT
Author: pmcmahan
Date: Mon Jun 11 15:11:35 2007
New Revision: 546303

URL: http://svn.apache.org/viewvc?view=rev&rev=546303
Log:
GERONIMO-3157 unit test cases for J2G tool

Added:
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss-web.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/geronimo-mail-service.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/mail-service.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/test-app-jboss/
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/test-app-jboss/openejb-jar-serialized.xml
Modified:
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/src/org/apache/geronimo/j2g/descriptors/app/ApplicationDescriptorTool.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPDescriptorTool.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPEntityBeanMigrator.java
    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/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/BeanMigrator.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/EntityBeanMigrator.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/SessionBeanMigrator.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-ds.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-geronimo-plan.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-ds.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-geronimo-plan.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-ds.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-geronimo-plan.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/geronimo-jms-resource-plan.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.resources.jms/test-apps/jms/jms-geronimo-plan.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/err/mail-service.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/geronimo-mail-service.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-geronimo-plan.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-service.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/geronimo-secutiry-plan.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/login-config.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/security-geronimo-plan.xml
    geronimo/sandbox/j2g/pom.xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/src/org/apache/geronimo/j2g/descriptors/app/ApplicationDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/src/org/apache/geronimo/j2g/descriptors/app/ApplicationDescriptorTool.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/src/org/apache/geronimo/j2g/descriptors/app/ApplicationDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.app/src/org/apache/geronimo/j2g/descriptors/app/ApplicationDescriptorTool.java Mon Jun 11 15:11:35 2007
@@ -23,6 +23,7 @@
 
 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;
@@ -36,7 +37,7 @@
 
 public class ApplicationDescriptorTool implements IFileMigration {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     private String directoryName;
 
@@ -45,6 +46,12 @@
     private SecurityElementProcessor securityElementProcessor;
 
     public ApplicationDescriptorTool() {
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
         securityElementProcessor = new SecurityElementProcessor();
     }
 

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPDescriptorTool.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPDescriptorTool.java Mon Jun 11 15:11:35 2007
@@ -26,6 +26,7 @@
 
 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;
@@ -42,7 +43,7 @@
 
 public class CMPDescriptorTool implements IFileMigration {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     private Log logger = LogFactory.getLog(CMPDescriptorTool.class);
 
@@ -55,6 +56,12 @@
     private Map ejbKeyColumnMapper;
 
     public CMPDescriptorTool() {
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null){
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
         envirionmentElementProcessor = new EnvirionmentElementProcessor();
         cmpEntityBeanMigrator = new CMPEntityBeanMigrator();
         ejbKeyColumnMapper = new HashMap();

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPEntityBeanMigrator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPEntityBeanMigrator.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPEntityBeanMigrator.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/src/org/apache/geronimo/j2g/descriptors/comp/CMPEntityBeanMigrator.java Mon Jun 11 15:11:35 2007
@@ -23,6 +23,7 @@
 
 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.IOutput;
 import org.apache.geronimo.j2g.common.Tool;
 import org.apache.geronimo.j2g.util.descriptors.xml.XMLConversionHelper;
@@ -32,13 +33,22 @@
 
 public class CMPEntityBeanMigrator {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     private Log logger = LogFactory.getLog(CMPEntityBeanMigrator.class);
 
     // this is used to keep the filed name and column name
     // key field name vaue column name
     private Map keyColumnMap;
+    
+    public CMPEntityBeanMigrator () {
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
+    }
 
     public void migrateBean(Element jbossEntity, Element geronimoEntity) {
 

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=546303&r1=546302&r2=546303
==============================================================================
--- 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 Mon Jun 11 15:11:35 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 ejb-jar PUBLIC
+     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">
+      "http://java.sun.com/dtd/ejb-jar_2_0.dtd" -->
 
 <ejb-jar>
    <display-name>CMP 2.0 Lab Jar</display-name>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/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.cmp/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.cmp/test/org/apache/geronimo/j2g/descriptors/cmp/test/TestEJBjarXmlProcessor.java Mon Jun 11 15:11:35 2007
@@ -25,7 +25,7 @@
 public class TestEJBjarXmlProcessor extends TestCase {
 
     public void testGetRelationships(){
-        EJBJarXmlProcessor ejbJarXmlProcessor = new EJBJarXmlProcessor("test-resources/jboss-xml/ejb-jar.xml");
+        EJBJarXmlProcessor ejbJarXmlProcessor = new EJBJarXmlProcessor("test-resources/ejb-jar.xml");
         try {
             ejbJarXmlProcessor.getRelationships();
         } catch (DocumentException e) {

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java Mon Jun 11 15:11:35 2007
@@ -24,6 +24,7 @@
 
 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;
@@ -41,7 +42,7 @@
 
 public class EJBDescriptorTool implements IFileMigration {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     private Log logger = LogFactory.getLog(EJBDescriptorTool.class);
 
@@ -56,7 +57,13 @@
     private SecurityElementProcessor securityElementProcessor;
 
     public EJBDescriptorTool() {
-
+    	
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
         envirionmentElementProcessor = new EnvirionmentElementProcessor();
         namingElementProcessor = new NamingElementProcessor(envirionmentElementProcessor);
         sessionBeanMigrator = new SessionBeanMigrator(envirionmentElementProcessor,

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/BeanMigrator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/BeanMigrator.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/BeanMigrator.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/BeanMigrator.java Mon Jun 11 15:11:35 2007
@@ -20,6 +20,7 @@
 
 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.IOutput;
 import org.apache.geronimo.j2g.common.Tool;
 import org.apache.geronimo.j2g.util.descriptors.Constants;
@@ -31,7 +32,7 @@
 
 public class BeanMigrator {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     private Log logger = LogFactory.getLog(BeanMigrator.class);
 
@@ -41,6 +42,13 @@
 
     public BeanMigrator(EnvirionmentElementProcessor envirionmentElementProcessor,
             NamingElementProcessor namingElementProcessor) {
+    	
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
         this.envirionmentElementProcessor = envirionmentElementProcessor;
         this.namingElementProcessor = namingElementProcessor;
     }

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/EntityBeanMigrator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/EntityBeanMigrator.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/EntityBeanMigrator.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/EntityBeanMigrator.java Mon Jun 11 15:11:35 2007
@@ -21,6 +21,7 @@
 
 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.IOutput;
 import org.apache.geronimo.j2g.common.Tool;
 import org.apache.geronimo.j2g.util.descriptors.env.EnvirionmentElementProcessor;
@@ -29,12 +30,18 @@
 
 public class EntityBeanMigrator extends JNDIBeanMigrator {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
     private Log logger = LogFactory.getLog(EntityBeanMigrator.class);
 
     public EntityBeanMigrator(EnvirionmentElementProcessor envirionmentElementProcessor,
             NamingElementProcessor namingElementProcessor) {
         super(envirionmentElementProcessor, namingElementProcessor);
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
     }
 
     public boolean migrateBean(Element jbossEntity, Element geronimoEntity) {

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/SessionBeanMigrator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/SessionBeanMigrator.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/SessionBeanMigrator.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.ejb/src/org/apache/geronimo/j2g/descriptors/ejb/bean/SessionBeanMigrator.java Mon Jun 11 15:11:35 2007
@@ -20,6 +20,7 @@
 
 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.IOutput;
 import org.apache.geronimo.j2g.common.Tool;
 import org.apache.geronimo.j2g.util.descriptors.env.EnvirionmentElementProcessor;
@@ -30,11 +31,17 @@
 public class SessionBeanMigrator extends JNDIBeanMigrator {
 
     private static Log logger = LogFactory.getLog(SessionBeanMigrator.class);
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     public SessionBeanMigrator(EnvirionmentElementProcessor envirionmentElementProcessor,
             NamingElementProcessor namingElementProcessor) {
         super(envirionmentElementProcessor, namingElementProcessor);
+    	Tool currentTool = Tool.getCurrent();
+    	if (currentTool != null) {
+    		out = currentTool.getOutput();
+    	} else {
+    		out = new ConsoleOutput();
+    	}
     }
 
     public boolean migrateBean(Element jbossSession, Element geronimoSession) {

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors.web/src/org/apache/geronimo/j2g/descriptors/web/WebDescriptorTool.java Mon Jun 11 15:11:35 2007
@@ -22,6 +22,7 @@
 
 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;
@@ -37,7 +38,7 @@
 
 public class WebDescriptorTool implements IFileMigration {
 
-    private IOutput out = Tool.getCurrent().getOutput();
+    private IOutput out;
 
     private static Log logger = LogFactory.getLog(WebDescriptorTool.class);
 
@@ -48,6 +49,13 @@
     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);

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-ds.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-ds.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-ds.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-ds.xml Mon Jun 11 15:11:35 2007
@@ -1,20 +1,18 @@
-/**
- *  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
+
+     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. -->
 
 <!-- The Hypersonic embedded database JCA connection factory config
 $Id$ -->

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-geronimo-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-geronimo-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-geronimo-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/hsqldb-geronimo-plan.xml Mon Jun 11 15:11:35 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"?>
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-ds.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-ds.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-ds.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-ds.xml Mon Jun 11 15:11:35 2007
@@ -1,20 +1,18 @@
-/**
- *  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
+
+     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. -->
 
 <!-- $Id$ -->
 <!--  Datasource config for MySQL using 3.0.9 available from:

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-geronimo-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-geronimo-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-geronimo-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/mysql-geronimo-plan.xml Mon Jun 11 15:11:35 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"?>
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-ds.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-ds.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-ds.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-ds.xml Mon Jun 11 15:11:35 2007
@@ -1,20 +1,18 @@
-/**
- *  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
+
+     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. -->
 
 <!-- $Id$ -->
 <!--  Datasource config for MySQL using 3.0.9 available from:

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-geronimo-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-geronimo-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-geronimo-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.datasource/test-apps/ds/oracle-geronimo-plan.xml Mon Jun 11 15:11:35 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"?>
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/geronimo-jms-resource-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/geronimo-jms-resource-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/geronimo-jms-resource-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/geronimo-jms-resource-plan.xml Mon Jun 11 15:11:35 2007
@@ -1,20 +1,18 @@
-/**
- *  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
+
+     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. -->
 <connector
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
     <environment

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=546303&r1=546302&r2=546303
==============================================================================
--- 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 Mon Jun 11 15:11:35 2007
@@ -1,20 +1,18 @@
-/**
- *  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
+
+     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 server
     PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"

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=546303&r1=546302&r2=546303
==============================================================================
--- 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 Mon Jun 11 15:11:35 2007
@@ -1,20 +1,18 @@
-/**
- *  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
+
+     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 connection-factories
     PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-geronimo-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-geronimo-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-geronimo-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.jms/test-apps/jms/jms-geronimo-plan.xml Mon Jun 11 15:11:35 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"?>
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
   <sys:environment xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/err/mail-service.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/err/mail-service.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/err/mail-service.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/err/mail-service.xml Mon Jun 11 15:11:35 2007
@@ -1,23 +1,20 @@
-/**
- *  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 server>
-<!-- $Id$ -->
+<?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 server -->
+ <!-- $Id$ -->
 <server>
 
   <!-- ==================================================================== -->

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/geronimo-mail-service.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/geronimo-mail-service.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/geronimo-mail-service.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/geronimo-mail-service.xml Mon Jun 11 15:11:35 2007
@@ -1,19 +1,18 @@
-/**
- *  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"?>
+<!--  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. -->
  <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <environment>
     <moduleId>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-geronimo-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-geronimo-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-geronimo-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-geronimo-plan.xml Mon Jun 11 15:11:35 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"?>
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <environment>
@@ -23,12 +7,12 @@
       <artifactId>Mail</artifactId>
       <version>1.0</version>
       <type>car</type>
-    </moduleId>
+   </moduleId>
     <dependencies>
       <dependency>
-        <groupId>j2g.java:</groupId>
-        <artifactId>Mail</artifactId>
-        <version>1.0</version>
+        <groupId>geronimo</groupId>
+        <artifactId>javamail</artifactId>
+        <version>1.1</version>
         <type>car</type>
       </dependency>
     </dependencies>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-service.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-service.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-service.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.mail/test-apps/mail/mail-service.xml Mon Jun 11 15:11:35 2007
@@ -1,23 +1,21 @@
-/**
- *  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 server
+<?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 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$ -->
 
 <server>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/geronimo-secutiry-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/geronimo-secutiry-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/geronimo-secutiry-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/geronimo-secutiry-plan.xml Mon Jun 11 15:11:35 2007
@@ -1,19 +1,18 @@
-/**
- *  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"?>
+<!--  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. -->
  <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
     <environment>
         <moduleId>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/login-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/login-config.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/login-config.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/login-config.xml Mon Jun 11 15:11:35 2007
@@ -1,23 +1,21 @@
-/**
- *  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'?>
-<!DOCTYPE policy PUBLIC
+<?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 policy PUBLIC
       "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd" -->
 
 <!-- The XML based JAAS login configuration read by the
 org.jboss.security.auth.login.XMLLoginConfig mbean. Add

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/security-geronimo-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/security-geronimo-plan.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/security-geronimo-plan.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources.security/test-apps/security/security-geronimo-plan.xml Mon Jun 11 15:11:35 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"?>
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <environment>
@@ -26,10 +10,9 @@
     </moduleId>
     <dependencies>
       <dependency>
-        <groupId>j2g</groupId>
-        <artifactId>security</artifactId>
-        <version>1.0</version>
-        <type>rar</type>
+        <groupId>geronimo</groupId>
+        <artifactId>j2ee-security</artifactId>
+        <type>car</type>
       </dependency>
     </dependencies>
   </environment>
@@ -45,7 +28,7 @@
         <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
           <log:login-domain-name>jbossmq</log:login-domain-name>
           <log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule</log:login-module-class>
-          <log:option name="dataSourceName">DefaultDS/Test</log:option>
+          <log:option name="dataSourceName">java:/DefaultDS/Test</log:option>
           <log:option name="userSelect">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</log:option>
           <log:option name="groupSelect">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</log:option>
         </log:login-module>

Added: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss-web.xml?view=auto&rev=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss-web.xml (added)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss-web.xml Mon Jun 11 15:11:35 2007
@@ -0,0 +1,51 @@
+<?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 jboss PUBLIC
+   "-//JBoss//DTD JBOSS 3.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd"-->
+
+<jboss-web>
+    <security-domain>securityDomation</security-domain>
+    <context-root>/myApp</context-root>
+    <resource-env-ref>
+        <resource-env-ref-name>envResource1</resource-env-ref-name>
+        <jndi-name>jdbc/TestDB</jndi-name>
+    </resource-env-ref>
+     <resource-ref>
+        <res-ref-name>resource1</res-ref-name>
+        <jndi-name>jdbc/TestDB</jndi-name>
+    </resource-ref>
+    <security-role>
+        <role-name>amila1</role-name>
+        <principal-name>amila1</principal-name>
+    </security-role>
+     <security-role>
+        <role-name>amila2</role-name>
+        <principal-name>amila2</principal-name>
+    </security-role>
+    <ejb-ref>
+        <ejb-ref-name>ejb/TestEJB</ejb-ref-name>
+        <jndi-name>ejb/TestEJB</jndi-name>
+    </ejb-ref>
+    <ejb-local-ref>
+        <ejb-ref-name>ejb/LocalTestEJB</ejb-ref-name>
+        <local-jndi-name>ejb/LocalEJB</local-jndi-name>
+    </ejb-local-ref>
+</jboss-web>
\ No newline at end of file

Added: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss.xml?view=auto&rev=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss.xml (added)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/jboss-xml/jboss.xml Mon Jun 11 15:11:35 2007
@@ -0,0 +1,43 @@
+<?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 jboss PUBLIC
+   "-//JBoss//DTD JBOSS 3.0//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss_3_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>

Added: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/geronimo-mail-service.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/geronimo-mail-service.xml?view=auto&rev=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/geronimo-mail-service.xml (added)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/geronimo-mail-service.xml Mon Jun 11 15:11:35 2007
@@ -0,0 +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. -->
+ <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <environment>
+    <moduleId>
+      <groupId>j2g</groupId>
+      <artifactId>Mail</artifactId>
+      <version>1.0</version>
+      <type>car</type>
+    </moduleId>
+    <dependencies>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>javamail</artifactId>
+      </dependency>
+    </dependencies>
+  </environment>
+  <gbean name="mailSession" class="org.apache.geronimo.mail.MailGBean">
+    <attribute name="properties">
+mail.store.protocol=pop3
+mail.transport.protocol=smtp
+mail.user=nobody
+mail.pop3.host=pop3.nosuchhost.nosuchdomain.com
+mail.smtp.host=smtp.nosuchhost.nosuchdomain.com
+mail.from=nobody@nosuchhost.nosuchdomain.com
+mail.debug=false
+    </attribute>   
+  </gbean>
+</module>
\ No newline at end of file

Added: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/mail-service.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/mail-service.xml?view=auto&rev=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/mail-service.xml (added)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/mail/mail-service.xml Mon Jun 11 15:11:35 2007
@@ -0,0 +1,57 @@
+<?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 server
+    PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
+    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd"-->
+<!-- $Id: mail-service.xml 520023 2007-03-19 17:43:27Z pmcmahan $ -->
+
+<server>
+
+  <!-- ==================================================================== -->
+  <!-- Mail Connection Factory                                              -->
+  <!-- ==================================================================== -->
+
+  <mbean code="org.jboss.mail.MailService"
+         name="jboss:service=Mail">
+    <attribute name="JNDIName">java:/Mail</attribute>
+    <attribute name="User">nobody</attribute>
+	<attribute name="Password">none</attribute>
+    <attribute name="Configuration">
+       <!-- Test -->
+       <configuration>
+          <!-- Change to your mail server prototocol -->
+          <property name="mail.store.protocol" value="pop3"/>
+          <property name="mail.transport.protocol" value="smtp"/>
+
+          <!-- Change to the user who will receive mail  -->
+          <property name="mail.user" value="nobody"/>
+
+          <!-- Change to the mail server  -->
+          <property name="mail.pop3.host" value="pop3.nosuchhost.nosuchdomain.com"/>
+
+          <!-- Change to the SMTP gateway server -->
+          <property name="mail.smtp.host" value="smtp.nosuchhost.nosuchdomain.com"/>
+
+          <!-- Change to the address mail will be from  -->
+          <property name="mail.from" value="nobody@nosuchhost.nosuchdomain.com"/>
+
+          <!-- Enable debugging output from the javamail classes -->
+          <property name="mail.debug" value="false"/>
+       </configuration>
+    </attribute>
+  </mbean>
+
+</server>

Added: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/test-app-jboss/openejb-jar-serialized.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/test-app-jboss/openejb-jar-serialized.xml?view=auto&rev=546303
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/test-app-jboss/openejb-jar-serialized.xml (added)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/test-apps/test-app-jboss/openejb-jar-serialized.xml Mon Jun 11 15:11:35 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.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>ejb-module</sys:artifactId>
+      <sys:version>1.0</sys:version>
+      <sys:type>jar</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+  </sys:environment>
+</openejb-jar>

Modified: geronimo/sandbox/j2g/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/pom.xml?view=diff&rev=546303&r1=546302&r2=546303
==============================================================================
--- geronimo/sandbox/j2g/pom.xml (original)
+++ geronimo/sandbox/j2g/pom.xml Mon Jun 11 15:11:35 2007
@@ -73,7 +73,7 @@
     </distributionManagement>
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
-        <maven.test.skip>true</maven.test.skip>
+        <maven.test.skip>false</maven.test.skip>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>



Mime
View raw message