[jboss-cvs] jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet ...

[Robert Stryker]

  User: rawb    
  Date: 07/02/07 19:11:04

  Modified:    ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet  
                        Ejb30FacetInstallDataModelProvider.java
                        Ejb30FacetPostInstallDelegate.java
  Log:
  Added artifact adapter, package type, etc
  
  Revision  Changes    Path
  1.3       +1 -0      jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet/Ejb30FacetInstallDataModelProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb30FacetInstallDataModelProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet/Ejb30FacetInstallDataModelProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Ejb30FacetInstallDataModelProvider.java	25 Jan 2007 22:08:59 -0000	1.2
  +++ Ejb30FacetInstallDataModelProvider.java	8 Feb 2007 00:11:04 -0000	1.3
  @@ -38,6 +38,7 @@
   
   	protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
   		// I've only got one facet version so far, so woohoo
  +		// TODO: should eventually be 1.5? if constant exists
   		return J2EEVersionConstants.J2EE_1_4_ID;
   	}
   		
  
  
  
  1.4       +21 -13    jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet/Ejb30FacetPostInstallDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb30FacetPostInstallDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/facet/Ejb30FacetPostInstallDelegate.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Ejb30FacetPostInstallDelegate.java	29 Jan 2007 20:11:57 -0000	1.3
  +++ Ejb30FacetPostInstallDelegate.java	8 Feb 2007 00:11:04 -0000	1.4
  @@ -11,6 +11,7 @@
   
   import org.eclipse.core.commands.ExecutionException;
   import org.eclipse.core.resources.IFile;
  +import org.eclipse.core.resources.IFolder;
   import org.eclipse.core.resources.IProject;
   import org.eclipse.core.resources.ResourcesPlugin;
   import org.eclipse.core.runtime.CoreException;
  @@ -25,7 +26,6 @@
   import org.eclipse.jdt.core.JavaModelException;
   import org.eclipse.jem.util.logger.proxy.Logger;
   import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
  -import org.eclipse.jst.j2ee.application.Application;
   import org.eclipse.jst.j2ee.application.Module;
   import org.eclipse.jst.j2ee.application.internal.impl.EjbModuleImpl;
   import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
  @@ -139,6 +139,7 @@
   	public void jbossPostInstall(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
   		addClasspathEntries(project, fv, config, monitor);
   		addJNDIFile(project);
  +		addMetaInfFolder(project);
   	}
   	
   	public void addClasspathEntries(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
  @@ -183,28 +184,35 @@
   	
   	public void addJNDIFile(IProject project) {
   		try {
  -	        String sourcePath = findSourcePaths(project);
  -	        createJndiProperties(new Path(sourcePath));
  +	        Path sourcePath = new Path(findSourcePaths(project));
  +	        IPath jndiPath = sourcePath.append("jndi.properties");
  +	        IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jndiPath);
  +
  +	        String jndiProps = "java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory\n"
  +	              + "java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces\n"
  +	              + "java.naming.provider.url=localhost:1099\n";
  +
  +	        file.create(new ByteArrayInputStream(jndiProps.getBytes()), true, new NullProgressMonitor());
   		} catch( CoreException ce ) {
   		}
   	}
   	
  +	protected void addMetaInfFolder(IProject project) {
  +		try {
  +	        Path sourcePath = new Path(findSourcePaths(project));
  +	        IPath metainfPath = sourcePath.append("META-INF");
  +	        IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(metainfPath);
  +	        folder.create(true, true, new NullProgressMonitor());
  +		} catch( CoreException ce) {
  +		}
  +	}
  +	
      private class JndiPropertiesFileFilter implements FileFilter {
   	      public boolean accept(File file) {
   	         return (file.getName().equals("jndi.properties"));
   	      }
      }
      
  -   private void createJndiProperties(IPath srcPath) throws CoreException {
  -      IPath jndiPath = srcPath.append("jndi.properties");
  -      IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jndiPath);
  -
  -      String jndiProps = "java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory\n"
  -            + "java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces\n"
  -            + "java.naming.provider.url=localhost:1099\n";
  -
  -      file.create(new ByteArrayInputStream(jndiProps.getBytes()), true, new NullProgressMonitor());
  -   }
      private String findSourcePaths(IProject project) throws CoreException {
   	   IJavaElement elem = JavaCore.create(project);
   	   IPackageFragmentRoot initRoot= null;