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

[Robert Stryker]

  User: rawb    
  Date: 07/02/09 13:54:33

  Modified:    ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module 
                        Ejb30PackageType.java
  Log:
  made it work
  
  Revision  Changes    Path
  1.2       +9 -27     jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30PackageType.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Ejb30PackageType.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30PackageType.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Ejb30PackageType.java	8 Feb 2007 00:11:04 -0000	1.1
  +++ Ejb30PackageType.java	9 Feb 2007 18:54:33 -0000	1.2
  @@ -3,6 +3,7 @@
   import org.eclipse.core.resources.IProject;
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.Path;
  +import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
   import org.eclipse.jst.server.core.IWebModule;
   import org.eclipse.wst.server.core.IModule;
   import org.jboss.ide.eclipse.as.core.packages.ObscurelyNamedPackageTypeSuperclass;
  @@ -15,41 +16,22 @@
   
   	public static final String ID = "org.jboss.ide.eclipse.ejb3.wizards.core.ejbPackageType";
   	public String getAssociatedModuleType() {
  -		return "jbide.jboss30";
  +		return "jbide.ejb30";
   	}
   
   	public IPackage createDefaultConfiguration(IProject project, IProgressMonitor monitor) {
  -		IModule mod = getModule(project);
  -		if( mod == null ) 
  -			return createDefaultConfiguration2(project, monitor);
  -		else
  -			return createDefaultConfigFromModule(mod, monitor);
  +		boolean facetFound = J2EEProjectUtilities.isProjectOfType(project, getAssociatedModuleType()); 
  +		return createDefaultConfiguration(project, facetFound, monitor);
   	}
   	
  -	protected IPackage createDefaultConfiguration2(IProject project, IProgressMonitor monitor) {
  -		IPackage topLevel = createGenericIPackage(project, null, project.getName() + ".jar");
  -		topLevel.setDestinationContainer(project);
  -		IPackageFolder metainf = addFolder(project, topLevel, METAINF);
  -		IPackageFolder lib = addFolder(project, metainf, LIB);
  -		addFileset(project, metainf, METAINF, null);
  -		return topLevel;
  -	}
  -
  -	protected IPackage createDefaultConfigFromModule(IModule mod, IProgressMonitor monitor) {
  -		try {
  -			IProject project = mod.getProject();
  +	public IPackage createDefaultConfiguration(IProject project, boolean facetFound, IProgressMonitor monitor) {
  +		String metaInfDir = (facetFound ? EJBMODULE + Path.SEPARATOR : "") + METAINF;
   
   			IPackage topLevel = createGenericIPackage(project, null, project.getName() + ".jar");
   			topLevel.setDestinationContainer(project);
   			IPackageFolder metainf = addFolder(project, topLevel, METAINF);
   			IPackageFolder lib = addFolder(project, metainf, LIB);
  -			addFileset(project, metainf, EJBMODULE + Path.SEPARATOR + METAINF, null);
  -
  +		addFileset(project, metainf, metaInfDir, null);
   			return topLevel;
  -		} catch( Exception e ) {
  -			e.printStackTrace();
   		}
  -		return null;
  -	}
  -
   }