Author: snjeza Date: 2009-07-18 18:03:00 -0400 (Sat, 18 Jul 2009) New Revision: 16659 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear-seam2/EarContent/META-INF/application.xml trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4166 Seam Web EAR project using Seam 2.1.1.GA does not work on JBoss AS 4.2.3 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-07-18 22:02:34 UTC (rev 16658) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-07-18 22:03:00 UTC (rev 16659) @@ -21,14 +21,30 @@ import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamVersion; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; /** * @author Alexey Kazakov @@ -36,6 +52,9 @@ */ public class Seam2ProjectCreator extends SeamProjectCreator { + private static final String STRICT = "strict"; + private static final String MODULE_ORDER = "module-order"; + // test/*.jar are duplicated here since the filtering seem to be assymetric when matching private static AntCopyUtils.FileSet JBOSS_TEST_LIB_FILESET = new AntCopyUtils.FileSet() .include("testng\\.jar") //$NON-NLS-1$ @@ -204,6 +223,75 @@ AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "security.drl"), new File(ejbProjectFolder, "ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override + protected void configureJBossAppXml() { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName); + IVirtualComponent component = ComponentCore.createComponent(project); + IVirtualFolder folder = component.getRootFolder(); + IFolder rootFolder = (IFolder) folder.getUnderlyingFolder(); + IResource jbossAppXml = rootFolder.findMember("META-INF/jboss-app.xml"); + if(jbossAppXml==null || !(jbossAppXml instanceof IFile) || !jbossAppXml.exists()) { + return; + } + + IModelManager manager = StructuredModelManager.getModelManager(); + if(manager == null) { + return; + } + IStructuredModel model = null; + try { + model = manager.getModelForEdit((IFile)jbossAppXml); + if (model instanceof IDOMModel) { + IDOMModel domModel = (IDOMModel) model; + IDOMDocument document = domModel.getDocument(); + Element root = document.getDocumentElement(); + if(root==null) { + return; + } + NodeList children = root.getChildNodes(); + boolean strictAdded = false; + Node firstChild = null; + for(int i=0; i<children.getLength(); i++) { + Node currentNode = children.item(i); + if(Node.ELEMENT_NODE == currentNode.getNodeType() && firstChild == null) { + firstChild = currentNode; + } + if(Node.ELEMENT_NODE == currentNode.getNodeType() && MODULE_ORDER.equals(currentNode.getNodeName())) { + setValue(document,currentNode,STRICT); + strictAdded = true; + } + } + if (!strictAdded) { + Element moduleOrder = document.createElement(MODULE_ORDER); + setValue(document,moduleOrder,STRICT); + if (firstChild != null) { + root.insertBefore(moduleOrder, firstChild); + } else { + root.appendChild(moduleOrder); + } + } + model.save(); + } + } catch (CoreException e) { + SeamCorePlugin.getDefault().logError(e); + } catch (IOException e) { + SeamCorePlugin.getDefault().logError(e); + } finally { + if (model != null) { + model.releaseFromEdit(); + } + } + try { + new FormatProcessorXML().formatFile((IFile) jbossAppXml); + } catch (Exception ignore) { + } + } + + private void setValue(Document document, Node node, String value) { + Text text = document.createTextNode(value); + node.appendChild(text); + } + protected AntCopyUtils.FileSet getJBossTestLibFileset() { return JBOSS_TEST_LIB_FILESET; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-07-18 22:02:34 UTC (rev 16658) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-07-18 22:03:00 UTC (rev 16659) @@ -270,6 +270,9 @@ WtpUtils.reconfigure(ejbProjectToBeImported,monitor); IProject earProjectToBeImported = wsRoot.getProject(earProjectName); ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath + "/" + earProjectName, earProjectName, monitor, false); + + configureJBossAppXml(); + WtpUtils.reconfigure(earProjectToBeImported, monitor); } @@ -501,4 +504,8 @@ SeamCorePlugin.getPluginLog().logError(e); } } + + protected void configureJBossAppXml() { + // Do nothing special for Seam 1.2 + } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2009-07-18 22:02:34 UTC (rev 16658) +++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2009-07-18 22:03:00 UTC (rev 16659) @@ -6,7 +6,12 @@ <display-name>@projectName@-ear</display-name> + <!-- JBIDE-4166 Workaround - Make sure we deploy this first, since this is referenced in xxx-ejb.jar--> <module> + <ejb>jboss-seam.jar</ejb> + </module> + + <module> <web> <web-uri>@projectName@.war</web-uri> <context-root>/@projectName@</context-root> @@ -17,8 +22,4 @@ <ejb&gt;@projectName(a)-ejb.jar&lt;/ejb&gt; </module> - <module> - <ejb>jboss-seam.jar</ejb> - </module> - </application> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear-seam2/EarContent/META-INF/application.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear-seam2/EarContent/META-INF/application.xml 2009-07-18 22:02:34 UTC (rev 16658) +++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear-seam2/EarContent/META-INF/application.xml 2009-07-18 22:03:00 UTC (rev 16659) @@ -6,7 +6,12 @@ <display-name>@projectName@-ear</display-name> + <!-- JBIDE-4166 Workaround - Make sure we deploy this first, since this is referenced in xxx-ejb.jar--> <module> + <ejb>jboss-seam.jar</ejb> + </module> + + <module> <web> <web-uri>@projectName@.war</web-uri> <context-root>/@projectName@</context-root> @@ -17,8 +22,4 @@ <ejb&gt;@projectName(a)-ejb.jar&lt;/ejb&gt; </module> - <module> - <ejb>jboss-seam.jar</ejb> - </module> - </application>