JBoss Tools SVN: r7980 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core: src/org and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-05-06 05:14:09 -0400 (Tue, 06 May 2008)
New Revision: 7980
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/
Removed:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/JBossWSCreationCore.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/messages/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils/
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommnad.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommnad.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java
Log:
change package name
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-05-06 09:14:09 UTC (rev 7980)
@@ -3,7 +3,7 @@
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.jboss.tools.ws.creation.core
Bundle-Version: 1.0.0
-Bundle-Activator: org.jboos.tools.ws.creation.core.JBossWSCreationCore
+Bundle-Activator: org.jboss.tools.ws.creation.core.JBossWSCreationCore
Bundle-Vendor: %PLUGIN_PROVIDER
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -20,9 +20,9 @@
org.apache.ant,
org.apache.xerces
Eclipse-LazyStart: true
-Export-Package: org.jboos.tools.ws.creation.core,
- org.jboos.tools.ws.creation.core.commands,
- org.jboos.tools.ws.creation.core.data,
- org.jboos.tools.ws.creation.core.messages
+Export-Package: org.jboss.tools.ws.creation.core,
+ org.jboss.tools.ws.creation.core.commands,
+ org.jboss.tools.ws.creation.core.data,
+ org.jboss.tools.ws.creation.core.messages
Bundle-ClassPath: lib/wsdl4j.jar,
.
Deleted: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/JBossWSCreationCore.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/JBossWSCreationCore.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/JBossWSCreationCore.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -1,50 +0,0 @@
-package org.jboos.tools.ws.creation.core;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JBossWSCreationCore extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboos.tools.ws.creation.core";
-
- // The shared instance
- private static JBossWSCreationCore plugin;
-
- /**
- * The constructor
- */
- public JBossWSCreationCore() {
- }
-
- /*
- * (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 JBossWSCreationCore getDefault() {
- return plugin;
- }
-
-}
Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java (from rev 7979, trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/JBossWSCreationCore.java)
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/JBossWSCreationCore.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -0,0 +1,50 @@
+package org.jboss.tools.ws.creation.core;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class JBossWSCreationCore extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboos.tools.ws.creation.core";
+
+ // The shared instance
+ private static JBossWSCreationCore plugin;
+
+ /**
+ * The constructor
+ */
+ public JBossWSCreationCore() {
+ }
+
+ /*
+ * (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 JBossWSCreationCore getDefault() {
+ return plugin;
+ }
+
+}
Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands (from rev 7979, trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands)
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/BindingFilesValidationCommand.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/BindingFilesValidationCommand.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -1,4 +1,4 @@
-package org.jboos.tools.ws.creation.core.commands;
+package org.jboss.tools.ws.creation.core.commands;
import java.io.IOException;
@@ -12,8 +12,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.jboos.tools.ws.creation.core.data.ServiceModel;
-import org.jboos.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommnad.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/InitialCommnad.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommnad.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -1,4 +1,4 @@
-package org.jboos.tools.ws.creation.core.commands;
+package org.jboss.tools.ws.creation.core.commands;
import javax.wsdl.WSDLException;
@@ -17,9 +17,9 @@
import org.eclipse.wst.wsdl.internal.util.WSDLDefinitionFactory;
import org.eclipse.wst.wsdl.internal.util.WSDLUtil;
import org.eclipse.wst.wsdl.util.WSDLParser;
-import org.jboos.tools.ws.creation.core.data.ServiceModel;
-import org.jboos.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
-import org.jboos.tools.ws.creation.core.utils.WSDLPropertyReader;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.core.utils.WSDLPropertyReader;
public class InitialCommnad extends AbstractDataModelOperation {
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommnad.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -1,4 +1,4 @@
-package org.jboos.tools.ws.creation.core.commands;
+package org.jboss.tools.ws.creation.core.commands;
import java.io.File;
import java.io.IOException;
@@ -16,9 +16,9 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.jboos.tools.ws.creation.core.data.ServiceModel;
-import org.jboos.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
public class WSDL2JavaCommnad extends AbstractDataModelOperation{
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -1,4 +1,4 @@
-package org.jboos.tools.ws.creation.core.commands;
+package org.jboss.tools.ws.creation.core.commands;
import java.io.File;
import java.io.IOException;
@@ -13,9 +13,9 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.jboos.tools.ws.creation.core.data.ServiceModel;
-import org.jboos.tools.ws.creation.core.utils.JBossWSCreationUtils;
import org.jboss.tools.ws.core.JbossWSCorePlugin;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
public class WSProviderInvokeCommnad extends AbstractDataModelOperation{
Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data (from rev 7979, trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data)
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/data/ServiceModel.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -1,4 +1,4 @@
-package org.jboos.tools.ws.creation.core.data;
+package org.jboss.tools.ws.creation.core.data;
import java.util.ArrayList;
import java.util.List;
Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages (from rev 7979, trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/messages)
Copied: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils (from rev 7979, trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils)
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboos.tools.ws.creation.core.utils;
+package org.jboss.tools.ws.creation.core.utils;
import java.io.File;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils/WSDLPropertyReader.java 2008-05-05 10:49:58 UTC (rev 7979)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/WSDLPropertyReader.java 2008-05-06 09:14:09 UTC (rev 7980)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboos.tools.ws.creation.core.utils;
+package org.jboss.tools.ws.creation.core.utils;
import java.util.ArrayList;
import java.util.Iterator;
16 years, 10 months
JBoss Tools SVN: r7979 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-05-05 06:49:58 -0400 (Mon, 05 May 2008)
New Revision: 7979
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
Log:
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-05-05 10:48:14 UTC (rev 7978)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-05-05 10:49:58 UTC (rev 7979)
@@ -34,7 +34,7 @@
String commandLocation = runtimeLocation + Path.SEPARATOR + "bin";
String command = "sh wsprovide.sh ";
if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0){
- command = "cmd wsprovide.bat";
+ command = "cmd.exe /C wsprovide.bat";
}
String args = getCommandlineArgs();
command += " -k " + args;
16 years, 10 months
JBoss Tools SVN: r7978 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-05-05 06:48:14 -0400 (Mon, 05 May 2008)
New Revision: 7978
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java
Log:
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-05-05 10:47:37 UTC (rev 7977)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-05-05 10:48:14 UTC (rev 7978)
@@ -48,12 +48,12 @@
if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
commands.add(new InitialCommnad(model, this, WebServiceScenario.TOPDOWN));
commands.add(new WSDL2JavaCommnad(model));
- commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project)));
+ //commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project)));
}
else if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP){
commands.add(new InitialCommnad(model, this, WebServiceScenario.BOTTOMUP));
commands.add(new WSProviderInvokeCommnad(model));
- commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project)));
+ //commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project)));
}
return new SimpleCommandFactory(commands);
16 years, 10 months
JBoss Tools SVN: r7977 - in trunk/ws/plugins/org.jboss.tools.ws.core: src/org/jboss/tools/ws/core/command and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-05-05 06:47:37 -0400 (Mon, 05 May 2008)
New Revision: 7977
Added:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.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
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.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-05-05 09:28:52 UTC (rev 7976)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-05-05 10:47:37 UTC (rev 7977)
@@ -10,7 +10,8 @@
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.common.frameworks,
org.eclipse.core.resources,
- org.eclipse.jst.ws
+ org.eclipse.jst.ws,
+ org.eclipse.jdt.core
Eclipse-LazyStart: true
Bundle-Vendor: %PLUGIN_PROVIDER
Export-Package: org.jboss.tools.ws.core,
Added: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-05-05 10:47:37 UTC (rev 7977)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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.command;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+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.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 JbossWSClassPathCommand extends AbstractDataModelOperation {
+
+ IProject project;
+ String runtimeLocation;
+
+ public JbossWSClassPathCommand(IProject project) {
+ this.project = project;
+ }
+
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info)
+ throws ExecutionException {
+ return executeOverride(monitor);
+ }
+
+ public IStatus executeOverride(IProgressMonitor monitor) {
+ IStatus status = Status.OK_STATUS;
+ JbossWSCoreUtils.addClassPath(project);
+ return status;
+ }
+
+}
\ No newline at end of file
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-05-05 09:28:52 UTC (rev 7976)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-05-05 10:47:37 UTC (rev 7977)
@@ -42,14 +42,8 @@
public IStatus executeOverride(IProgressMonitor monitor) {
IStatus status = Status.OK_STATUS;
- IPreferenceStore ps = JbossWSCorePlugin.getDefault()
- .getPreferenceStore();
- runtimeLocation = ps.getString("jbosswsruntimelocation");
-
// copy lib jars to project's folder
- IPath libPath = new Path(runtimeLocation);
- libPath = libPath.append(JbossWSCoreMessages.DIR_LIB);
-
+ IPath libPath = JbossWSCoreUtils.getJbossLibPath();
IPath targetPath = JbossWSCoreUtils.pathToWebProjectContainer(project
.toString());
targetPath = targetPath
@@ -57,11 +51,6 @@
JbossWSCoreMessages.DIR_LIB);
status = JbossWSCoreUtils.copy(libPath, targetPath);
-// // copy lib jars to project's folder
-// IPath clientPath = new Path(runtimeLocation);
-// clientPath = clientPath.append(JbossWSCoreMessages.DIR_CLIENT);
-// JbossWSCoreUtils.copy(clientPath,targetPath);
-
return status;
}
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-05-05 09:28:52 UTC (rev 7976)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/JbossWSInstallRuntimeDelegate.java 2008-05-05 10:47:37 UTC (rev 7977)
@@ -17,7 +17,7 @@
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.jboss.tools.ws.core.JbossWSCoreMessages;
-import org.jboss.tools.ws.core.command.JbossWSRuntimeCommand;
+import org.jboss.tools.ws.core.command.JbossWSClassPathCommand;
public class JbossWSInstallRuntimeDelegate implements IDelegate {
@@ -25,7 +25,7 @@
IProgressMonitor monitor) throws CoreException {
monitor.beginTask(JbossWSCoreMessages.PROGRESS_INSTALL_JBOSSWS_RUNTIME, 2 );
- JbossWSRuntimeCommand command = new JbossWSRuntimeCommand(project);
+ JbossWSClassPathCommand command = new JbossWSClassPathCommand(project);
command.executeOverride(monitor);
monitor.worked( 1 );
monitor.done();
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-05-05 09:28:52 UTC (rev 7976)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-05-05 10:47:37 UTC (rev 7977)
@@ -26,11 +26,18 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.ws.core.JbossWSCoreMessages;
+import org.jboss.tools.ws.core.JbossWSCorePlugin;
public class JbossWSCoreUtils {
@@ -122,26 +129,29 @@
try {
finStream = new FileInputStream(children[i]);
} catch (FileNotFoundException e) {
- status = StatusUtils.errorStatus(
- NLS.bind(JbossWSCoreMessages.ERROR_COPY,
- new String[]{e.getLocalizedMessage()}), e);
+ status = StatusUtils.errorStatus(NLS.bind(
+ JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ .getLocalizedMessage() }), e);
}
try {
makeFile(getWorkspaceRoot().getContainerForLocation(
targetPath), children[i].getName(), finStream);
} catch (CoreException e) {
- status = StatusUtils.errorStatus(
- NLS.bind(JbossWSCoreMessages.ERROR_COPY,
- new String[]{e.getLocalizedMessage()}), e);
+ status = StatusUtils.errorStatus(NLS.bind(
+ JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ .getLocalizedMessage() }), e);
}
} else {
try {
- IFolder temp = makeFolder(getWorkspaceRoot().getContainerForLocation(targetPath), children[i].getName());
- copy(sourcePath.append(children[i].getName()), temp.getLocation());
+ IFolder temp = makeFolder(getWorkspaceRoot()
+ .getContainerForLocation(targetPath), children[i]
+ .getName());
+ copy(sourcePath.append(children[i].getName()), temp
+ .getLocation());
} catch (CoreException e) {
- status = StatusUtils.errorStatus(
- NLS.bind(JbossWSCoreMessages.ERROR_COPY,
- new String[]{e.getLocalizedMessage()}), e);
+ status = StatusUtils.errorStatus(NLS.bind(
+ JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ .getLocalizedMessage() }), e);
}
}
}
@@ -208,4 +218,55 @@
}
}
+ public static IStatus addClassPath(IProject project) {
+ IStatus status = Status.OK_STATUS;
+ try {
+
+ IJavaProject javaProject = JavaCore.create(project);
+ IClasspathEntry newClasspath = JavaCore
+ .newContainerEntry(getJbossLibPath());
+
+ IClasspathEntry[] oldClasspathEntries = javaProject
+ .getRawClasspath();
+
+ boolean isFolderInClassPathAlready = false;
+ for (int i = 0; i < oldClasspathEntries.length
+ && !isFolderInClassPathAlready; i++) {
+ if (oldClasspathEntries[i].getPath().equals(
+ project.getFullPath())) {
+ isFolderInClassPathAlready = true;
+ break;
+ }
+ }
+
+ if (!isFolderInClassPathAlready) {
+
+ IClasspathEntry[] newClasspathEntries = new IClasspathEntry[oldClasspathEntries.length + 1];
+ for (int i = 0; i < oldClasspathEntries.length; i++) {
+ newClasspathEntries[i] = oldClasspathEntries[i];
+ }
+ newClasspathEntries[oldClasspathEntries.length] = newClasspath;
+
+ javaProject.setRawClasspath(newClasspathEntries,
+ new NullProgressMonitor());
+ }
+ } catch (JavaModelException e) {
+ status = StatusUtils.errorStatus(NLS.bind(
+ JbossWSCoreMessages.ERROR_COPY, new String[] { e
+ .getLocalizedMessage() }), e);
+ return status;
+ }
+
+ return status;
+ }
+
+ public static IPath getJbossLibPath() {
+ IPreferenceStore ps = JbossWSCorePlugin.getDefault()
+ .getPreferenceStore();
+ String runtimeLocation = ps.getString("jbosswsruntimelocation");
+
+ IPath libPath = new Path(runtimeLocation);
+ return libPath.append(JbossWSCoreMessages.DIR_LIB);
+ }
+
}
16 years, 10 months
JBoss Tools SVN: r7976 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core: src/org/jboos/tools/ws/creation/core/commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-05-05 05:28:52 -0400 (Mon, 05 May 2008)
New Revision: 7976
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/BindingFilesValidationCommand.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java
Log:
add binding files validation command
fix wsdl2java command to make it run with Windows OS
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-05-05 09:28:41 UTC (rev 7975)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-05-05 09:28:52 UTC (rev 7976)
@@ -17,7 +17,8 @@
org.eclipse.wst.command.env.core,
org.eclipse.wst.command.env,
org.eclipse.jst.ws.axis2.consumption.core,
- org.apache.ant
+ org.apache.ant,
+ org.apache.xerces
Eclipse-LazyStart: true
Export-Package: org.jboos.tools.ws.creation.core,
org.jboos.tools.ws.creation.core.commands,
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/BindingFilesValidationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/BindingFilesValidationCommand.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/BindingFilesValidationCommand.java 2008-05-05 09:28:52 UTC (rev 7976)
@@ -0,0 +1,63 @@
+package org.jboos.tools.ws.creation.core.commands;
+
+import java.io.IOException;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.jboos.tools.ws.creation.core.data.ServiceModel;
+import org.jboos.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+public class BindingFilesValidationCommand extends AbstractDataModelOperation{
+
+ private ServiceModel model;
+
+
+ public BindingFilesValidationCommand(ServiceModel model){
+ this.model = model;
+ }
+
+ @Override
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info)
+ throws ExecutionException {
+ IStatus status = Status.OK_STATUS;
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+
+ // Create the XMLReader to be used to check for errors.
+ XMLReader reader = null;
+ try {
+ SAXParser parser = spf.newSAXParser();
+ reader = parser.getXMLReader();
+ } catch (Exception e) {
+ //if no SAXParserFactory implementation is available, break this command
+ return Status.OK_STATUS;
+ }
+
+
+ // Use the XMLReader to parse the entire file.
+ try {
+ InputSource is = new InputSource("");
+ reader.parse(is);
+ } catch (SAXException e) {
+ /*status = StatusUtils.errorStatus(
+ JBossWSCreationCoreMessages
+ new String[]{e.getLocalizedMessage()}), e);*/
+ } catch (IOException e) {
+ System.err.println(e);
+ System.exit(1);
+ }
+ return null;
+ }
+
+
+}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-05-05 09:28:41 UTC (rev 7975)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-05-05 09:28:52 UTC (rev 7976)
@@ -6,6 +6,8 @@
import java.io.LineNumberReader;
import java.util.List;
+import javax.xml.parsers.SAXParserFactory;
+
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
@@ -35,29 +37,38 @@
String commandLocation = runtimeLocation + Path.SEPARATOR + "bin";
String command = "sh wsconsume.sh ";
if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0){
- command = "cmd wsconsume.bat";
+ command = "cmd.exe /c wsconsume.bat ";
}
String args = getCommandlineArgs();
command += " -k " + args + " " + model.getWsdlURI();
try {
-
- InputStreamReader ir = new InputStreamReader(Runtime.getRuntime().exec(command, null, new File(commandLocation)).getInputStream());
+ Runtime rt = Runtime.getRuntime();
+ Process proc = rt.exec(command, null, new File(commandLocation));
+ InputStreamReader ir = new InputStreamReader(proc.getErrorStream());
LineNumberReader input = new LineNumberReader(ir);
String str = input.readLine();
+ StringBuffer result = new StringBuffer();
while(str != null){
System.out.println(str);
+ result.append(str).append("\t\r");
str = input.readLine();
+
}
-
+ proc.waitFor();
+ System.out.print(result);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
-
+ SAXParserFactory spf = SAXParserFactory.newInstance();
refreshProject(model.getWebProjectName(), monitor);
+
return Status.OK_STATUS;
}
16 years, 10 months
JBoss Tools SVN: r7975 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-05-05 05:28:41 -0400 (Mon, 05 May 2008)
New Revision: 7975
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
Log:
add binding files validation command
fix wsdl2java command to make it run with Windows OS
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-05-04 08:37:01 UTC (rev 7974)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-05-05 09:28:41 UTC (rev 7975)
@@ -116,7 +116,7 @@
});
new Label(configCom, SWT.NONE);
- btnRemove = new Button(configCom, SWT.BORDER);
+ btnRemove = new Button(configCom, SWT.NONE);
btnRemove.setEnabled(false);
btnRemove.setText(JBossWSCreationCoreMessages.getString("LABEL_BUTTON_TEXT_REMOVE"));
btnRemove.addSelectionListener(new SelectionAdapter(){
16 years, 10 months
JBoss Tools SVN: r7974 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-05-04 04:37:01 -0400 (Sun, 04 May 2008)
New Revision: 7974
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2127 Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java 2008-05-03 19:01:06 UTC (rev 7973)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/BaseFieldEditor.java 2008-05-04 08:37:01 UTC (rev 7974)
@@ -13,14 +13,22 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.eclipse.core.runtime.Assert;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Widget;
import org.jboss.tools.seam.ui.SeamUIMessages;
/**
@@ -31,11 +39,13 @@
public abstract class BaseFieldEditor implements IFieldEditor {
PropertyChangeSupport pcs = new PropertyChangeSupport(this);
-
+
+ Set<DisposeListener> disposeListeners = new HashSet<DisposeListener>();
+
private Object value = new Object();
-
+
private String labelText = SeamUIMessages.BASE_FIELD_EDITOR_NO_LABEL;
-
+
private String nameText = null;
Label labelControl = null;
@@ -64,10 +74,18 @@
Assert.isTrue(parent instanceof Composite, SeamUIMessages.BASE_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE);
Assert.isTrue(((Composite)parent).getLayout() instanceof GridLayout,SeamUIMessages.BASE_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT);
Composite aComposite = (Composite) parent;
- getEditorControls(aComposite);
+ final Control[] controls = (Control[])getEditorControls(aComposite);
GridLayout gl = (GridLayout)((Composite)parent).getLayout();
doFillIntoGrid(aComposite,gl.numColumns);
+ if(controls.length>0) {
+ controls[0].addDisposeListener(new DisposeListener(){
+ public void widgetDisposed(DisposeEvent e) {
+ dispose();
+ controls[0].removeDisposeListener(this);
+ }
+ });
+ }
}
/**
@@ -84,7 +102,7 @@
public void addPropertyChangeListener(PropertyChangeListener listener) {
pcs.addPropertyChangeListener(listener);
}
-
+
/**
*
*/
@@ -219,9 +237,10 @@
public String getName() {
return nameText;
}
-
- /**
- *
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#dispose()
*/
public void dispose() {
PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners();
@@ -231,6 +250,34 @@
}
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#dispose(org.eclipse.swt.events.DisposeEvent)
+ */
+ public void dispose(DisposeEvent e) {
+ dispose();
+ for (DisposeListener disposeListener : disposeListeners) {
+ disposeListener.widgetDisposed(e);
+ }
+ disposeListeners.clear();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#addDisposeListener(org.eclipse.swt.events.DisposeListener)
+ */
+ public void addDisposeListener(DisposeListener listener) {
+ disposeListeners.add(listener);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#removeDisposeListener(org.eclipse.swt.events.DisposeListener)
+ */
+ public void removeDisposeListener(DisposeListener listener) {
+ disposeListeners.remove(listener);
+ }
+
/**
*
* @return
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2008-05-03 19:01:06 UTC (rev 7973)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2008-05-04 08:37:01 UTC (rev 7974)
@@ -16,6 +16,9 @@
import java.util.List;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.jboss.tools.seam.ui.widget.field.ComboBoxField;
@@ -47,6 +50,13 @@
if(comboField == null) {
comboField = new ComboBoxField(composite,values,getValue(),editable);
comboField.addPropertyChangeListener(this);
+ final Combo combo =comboField.getComboControl();
+ combo.addDisposeListener(new DisposeListener(){
+ public void widgetDisposed(DisposeEvent e) {
+ dispose(e);
+ combo.removeDisposeListener(this);
+ }
+ });
} else if(composite!=null) {
Assert.isTrue(comboField.getControl().getParent()==composite);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2008-05-03 19:01:06 UTC (rev 7973)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/CompositeEditor.java 2008-05-04 08:37:01 UTC (rev 7974)
@@ -19,6 +19,8 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
@@ -44,9 +46,9 @@
SeamUIMessages.COMPOSITE_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT);
Composite aComposite = (Composite) parent;
- Control[] controls = (Control[]) getEditorControls(aComposite);
+ final Control[] controls = (Control[]) getEditorControls(aComposite);
GridLayout gl = (GridLayout) ((Composite) parent).getLayout();
-
+
for (int i = 0; i < controls.length; i++) {
GridData gd = new GridData();
gd.horizontalSpan = i == 1 ? gl.numColumns - controls.length + 1 : 1;
@@ -59,7 +61,16 @@
controls[i].setLayoutData(gd);
controls[i].setEnabled(isEnabled());
- }
+
+ if(i==0) {
+ controls[i].addDisposeListener(new DisposeListener(){
+ public void widgetDisposed(DisposeEvent e) {
+ dispose();
+ controls[0].removeDisposeListener(this);
+ }
+ });
+ }
+ }
}
List<Control> controls = new ArrayList<Control>();
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java 2008-05-03 19:01:06 UTC (rev 7973)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditor.java 2008-05-04 08:37:01 UTC (rev 7974)
@@ -12,6 +12,10 @@
import java.beans.PropertyChangeListener;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Listener;
+
public interface IFieldEditor extends INamedElement {
/**
@@ -48,6 +52,18 @@
*
* @param listener
*/
+ public void addDisposeListener(DisposeListener listener);
+
+ /**
+ *
+ * @param listener
+ */
+ public void removeDisposeListener(DisposeListener listener);
+
+ /**
+ *
+ * @param listener
+ */
public void removePropertyChangeListener(PropertyChangeListener listener);
/**
@@ -85,6 +101,11 @@
*/
public void dispose();
+ /**
+ *
+ * @param e
+ */
+ public void dispose(DisposeEvent e);
/**
* Sets the application defined property of this editor
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-05-03 19:01:06 UTC (rev 7973)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-05-04 08:37:01 UTC (rev 7974)
@@ -26,6 +26,8 @@
import org.eclipse.datatools.connectivity.internal.ui.wizards.NewCPWizardCategoryFilter;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.internal.dialogs.PropertyDialog;
import org.hibernate.console.ConsoleConfiguration;
@@ -40,6 +42,7 @@
import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor;
+import org.jboss.tools.seam.ui.widget.editor.ComboFieldEditor;
import org.jboss.tools.seam.ui.widget.editor.CompositeEditor;
import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
@@ -197,7 +200,7 @@
* @param canBeEmpty
* @return
*/
- public static IFieldEditor createConnectionProfileSelectionFieldEditor(Object defaultValue, IValidator validator, boolean canBeEmpty) {
+ public static IFieldEditor createConnectionProfileSelectionFieldEditor(Object defaultValue, IValidator validator, final boolean canBeEmpty) {
EditConnectionProfileAction editAction = new EditConnectionProfileAction(validator);
NewConnectionProfileAction newAction = new NewConnectionProfileAction(validator);
List<String> profiles = getConnectionProfileNameList();
@@ -224,6 +227,34 @@
}
});
}
+ final ComboFieldEditor comboEditor = ((ComboFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(1));
+ final IProfileListener profileListener = new IProfileListener() {
+ private void update() {
+ List<String> profiles = getConnectionProfileNameList();
+ if(canBeEmpty) {
+ profiles.add(0, "");
+ }
+ comboEditor.setTags((profiles.toArray(new String[0])));
+ }
+
+ public void profileAdded(IConnectionProfile profile) {
+ update();
+ }
+
+ public void profileChanged(IConnectionProfile profile) {
+ update();
+ }
+
+ public void profileDeleted(IConnectionProfile profile) {
+ update();
+ }
+ };
+ ProfileManager.getInstance().addProfileListener(profileListener);
+ comboEditor.addDisposeListener(new DisposeListener(){
+ public void widgetDisposed(DisposeEvent e) {
+ ProfileManager.getInstance().removeProfileListener(profileListener);
+ }
+ });
return connProfileSelEditor;
}
16 years, 10 months
JBoss Tools SVN: r7973 - trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-05-03 15:01:06 -0400 (Sat, 03 May 2008)
New Revision: 7973
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1862
roll back to ejb after talk with marshall
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2008-05-03 18:57:26 UTC (rev 7972)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2008-05-03 19:01:06 UTC (rev 7973)
@@ -18,7 +18,7 @@
</module>
<module>
- <java>jboss-seam.jar</java>
+ <ejb>jboss-seam.jar</ejb>
</module>
</application>
16 years, 10 months
JBoss Tools SVN: r7972 - branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-05-03 14:57:26 -0400 (Sat, 03 May 2008)
New Revision: 7972
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1862
roll back to ejb after talk with marshall
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2008-05-03 16:31:35 UTC (rev 7971)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2008-05-03 18:57:26 UTC (rev 7972)
@@ -18,7 +18,7 @@
</module>
<module>
- <java>jboss-seam.jar</java>
+ <ejb>jboss-seam.jar</ejb>
</module>
</application>
16 years, 10 months
JBoss Tools SVN: r7971 - branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-05-03 12:31:35 -0400 (Sat, 03 May 2008)
New Revision: 7971
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1862
application.xml changed in for seam 1.2 EAR projects. jboss-seam.jar now declared as java module.
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2008-05-03 16:30:07 UTC (rev 7970)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.core/templates/ear/EarContent/META-INF/application.xml 2008-05-03 16:31:35 UTC (rev 7971)
@@ -18,7 +18,7 @@
</module>
<module>
- <ejb>jboss-seam.jar</ejb>
+ <java>jboss-seam.jar</java>
</module>
</application>
16 years, 10 months