Author: rob.stryker(a)jboss.com Date: 2009-12-16 18:34:11 -0500 (Wed, 16 Dec 2009) New Revision: 19371 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/UninstallJBossClassPathCommand.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/utils/JBossESBProjectUtil.java Log: adding headers and tiny cleanup Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/component/ESBVirtualComponent.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2008 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.esb.core.component; import org.jboss.ide.eclipse.as.wtp.core.vcf.JBTVirtualComponent; Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -75,16 +75,12 @@ .setPersistentProperty( IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME, runtimeName); - project - .setPersistentProperty( + project.setPersistentProperty( IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_RNTIME_LOCATION, runtimeLocation); project.setPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER, esbcontentFolder); status = addClassPath(project, new String[]{runtimeName}); } - - - } catch (CoreException e) { status = StatusUtils.errorStatus( JBossFacetCoreMessages.Error_Add_Facet_JBossESB, e); Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -20,7 +20,7 @@ public class JBossESBFacetDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IJBossESBFacetDataModelProperties{ - private static final String JBOSSESB_PROJECT_FACET = "jst.jboss.esb"; + private static final String JBOSSESB_PROJECT_FACET = ESBProjectConstant.ESB_PROJECT_FACET; public Set getPropertyNames() { Set names = super.getPropertyNames(); @@ -72,8 +72,4 @@ public IStatus validate(String propertyName) { return OK_STATUS; } - - - - } Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetInstallationDelegate.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -37,6 +37,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.jboss.ide.eclipse.as.wtp.core.util.VCFUtil; import org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFoldersVirtualComponent; +import org.jboss.tools.esb.core.ESBProjectConstant; import org.jboss.tools.esb.core.ESBProjectCorePlugin; import org.jboss.tools.esb.core.component.ESBVirtualComponent; import org.osgi.service.prefs.BackingStoreException; @@ -134,11 +135,8 @@ } esbContent.getFolder("lib").create(true, true, null); - esbContent.getFolder("META-INF").create(true, true, null); - createJBossESBXML(esbContent.getFolder("META-INF")); - - - + esbContent.getFolder(ESBProjectConstant.META_INF).create(true, true, null); + createJBossESBXML(esbContent.getFolder(ESBProjectConstant.META_INF)); project.refreshLocal(IResource.DEPTH_ZERO, null); } Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/UninstallJBossClassPathCommand.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/UninstallJBossClassPathCommand.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/UninstallJBossClassPathCommand.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -51,25 +51,12 @@ .getBoolean(project .getPersistentProperty(IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME)); if (isServerSupplied) { -// project -// .getPersistentProperties() -// .remove( -// IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME); + // TODO test } else { -// project -// .getPersistentProperties() -// .remove( -// IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME); -// project -// .getPersistentProperties() -// .remove( -// IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_RNTIME_LOCATION); String runtimeName = project .getPersistentProperty(IJBossESBFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME); - status = removeClassPath(project, runtimeName); } - } catch (CoreException e) { status = StatusUtils.errorStatus( JBossFacetCoreMessages.Error_Remove_Facet_JBossESB, e); Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/AbstractESBRuntimeResolver.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.esb.core.runtime; import java.io.File; Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_42.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.esb.core.runtime; import java.io.File; Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.esb.core.runtime; import java.io.File; Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/IESBRuntimeResolver.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.esb.core.runtime; import java.io.File; Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/utils/JBossESBProjectUtil.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/utils/JBossESBProjectUtil.java 2009-12-16 23:02:22 UTC (rev 19370) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/utils/JBossESBProjectUtil.java 2009-12-16 23:34:11 UTC (rev 19371) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.esb.core.utils; import org.eclipse.core.resources.IProject; @@ -7,6 +17,9 @@ import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.esb.core.ESBProjectConstant; +/* + * In WTP 3.2 this can be replaced with utility code in modulecore + */ public class JBossESBProjectUtil { public static boolean isESBProject(IProject project) {