[jbosstools-commits] JBoss Tools SVN: r2692 - in trunk/jst/plugins/org.jboss.tools.jst.web: src/org/jboss/tools/jst/web and 1 other directory.

Author: dgolovin Date: 2007-07-26 14:59:10 -0400 (Thu, 26 Jul 2007) New Revision: 2692 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java Log: fix the build problem seam gen initialization and dependency are removed. to get the build back to normal Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2007-07-26 16:58:00 UTC (rev 2691) +++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2007-07-26 18:59:10 UTC (rev 2692) @@ -63,7 +63,6 @@ org.eclipse.pde.ui, org.eclipse.core.runtime, org.eclipse.ant.ui, - org.eclipse.ui.externaltools, - org.jboss.ide.seam.gen + org.eclipse.ui.externaltools Bundle-Version: 2.0.0 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2007-07-26 16:58:00 UTC (rev 2691) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2007-07-26 18:59:10 UTC (rev 2692) @@ -35,7 +35,6 @@ import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; -import org.jboss.ide.seam.gen.actions.SeamGenAction; import org.jboss.tools.common.log.BaseUIPlugin; import org.jboss.tools.common.log.IPluginLog; import org.jboss.tools.common.model.XModel; @@ -48,8 +47,6 @@ public class WebModelPlugin extends BaseUIPlugin { public static final String JBOSS_AS_HOME = "../../../../jbossas"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas. - // TODO agreement about actual seam-gen location is needed - public static final String SEAM_GEN_HOME = "../../../../jbosseam/seam-gen"; public static final String JBOSS_AS_RUNTIME_TYPE_ID = "org.jboss.ide.eclipse.as.runtime.42"; public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42"; @@ -109,39 +106,12 @@ // when calling of these dialogs is cause of loadind the plugin hierarchy ProjectTemplatesPlugin.getDefault(); initJbossAS(); - initSeamGen(); } - private void initSeamGen() { - ILaunchConfiguration config=null; - try { - config = findLaunchConfig("seamgen"); - } catch (CoreException e1) { - getPluginLog().logError("Exception occured during search in Launch Configuration list.", e1); - } - String buildXmlPath = null; - if(config==null) { - try { - buildXmlPath = getSeamGenBuildPath(); - SeamGenAction.createSeamgenLaunchConfig(buildXmlPath); - } catch (CoreException e) { - getPluginLog().logError("Cannot create configuration for Seam-Gen tool. Seamgen build.xml file: " + buildXmlPath, e); - return; - } - } - } - public String getSeamGenBuildPath() { - String pluginLocation = EclipseResourceUtil.getInstallPath(this.getBundle()); - File seamGenDir = new File(pluginLocation, SEAM_GEN_HOME); - File seamGenBuildXml = new File(seamGenDir,"build.xml"); - if(seamGenBuildXml.isFile()) { - return seamGenBuildXml.getAbsolutePath(); - } else { - return ""; - } - } + + static public ILaunchConfiguration findLaunchConfig(String name) throws CoreException { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); @@ -226,7 +196,7 @@ server.setName(JBOSS_AS_NAME); server.save(false, progressMonitor); } - } catch (Exception e) { + } catch (CoreException e) { getPluginLog().logError("Can't create new JBoss Server.", e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2007-07-26 16:58:00 UTC (rev 2691) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebUtils.java 2007-07-26 18:59:10 UTC (rev 2692) @@ -51,8 +51,8 @@ String path = null; try { path = fs[i].getCanonicalPath(); - } catch (Exception e) { - //ignore + } catch (IOException e) { + WebModelPlugin.getPluginLog().logError(e); } if(path != null) jars.add(path); } @@ -88,7 +88,7 @@ if(path.startsWith(classPathVarValue)) { path = classPathVarName + path.substring(classPathVarValue.length()); } - } catch (Exception e) { + } catch (IOException e) { WebModelPlugin.getPluginLog().logError(e); } if(path != null) jars.add(path);