Author: rob.stryker(a)jboss.com Date: 2007-08-03 10:21:43 -0400 (Fri, 03 Aug 2007) New Revision: 2885 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ModulePackageTypeConverter.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/EjbArchiveType.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: removing ejb30 refs Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ModulePackageTypeConverter.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ModulePackageTypeConverter.java 2007-08-03 11:42:25 UTC (rev 2884) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ModulePackageTypeConverter.java 2007-08-03 14:21:43 UTC (rev 2885) @@ -39,8 +39,6 @@ return ArchivesCore.getInstance().getExtensionManager().getArchiveType(WarArchiveType.WAR_PACKAGE_TYPE); } else if("jst.ear".equals(modType)) { return ArchivesCore.getInstance().getExtensionManager().getArchiveType(EarArchiveType.ID); - } else if("jbide.ejb30".equals(modType)) { - return ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID); } else if("jst.ejb".equals(modType)) { return ArchivesCore.getInstance().getExtensionManager().getArchiveType(EjbArchiveType.ID); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/EjbArchiveType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/EjbArchiveType.java 2007-08-03 11:42:25 UTC (rev 2884) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/EjbArchiveType.java 2007-08-03 14:21:43 UTC (rev 2885) @@ -40,8 +40,7 @@ if( mod == null ) { } else { - if( mod.getModuleType().getId().equals("jst.ejb") - || mod.getModuleType().getId().equals("jbide.ejb30")) { + if( mod.getModuleType().getId().equals("jst.ejb") ) { try { IJavaProject proj = JavaCore.create(project); IPath outputLoc = proj.getOutputLocation(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java 2007-08-03 11:42:25 UTC (rev 2884) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/internal/WebtoolsProjectJBossClasspathContainerInitializer.java 2007-08-03 14:21:43 UTC (rev 2885) @@ -47,7 +47,6 @@ private static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet("jst.web"); private static final IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet("jst.ejb"); private static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet("jst.ear"); - private static final IProjectFacet JBOSS_EJB_FACET = ProjectFacetsManager.getProjectFacet("jbide.ejb30"); private static final IProjectFacet UTILITY_FACET = ProjectFacetsManager.getProjectFacet("jst.utility"); private static final IProjectFacet CONNECTOR_FACET = ProjectFacetsManager.getProjectFacet("jst.connector"); private static final IProjectFacet APP_CLIENT_FACET = ProjectFacetsManager.getProjectFacet("jst.appclient"); @@ -145,8 +144,6 @@ protected boolean isEjb30(String facetId, String facetVersion) { if( facetId.equals(EJB_FACET.getId()) && facetVersion.equals("3.0")) return true; - if( facetId.equals(JBOSS_EJB_FACET.getId())) - return true; return false; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java 2007-08-03 11:42:25 UTC (rev 2884) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java 2007-08-03 14:21:43 UTC (rev 2885) @@ -100,8 +100,7 @@ protected boolean isJstModule(IModule mod) { String type = mod.getModuleType().getId(); if( type.equals("jst.ejb") || type.equals("jst.client") - || type.equals("jst.web") || type.equals("jst.ear") - || type.equals("jbide.ejb30")) + || type.equals("jst.web") || type.equals("jst.ear")) return true; return false; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-08-03 11:42:25 UTC (rev 2884) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-08-03 14:21:43 UTC (rev 2885) @@ -116,9 +116,6 @@ types="jst.ear" versions="1.2, 1.3, 1.4"/> <moduleType - types="jbide.ejb30" - versions="1.0"/> - <moduleType types="jboss.package" versions="1.0"/> </runtimeType> @@ -139,9 +136,6 @@ types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/> <moduleType - types="jbide.ejb30" - versions="1.0"/> - <moduleType types="jboss.package" versions="1.0"/> </runtimeType> @@ -165,9 +159,6 @@ types="jst.ear" versions="1.2, 1.3, 1.4"/> <moduleType - types="jbide.ejb30" - versions="1.0"/> - <moduleType types="jboss.package" versions="1.0"/> @@ -344,9 +335,6 @@ <facet id="jst.appclient" version="1.2,1.3,1.4"/> - <facet - id="jbide.ejb30" - version="1.0"/> </supported> <supported> @@ -371,9 +359,6 @@ <facet id="jst.appclient" version="1.2,1.3,1.4"/> - <facet - id="jbide.ejb30" - version="1.0"/> </supported> <adapter>