Return-Path: 
 <dev-return-42432-apmail-geronimo-dev-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-dev-archive@www.apache.org
Received: (qmail 73552 invoked from network); 6 Dec 2006 19:51:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 6 Dec 2006 19:51:48 -0000
Received: (qmail 7882 invoked by uid 500); 6 Dec 2006 19:51:52 -0000
Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org
Received: (qmail 7817 invoked by uid 500); 6 Dec 2006 19:51:52 -0000
Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@geronimo.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@geronimo.apache.org>
List-Post: <mailto:dev@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <dev.geronimo.apache.org>
Delivered-To: mailing list dev@geronimo.apache.org
Received: (qmail 7763 invoked by uid 99); 6 Dec 2006 19:51:52 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 11:51:52 -0800
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO brutus.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 11:51:43 -0800
Received: from brutus (localhost [127.0.0.1])
	by brutus.apache.org (Postfix) with ESMTP id 0ED4D7142EC
	for <dev@geronimo.apache.org>; Wed,  6 Dec 2006 11:51:23 -0800 (PST)
Message-ID: <23282680.1165434683057.JavaMail.jira@brutus>
Date: Wed, 6 Dec 2006 11:51:23 -0800 (PST)
From: "Lin Sun (JIRA)" <jira@apache.org>
To: dev@geronimo.apache.org
Subject: [jira] Created: (GERONIMODEVTOOLS-119) import simple hello.war
 results xml-fragment tag in geronimo-web.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-Virus-Checked: Checked by ClamAV on apache.org

import simple hello.war results xml-fragment tag in geronimo-web.xml
--------------------------------------------------------------------

                 Key: GERONIMODEVTOOLS-119
                 URL: http://issues.apache.org/jira/browse/GERONIMODEVTOOLS-119
             Project: Geronimo-Devtools
          Issue Type: Bug
          Components: eclipse-plugin
    Affects Versions: 1.2.0
         Environment: patched created with latest trunk 480183
            Reporter: Lin Sun


Tried to import a simple hello war file however after import the geronimo-web.xml file contains xml-fragment tag which prevents the hello project from being deployed to server. tried to print out the following var plan in ImportDeploymentPlanOperation.java

plan = runtime.fixGeronimoWebSchema(planFile);
System.out.println("plan 1: " + plan.toString());

Here's the printout:
plan 1: <xml-fragment xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
  <sys:environment>
    <sys:moduleId>
      <sys:groupId>samples</sys:groupId>
      <sys:artifactId>cviewer</sys:artifactId>
      <sys:version>1.1</sys:version>
      <sys:type>war</sys:type>
    </sys:moduleId>
    <sys:dependencies/>
    <sys:hidden-classes/>
    <sys:non-overridable-classes/>
  </sys:environment>
  <web:context-root>/cviewer</web:context-root>
</xml-fragment>

Note this is not a valid plan.

I updated the following method in org.apache.geronimo.st.v11.core.GeronimoRuntime and it is working now (for war file).

public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
        XmlObject xmlplan = getXmlObject(plan);
        if (plan != null) {
            SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerWebAppDocument.type.getDocumentElementName(),
                    GerWebAppType.type);
            save(xmlplan, plan);
            return xmlplan;
        }
        return null;
//return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerWebAppDocument.type.getDocumentElementName(), GerWebAppType.type);
}

Also added the save method back from 1.0 to org.apache.geronimo.st.v11.core.GeronimoRuntime:

private void save(XmlObject object, IFile file) {
try {
object.save(file.getLocation().toFile());
file.refreshLocal(IFile.DEPTH_ONE, null);
} catch (IOException e) {
e.printStackTrace();
} catch (CoreException e) {
e.printStackTrace();
}
} 

Patch has been tested on importing war projects and worked well.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira