[jbosstools-commits] JBoss Tools SVN: r7646 - in trunk/ws/plugins/org.jboss.tools.ws.core: src/org/jboss/tools/ws/core and 2 other directories.

Author: Grid.Qian Date: 2008-04-21 06:01:48 -0400 (Mon, 21 Apr 2008) New Revision: 7646 Added: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCorePlugin.java Removed: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/Activator.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessage.java Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java Log: Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-04-21 07:39:48 UTC (rev 7645) +++ trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-04-21 10:01:48 UTC (rev 7646) @@ -4,11 +4,14 @@ Bundle-SymbolicName: org.jboss.tools.ws.core;singleton:=true Bundle-Version: 1.0.0 Bundle-Localization: plugin -Bundle-Activator: org.jboss.tools.ws.core.Activator +Bundle-Activator: org.jboss.tools.ws.core.JbossWSCorePlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.common.frameworks, - org.eclipse.core.resources + org.eclipse.core.resources, + org.eclipse.jst.ws Eclipse-LazyStart: true Bundle-Vendor: %PLUGIN_PROVIDER +Export-Package: org.jboss.tools.ws.core, + org.jboss.tools.ws.core.command Deleted: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/Activator.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/Activator.java 2008-04-21 07:39:48 UTC (rev 7645) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/Activator.java 2008-04-21 10:01:48 UTC (rev 7646) @@ -1,62 +0,0 @@ -/******************************************************************************* - * 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.ws.core; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.ws.core"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} Deleted: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore 2008-04-21 07:39:48 UTC (rev 7645) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore 2008-04-21 10:01:48 UTC (rev 7646) @@ -1 +0,0 @@ -PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime \ No newline at end of file Copied: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties (from rev 7606, trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCore.properties 2008-04-21 10:01:48 UTC (rev 7646) @@ -0,0 +1,4 @@ +PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime +DIR_LIB=lib +DIR_WEB_INF=WEB-INF +DIR_WEB_CONTENT=WebContent \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessage.java 2008-04-21 07:39:48 UTC (rev 7645) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessage.java 2008-04-21 10:01:48 UTC (rev 7646) @@ -1,19 +0,0 @@ -package org.jboss.tools.ws.core; - -import org.eclipse.osgi.util.NLS; - -public class JbossWSCoreMessage { - - private static final String BUNDLE_NAME = "org.jboss.tools.ws.ui.JbossWSCore"; //$NON-NLS-1$ - - private JbossWSCoreMessage() { - // Do not instantiate - } - - public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME; - - - static { - NLS.initializeMessages(BUNDLE_NAME, JbossWSCoreMessage.class); - } -} \ No newline at end of file Copied: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java (from rev 7606, trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessage.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCoreMessages.java 2008-04-21 10:01:48 UTC (rev 7646) @@ -0,0 +1,22 @@ +package org.jboss.tools.ws.core; + +import org.eclipse.osgi.util.NLS; + +public class JbossWSCoreMessages { + + private static final String BUNDLE_NAME = "org.jboss.tools.ws.core.JbossWSCore"; //$NON-NLS-1$ + + private JbossWSCoreMessages() { + // Do not instantiate + } + + public static String PROGRESS_INSTALL_JBOSSWS_RUNTIME; + public static String DIR_LIB; + public static String DIR_WEB_INF; + public static String DIR_WEB_CONTENT; + + + static { + NLS.initializeMessages(BUNDLE_NAME, JbossWSCoreMessages.class); + } +} \ No newline at end of file Added: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCorePlugin.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCorePlugin.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/JbossWSCorePlugin.java 2008-04-21 10:01:48 UTC (rev 7646) @@ -0,0 +1,62 @@ +/******************************************************************************* + * 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.ws.core; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class JbossWSCorePlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.ws.core"; + + // The shared instance + private static JbossWSCorePlugin plugin; + + /** + * The constructor + */ + public JbossWSCorePlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static JbossWSCorePlugin getDefault() { + return plugin; + } + +} Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-04-21 07:39:48 UTC (rev 7645) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-04-21 10:01:48 UTC (rev 7646) @@ -7,7 +7,7 @@ * * Contributors: * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.ws.core.command; @@ -25,116 +25,64 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceStore; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; +import org.jboss.tools.ws.core.JbossWSCoreMessages; +import org.jboss.tools.ws.core.JbossWSCorePlugin; +import org.jboss.tools.ws.core.utils.JbossWSCoreUtils; +public class JbossWSRuntimeCommand extends AbstractDataModelOperation { -public class JbossWSRuntimeCommand extends -AbstractDataModelOperation { - IProject project; - String runtimelocation; - - public JbossWSRuntimeCommand(IProject project){ - PreferenceStore ps = new PreferenceStore("jbosswsui.properties"); - try { - ps.load(); - } catch (IOException e) { - // Ignore - } - runtimelocation = ps.getString("jbosswsruntimelocation"); + String runtimeLocation; + + public JbossWSRuntimeCommand(IProject project) { this.project = project; } public IStatus execute(IProgressMonitor monitor, IAdaptable info) - throws ExecutionException { + throws ExecutionException { return Status.OK_STATUS; } - - public IStatus executeOverride(IProgressMonitor monitor) { - // Copy the axis2 facet in to this project - IStatus status =null; -// String runtimeLocation = null; -// ContentCopyUtils contentCopyUtils = new ContentCopyUtils(); -// try { -// if(context.isAxis2ServerPathRepresentsWar() -// || RuntimePropertyUtils.getWarStatusFromPropertiesFile()){ -// runtimeLocation = Axis2RuntimeUtils.copyAxis2War( -// monitor, -// Axis2Constants.PROPERTY_KEY_PATH); -// }else{ -// -// runtimeLocation = Axis2WebappUtils.copyAxis2War( -// monitor, -// Axis2Constants.PROPERTY_KEY_PATH); -// } -// } catch (FileNotFoundException e) { -// return handleExceptionStatus(e); -// } catch (IOException e) { -// return handleExceptionStatus(e); -// } catch (Exception e) { -// return handleExceptionStatus(e); -// } -// -// // First Setting the libs folder as ignored and then copy the content of -// // the runtime -// IPath libPath = new Path(runtimeLocation); -// libPath = libPath.append(Axis2Constants.DIR_WEB_INF); -// libPath = libPath.append(Axis2Constants.DIR_LIB); -// List<String> ignoreList = new ArrayList<String>(); -// ignoreList.add(libPath.toOSString()); -// contentCopyUtils.updateCheckList(ignoreList); -// -// status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace( -// runtimeLocation, -// FacetContainerUtils.pathToWebProjectContainer(project.toString()), -// monitor, -// false -// ); -// -// // After that copy the nesessery set of libraries to the project again -// List<String> includeList = new ArrayList<String>(); -// contentCopyUtils.updateCheckList(loadIncludeListWithAxis2Libs(libPath.toOSString(), -// includeList)); -// String[] nodes = {Axis2Constants.DIR_WEB_INF,Axis2Constants.DIR_LIB}; -// status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace( -// libPath.toOSString(), -// FileUtils.addNodesToPath( -// FacetContainerUtils.pathToWebProjectContainer(project.toString()), -// nodes), -// monitor, -// true -// ); -// -// // Merge web.xml Files -// MergeWEBXMLCommand mergeWebXMLCommand = new MergeWEBXMLCommand(); -// mergeWebXMLCommand.setExtraAxis2TagsAdded(false); -// mergeWebXMLCommand.setServerProject(project); -// mergeWebXMLCommand.exexuteOverride(monitor); -// -// // clean up tempery files -// File tempFacetDirectory = new File(runtimeLocation); -// if (tempFacetDirectory.exists() && context.isAxis2ServerPathRepresentsWar()) { -// FileUtils.deleteDir(tempFacetDirectory); -// } -// status = Status.OK_STATUS; + + public IStatus executeOverride(IProgressMonitor monitor) { + IStatus status = null; + + IPreferenceStore ps = JbossWSCorePlugin.getDefault() + .getPreferenceStore(); + runtimeLocation = ps.getString("jbosswsruntimelocation"); + + // copy lib to project's folder + IPath libPath = new Path(runtimeLocation); + libPath = libPath.append(JbossWSCoreMessages.DIR_LIB); + + IPath targetPath = JbossWSCoreUtils.pathToWebProjectContainer(project + .toString()); + targetPath = targetPath + .append(JbossWSCoreMessages.DIR_WEB_INF).append( + JbossWSCoreMessages.DIR_LIB); + JbossWSCoreUtils.copy(libPath, targetPath); + + status = Status.OK_STATUS; return status; } - - private void cleanupIfFacetStatusFailed(String runtimeLocation){ -// File tempFacetDirectory = new File(runtimeLocation); -// if (tempFacetDirectory.exists()) { -// FileUtils.deleteDir(tempFacetDirectory); -// } + + private void cleanupIfFacetStatusFailed(String runtimeLocation) { + // File tempFacetDirectory = new File(runtimeLocation); + // if (tempFacetDirectory.exists()) { + // FileUtils.deleteDir(tempFacetDirectory); + // } } - - private IStatus handleExceptionStatus(Exception e){ + + private IStatus handleExceptionStatus(Exception e) { IStatus status = null; -// status = new Status(1,project.toString(),1,Axis2CoreUIMessages.ERROR_SERVER_IS_NOT_SET,e); -// cleanupIfFacetStatusFailed(Axis2CoreUtils.tempAxis2Directory()); + // status = new + // Status(1,project.toString(),1,Axis2CoreUIMessages.ERROR_SERVER_IS_NOT_SET,e); + // cleanupIfFacetStatusFailed(Axis2CoreUtils.tempAxis2Directory()); return status; } - + /** * Load the exact libraries list from the axis2 jars with the correct * versions to the <code>path</code>. Doing it this way introduce the @@ -145,22 +93,23 @@ * @param includeList * @return loaded list */ - private List loadIncludeListWithAxis2Libs(String path, List includeList){ -// for (int i = 0; i < Axis2Constants.AXIS2_LIB_PREFIXES.length; i++) { -// File[] jarFileList = FileUtils.getMatchingFiles(path, -// Axis2Constants.AXIS2_LIB_PREFIXES[i], -// Axis2Constants.JAR); -// for (int j = 0; j < jarFileList.length; j++) { -// includeList.add(jarFileList[j].getAbsolutePath()); -// } -// // Fix for the 205972 -// File[] licenseFileList = FileUtils.getMatchingFiles(path, -// Axis2Constants.AXIS2_LIB_PREFIXES[i], -// Axis2Constants.TXT); -// for (int k = 0; k < licenseFileList.length; k++) { -// includeList.add(licenseFileList[k].getAbsolutePath()); -// } -// } + private List loadIncludeListWithAxis2Libs(String path, List includeList) { + // for (int i = 0; i < Axis2Constants.AXIS2_LIB_PREFIXES.length; i++) { + // File[] jarFileList = FileUtils.getMatchingFiles(path, + // Axis2Constants.AXIS2_LIB_PREFIXES[i], + // Axis2Constants.JAR); + // for (int j = 0; j < jarFileList.length; j++) { + // includeList.add(jarFileList[j].getAbsolutePath()); + // } + // // Fix for the 205972 + // File[] licenseFileList = FileUtils.getMatchingFiles(path, + // Axis2Constants.AXIS2_LIB_PREFIXES[i], + // Axis2Constants.TXT); + // for (int k = 0; k < licenseFileList.length; k++) { + // includeList.add(licenseFileList[k].getAbsolutePath()); + // } + // } return includeList; } + } \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-04-21 07:39:48 UTC (rev 7645) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-04-21 10:01:48 UTC (rev 7646) @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.jboss.tools.ws.core.JbossWSCoreMessage; +import org.jboss.tools.ws.core.JbossWSCoreMessages; import org.jboss.tools.ws.core.command.JbossWSRuntimeCommand; public class JbossWSInstallRuntimeDelegate implements IDelegate { @@ -28,7 +28,7 @@ public void execute(IProject project, IProjectFacetVersion arg1, Object arg2, IProgressMonitor monitor) throws CoreException { - monitor.beginTask(JbossWSCoreMessage.PROGRESS_INSTALL_JBOSSWS_RUNTIME, 2 ); + monitor.beginTask(JbossWSCoreMessages.PROGRESS_INSTALL_JBOSSWS_RUNTIME, 2 ); JbossWSRuntimeCommand command = new JbossWSRuntimeCommand(project); status = command.executeOverride(monitor);