JBoss Tools SVN: r7673 - trunk/ws/plugins/org.jboss.tools.ws.core/bin/org/jboss/tools/ws/core.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-22 02:07:36 -0400 (Tue, 22 Apr 2008)
New Revision: 7673
Removed:
trunk/ws/plugins/org.jboss.tools.ws.core/bin/org/jboss/tools/ws/core/Activator.class
Log:
Deleted: trunk/ws/plugins/org.jboss.tools.ws.core/bin/org/jboss/tools/ws/core/Activator.class
===================================================================
(Binary files differ)
16 years, 6 months
JBoss Tools SVN: r7672 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-04-22 01:26:00 -0400 (Tue, 22 Apr 2008)
New Revision: 7672
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java
Log:
create a wizard page for configuring code generation properties
add command classes for code generation
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java 2008-04-22 05:26:00 UTC (rev 7672)
@@ -0,0 +1,72 @@
+package org.jboss.tools.ws.creation.ui.wsrt;
+
+import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
+import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
+import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
+import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
+import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
+import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
+import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
+import org.jboos.tools.ws.creation.core.commands.InitialCommnad;
+import org.jboos.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.ui.widgets.CodeGenConfigWidget;
+
+public class JBossWSConfigWidgetFactory implements INamedWidgetContributorFactory {
+
+ private SimpleWidgetContributor servicesXMLSelectWidgetContrib;
+ private ServiceModel model;
+
+ public JBossWSConfigWidgetFactory(){
+ }
+
+ public INamedWidgetContributor getFirstNamedWidget(){
+ if( servicesXMLSelectWidgetContrib == null ) init();
+ return servicesXMLSelectWidgetContrib;
+ }
+
+ public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor){
+ if( servicesXMLSelectWidgetContrib == null ) init();
+ INamedWidgetContributor nextWidgetContrib = null;
+ return nextWidgetContrib;
+ }
+
+ public void registerDataMappings(DataMappingRegistry dataRegistry)
+ {
+ // Map the data model from the defaulting command to this widget factory.
+ // The framework will actually to the call to getWebServiceDataModel in
+ // the ExampleDefaultingCommand class and then call the setWebServiceDataModel
+ // method in this class.
+ dataRegistry.addMapping( InitialCommnad.class,
+ "WebServiceDataModel", //$NON-NLS-1$
+ JBossWSConfigWidgetFactory.class );
+ }
+
+ public void setWebServiceDataModel( ServiceModel model ){
+ this.model = model;
+ }
+
+ private void init(){
+ //Pages of Axis2 Web Services Java Bean Scenario
+ CodeGenConfigWidget servicesXMLSelectWidget =
+ new CodeGenConfigWidget(model);
+ servicesXMLSelectWidgetContrib = createWidgetContributor(
+ "JBoss Web Service Code Generation Configuration",
+ "Please input the appropriate option for the code generation",
+ servicesXMLSelectWidget );
+ }
+
+ private SimpleWidgetContributor createWidgetContributor(String title,
+ String description,
+ final WidgetDataContributor contributor){
+ SimpleWidgetContributor widgetContrib = new SimpleWidgetContributor();
+ widgetContrib.setTitle(title);
+ widgetContrib.setDescription(description);
+ widgetContrib.setFactory( new WidgetContributorFactory(){
+ public WidgetContributor create(){
+ return contributor;
+ }
+ });
+ return widgetContrib;
+ }
+
+}
16 years, 6 months
JBoss Tools SVN: r7671 - in trunk/ws/plugins: org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-04-22 01:22:37 -0400 (Tue, 22 Apr 2008)
New Revision: 7671
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils/
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils/JBossWSCreationUtils.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.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/InitialCommnad.java
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/data/ServiceModel.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
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/JBossWebServiceRuntime.java
Log:
create a wizard page for configuring code generation properties
add command classes for code generation
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-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-04-22 05:22:37 UTC (rev 7671)
@@ -8,7 +8,10 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.wst.common.frameworks,
- org.eclipse.wst.ws
+ org.eclipse.wst.ws,
+ org.jboss.tools.ws.ui,
+ org.eclipse.core.resources,
+ org.eclipse.jst.ws
Eclipse-LazyStart: true
Export-Package: org.jboos.tools.ws.creation.core,
org.jboos.tools.ws.creation.core.commands,
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/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-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/InitialCommnad.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -4,6 +4,7 @@
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.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
@@ -25,9 +26,9 @@
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
+ model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
-
- return null;
+ return Status.OK_STATUS;
}
}
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-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -1,16 +1,28 @@
package org.jboos.tools.ws.creation.core.commands;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
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.jface.preference.PreferenceStore;
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;
public class WSDL2JavaCommnad extends AbstractDataModelOperation{
private ServiceModel model;
+
public WSDL2JavaCommnad(ServiceModel model){
this.model = model;
}
@@ -19,7 +31,64 @@
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- return null;
+ PreferenceStore prs = new PreferenceStore("jbosswsui.properties");
+ try {
+ prs.load();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ String runtimeLocation = prs.getString("jbosswsruntimelocation");//JBossWSUIPlugin.getDefault().getPreferenceStore().getString("jbosswsruntimelocation");
+ String binLocation = runtimeLocation + "bin";
+
+ String commandLine = binLocation + Path.SEPARATOR + "wsconsume.sh";
+
+ String args = getCommandlineArgs();
+
+ commandLine = commandLine + " -k -o " + args + " " + model.getWsdlURI();
+ commandLine = "sh " + commandLine;
+
+
+
+ try {
+
+ InputStreamReader ir = new InputStreamReader(Runtime.getRuntime().exec(commandLine).getInputStream());
+ LineNumberReader input = new LineNumberReader(ir);
+
+ String str = "";
+ for (int i = 1; str != null; i++)
+ {
+ str = input.readLine();
+ System.out.println(str);
+ }
+
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ refreshProject(model.getWebProjectName());
+
+ return Status.OK_STATUS;
}
+
+ private void refreshProject(String project){
+ try {
+ JBossWSCreationUtils.getProjectByName(project).refreshLocal(2, new NullProgressMonitor());
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ private String getCommandlineArgs(){
+ String project = model.getWebProjectName();
+ String projectRoot = JBossWSCreationUtils.getProjectRoot(project).toOSString();
+ String targetSrc = projectRoot + Path.SEPARATOR + "src";
+
+ return targetSrc;
+
+ }
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/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-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -9,7 +9,9 @@
private String portName;
private String serviceName;
private String packageText;
+ private String bindingFileLocation;
+
public String getPackageText() {
return packageText;
}
@@ -47,4 +49,11 @@
public void setWebProjectName(String webProjectName) {
this.webProjectName = webProjectName;
}
+
+ public String getBindingFileLocation(){
+ return this.bindingFileLocation;
+ }
+ public void setBindingFileLcation(String bindingFileLocation){
+ this.bindingFileLocation = bindingFileLocation;
+ }
}
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/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 (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -0,0 +1,122 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jst.ws.internal.common.J2EEUtils;
+
+public class JBossWSCreationUtils {
+
+ public static IPath getWorkspace(){
+ return ResourcesPlugin.getWorkspace().getRoot().getLocation();
+ }
+
+ public static IProject getProjectByName(String project){
+ String projectString = replaceEscapecharactors(project);
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(
+ getProjectNameFromFramewokNameString(projectString));
+ }
+
+ public static IPath getProjectRoot(String project){
+ String projectString = replaceEscapecharactors(project);
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(
+ getProjectNameFromFramewokNameString(projectString)).getLocation();
+ }
+
+ public static String pathToWebProjectContainer(String project) {
+ IPath projectRoot = getProjectRoot(project);
+ IPath currentDynamicWebProjectDir = J2EEUtils.getWebContentPath(
+ getProjectByName(project));
+ IPath currentDynamicWebProjectDirWithoutProjectRoot = J2EEUtils.getWebContentPath(
+ getProjectByName(project)).removeFirstSegments(1).makeAbsolute();
+ if(projectRoot.toOSString().contains(getWorkspace().toOSString())){
+ return getWorkspace()
+ .append(currentDynamicWebProjectDir).toOSString();
+ }else{
+ return projectRoot
+ .append(currentDynamicWebProjectDirWithoutProjectRoot).toOSString();
+ }
+
+ }
+
+ public static String pathToWebProjectContainerWEBINF(String project) {
+ IPath projectRoot = getProjectRoot(project);
+ IPath webContainerWEBINFDir = J2EEUtils.getWebInfPath(
+ getProjectByName(project));
+ IPath webContainerWEBINFDirWithoutProjectRoot = J2EEUtils.getWebInfPath(
+ getProjectByName(project)).removeFirstSegments(1).makeAbsolute();
+ if(projectRoot.toOSString().contains(getWorkspace().toOSString())){
+ return getWorkspace()
+ .append(webContainerWEBINFDir).toOSString();
+ }else{
+ return projectRoot
+ .append(webContainerWEBINFDirWithoutProjectRoot).toOSString();
+ }
+ }
+
+
+ //Fix for the windows build not working
+ private static String replaceEscapecharactors(String vulnarableString){
+ if (vulnarableString.indexOf("/")!=-1){
+ vulnarableString = vulnarableString.replace('/', File.separator.charAt(0));
+ }
+ return vulnarableString;
+ }
+
+
+ private static String getProjectNameFromFramewokNameString(String frameworkProjectString){
+ if (frameworkProjectString.indexOf(getSplitCharactor())== -1){
+ return frameworkProjectString;
+ }else{
+ return frameworkProjectString.split(getSplitCharactors())[1];
+ }
+ }
+
+
+ private static String getSplitCharactor(){
+ //Windows check (because from inside wtp in return I received a hard coded path)
+ if (File.separatorChar == '\\'){
+ return "\\" ;
+ }else{
+ return File.separator;
+ }
+ }
+
+
+ private static String getSplitCharactors(){
+ //Windows check (because from inside wtp in return I received a hard coded path)
+ if (File.separatorChar == '\\'){
+ return "\\" + File.separator;
+ }else{
+ return File.separator;
+ }
+ }
+
+
+
+
+
+}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2008-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2008-04-22 05:22:37 UTC (rev 7671)
@@ -18,10 +18,6 @@
org.eclipse.jst.ws,
org.eclipse.wst.command.env,
org.eclipse.jdt.core,
- org.eclipse.jst.ws.axis2.creation.core,
- org.eclipse.jst.ws.axis2.consumption.ui,
- org.eclipse.jst.ws.axis2.consumption.core,
- org.eclipse.jst.ws.axis2.core,
org.eclipse.jst.ws.ui,
org.jboos.tools.ws.creation.core
Eclipse-LazyStart: true
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-22 05:22:37 UTC (rev 7671)
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
-<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="BeanExampleConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.axis2.creation.core.command.Axis2BUCommand"
- class="org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt.Axis2BeanConfigWidgetFactory"/>
- </extension>
+ <extension
+ point="org.eclipse.wst.command.env.ui.widgetRegistry">
+ <widgetFactory
+ class="org.jboss.tools.ws.creation.ui.wsrt.JBossWSConfigWidgetFactory"
+ id="JBossWSWSDL2JavaConfig"
+ insertBeforeCommandId="org.jboos.tools.ws.creation.core.commands.WSDL2JavaCommnad">
+ </widgetFactory>
+ </extension>
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="SkelExampleConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.axis2.creation.core.command.Axis2TDCommand"
- class="org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt.Axis2SkelConfigWidgetFactory" />
- </extension>
-
<extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
<runtime
id="org.jboss.tools.ws.creation.jbossWebServiceRT"
@@ -33,8 +28,8 @@
topDown="true"
class="org.jboss.tools.ws.creation.ui.wsrt.JBossWebServiceRuntime">
- <!--required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
- <required-facet-versiond facet="jbossws.core" version="1.0" allow-newer="true" />
+ <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
+ <!--required-facet-versiond facet="jbossws.core" version="1.0" allow-newer="true" />
<required-facet-version facet="jbossws.ext" version="1.0" allow-newer="true" / -->
</serviceRuntime>
Added: 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 (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -0,0 +1,65 @@
+package org.jboss.tools.ws.creation.ui.widgets;
+
+
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
+import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
+import org.jboos.tools.ws.creation.core.data.ServiceModel;
+
+public class CodeGenConfigWidget extends SimpleWidgetDataContributor {
+
+ private ServiceModel model;
+
+ public CodeGenConfigWidget(ServiceModel model){
+ this.model = model;
+ }
+
+ public WidgetDataEvents addControls( Composite parent, Listener statusListener){
+
+ Composite configCom = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout(2, false);
+ configCom.setLayout(layout);
+ configCom.setLayoutData(new GridData(GridData.FILL_BOTH));
+ Label lblCustomPakage = new Label(configCom, SWT.NONE);
+ lblCustomPakage.setText("Custom package name:");
+ final Text txtCustomPkgName = new Text(configCom, SWT.NONE);
+ txtCustomPkgName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ txtCustomPkgName.addModifyListener(new ModifyListener(){
+
+ public void modifyText(ModifyEvent e) {
+ model.setPackageText(txtCustomPkgName.getText());
+ }});
+
+ new Label(configCom, SWT.NONE).setText("Binding file:");
+ Composite fileSelection = new Composite(configCom, SWT.NONE);
+ fileSelection.setLayout(new GridLayout(2, false));
+ fileSelection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ final Text txtFiles = new Text(fileSelection, SWT.NONE);
+ txtFiles.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ Button btnSelect = new Button(fileSelection, SWT.NONE);
+ btnSelect.setText("...");
+ btnSelect.addSelectionListener(new SelectionAdapter(){
+ public void widgetSelected(SelectionEvent e) {
+ String fileLocation = new FileDialog(Display.getCurrent().getActiveShell(), SWT.NONE).open();
+ txtFiles.setText(fileLocation);
+ model.setBindingFileLcation(fileLocation);
+ }
+ });
+
+ return this;
+ }
+}
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-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -11,6 +11,7 @@
import org.eclipse.wst.ws.internal.wsrt.ISelection;
import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
+import org.jboos.tools.ws.creation.core.commands.InitialCommnad;
import org.jboos.tools.ws.creation.core.commands.WSDL2JavaCommnad;
import org.jboos.tools.ws.creation.core.data.ServiceModel;
@@ -40,7 +41,9 @@
Vector commands = new Vector();
ServiceModel model = new ServiceModel();
- if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
+ model.setWebProjectName(project);
+ if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
+ commands.add(new InitialCommnad(model, this, WebServiceScenario.TOPDOWN));
commands.add(new WSDL2JavaCommnad(model));
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceRuntime.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceRuntime.java 2008-04-22 00:25:33 UTC (rev 7670)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebServiceRuntime.java 2008-04-22 05:22:37 UTC (rev 7671)
@@ -10,7 +10,7 @@
@Override
public IWebService getWebService(WebServiceInfo info) {
- return null;
+ return new JBossWebService(info);
}
@Override
16 years, 6 months
JBoss Tools SVN: r7670 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 20:25:33 -0400 (Mon, 21 Apr 2008)
New Revision: 7670
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java
Log:
JBIDE-1891 - getHost() wasn't checking for overrides in the launch configuration
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2008-04-21 22:03:43 UTC (rev 7669)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2008-04-22 00:25:33 UTC (rev 7670)
@@ -28,6 +28,7 @@
import java.util.Properties;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
@@ -112,14 +113,18 @@
}
public static Properties getDefaultProperties(IServer server) {
- int port = ServerConverter.getJBossServer(server).getJNDIPort();
+ JBossServer jbs = ServerConverter.getJBossServer(server);
Properties props = new Properties();
- props.put("java.naming.factory.initial",
- "org.jnp.interfaces.NamingContextFactory");
- props.put("java.naming.factory.url.pkgs",
- "org.jboss.naming:org.jnp.interfaces");
- props.put("java.naming.provider.url", "jnp://" + server.getHost() + ":"
- + port);
+ if( jbs != null ) {
+
+ int port = jbs.getJNDIPort();
+ props.put("java.naming.factory.initial",
+ "org.jnp.interfaces.NamingContextFactory");
+ props.put("java.naming.factory.url.pkgs",
+ "org.jboss.naming:org.jnp.interfaces");
+ props.put("java.naming.provider.url", "jnp://" + jbs.getHost() + ":"
+ + port);
+ }
return props;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-21 22:03:43 UTC (rev 7669)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-22 00:25:33 UTC (rev 7670)
@@ -57,6 +57,26 @@
public JBossServer() {
}
+ public String getHost() {
+ return getHost(true);
+ }
+
+ public String getHost(boolean checkLaunchConfig) {
+ String host = getServer().getHost();
+ if( checkLaunchConfig ) {
+ try {
+ Server s = (Server)getServer();
+ ILaunchConfiguration lc = s.getLaunchConfiguration(true, new NullProgressMonitor());
+ String startArgs = lc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
+ String val = ArgsUtil.getValue(startArgs, "-b", "--host");
+ if( val != null )
+ host = val;
+ } catch( CoreException ce ) {
+ }
+ }
+ return host;
+ }
+
public String getConfigDirectory() {
return getConfigDirectory(true);
}
@@ -156,7 +176,7 @@
return null;
IWebModule webModule =(IWebModule)module.loadAdapter(IWebModule.class,null);
- String host = getServer().getHost();
+ String host = getHost();
String url = "http://"+host; //$NON-NLS-1$
int port = getJBossWebPort();
if (port != 80)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2008-04-21 22:03:43 UTC (rev 7669)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2008-04-22 00:25:33 UTC (rev 7670)
@@ -100,7 +100,7 @@
public static String getDefaultArgs(JBossServer jbs) throws CoreException {
String args = "-S ";
- args += "-s " + jbs.getServer().getHost() + ":" + jbs.getJNDIPort() + " ";
+ args += "-s " + jbs.getHost() + ":" + jbs.getJNDIPort() + " ";
if( jbs.getUsername() != null && !jbs.getUsername().equals(""))
args += "-u " + jbs.getUsername() + " ";
if( jbs.getPassword() != null && !jbs.getUsername().equals(""))
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2008-04-21 22:03:43 UTC (rev 7669)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/TwiddleLaunchConfiguration.java 2008-04-22 00:25:33 UTC (rev 7670)
@@ -78,7 +78,7 @@
public static String getDefaultArgs(IServer server) throws CoreException {
JBossServer jbs = findJBossServer(server.getId());
- String twiddleArgs = "-s " + jbs.getServer().getHost() + ":"
+ String twiddleArgs = "-s " + jbs.getHost() + ":"
+ jbs.getJNDIPort() + " -a jmx/rmi/RMIAdaptor ";
if( jbs.getUsername() != null )
twiddleArgs += "-u " + jbs.getUsername() + " ";
16 years, 6 months
JBoss Tools SVN: r7669 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 18:03:43 -0400 (Mon, 21 Apr 2008)
New Revision: 7669
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
Log:
JBIDE-2048 - deploy logic consolidated
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-21 21:55:01 UTC (rev 7668)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-04-21 22:03:43 UTC (rev 7669)
@@ -34,7 +34,6 @@
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.model.IURLProvider;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
@@ -57,14 +56,6 @@
public JBossServer() {
}
-
- public ServerAttributeHelper getAttributeHelper() {
- IServerWorkingCopy copy = getServerWorkingCopy();
- if( copy == null ) {
- copy = getServer().createWorkingCopy();
- }
- return new ServerAttributeHelper(getServer(), copy);
- }
public String getConfigDirectory() {
return getConfigDirectory(true);
@@ -86,11 +77,11 @@
}
public String getDeployDirectory() {
- String folder = getAttributeHelper().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, (String)null);
+ String folder = super.getDeployDirectory();
return folder != null ? folder : getDeployDirectory(true);
}
- public String getDeployDirectory(boolean checkLaunchConfig) {
+ protected String getDeployDirectory(boolean checkLaunchConfig) {
return new Path(getConfigDirectory(checkLaunchConfig) + Path.SEPARATOR + DEPLOY).toOSString();
}
16 years, 6 months
JBoss Tools SVN: r7668 - trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 17:55:01 -0400 (Mon, 21 Apr 2008)
New Revision: 7668
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java
Log:
JBIDE-2094 - show excludes
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-04-21 21:52:17 UTC (rev 7667)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-04-21 21:55:01 UTC (rev 7668)
@@ -106,9 +106,10 @@
boolean inWorkspace = fileset.isInWorkspace();
String text = "";
- if (fileset.getIncludesPattern() != null)
- text += fileset.getIncludesPattern() + ": ";
-
+ // +[includes] [excludes] : /path/to/root
+ text += "+[" + fileset.getIncludesPattern() + "] ";
+ text += "-[" + fileset.getExcludesPattern() + "] : ";
+
if (showFullPath) {
text += fileset.getGlobalSourcePath().toString();
} else if( inWorkspace ){
16 years, 6 months
JBoss Tools SVN: r7667 - trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 17:52:17 -0400 (Mon, 21 Apr 2008)
New Revision: 7667
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java
Log:
JBIDE-943 - flatten
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java 2008-04-21 21:48:47 UTC (rev 7666)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java 2008-04-21 21:52:17 UTC (rev 7667)
@@ -58,6 +58,7 @@
private void fillFilesetFromPage (IArchiveFileSet fileset) {
fileset.setExcludesPattern(page1.getExcludes());
fileset.setIncludesPattern(page1.getIncludes());
+ fileset.setFlattened(page1.getFlatten());
if( page1.isRootDirWorkspaceRelative()) {
fileset.setSourcePath(new Path(page1.getWorkspaceRelativeRootDir()));
fileset.setInWorkspace(true);
16 years, 6 months
JBoss Tools SVN: r7666 - trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 17:48:47 -0400 (Mon, 21 Apr 2008)
New Revision: 7666
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-943 - flatten
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-04-21 21:40:53 UTC (rev 7665)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-04-21 21:48:47 UTC (rev 7666)
@@ -1,5 +1,7 @@
package org.jboss.ide.eclipse.archives.ui.wizards.pages;
+import java.util.ArrayList;
+
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -56,9 +58,12 @@
private Composite mainComposite;
private Text rootDirText;
- private Label rootProjectLabel;
+ private Label rootProjectLabel, flattenedLabel;
private Button rootDirWorkspaceBrowseButton;
private Button rootDirFilesystemBrowseButton;
+ private Button flattenedYes;
+ private Button flattenedNo;
+ private boolean flattened;
public FilesetInfoWizardPage (Shell parent, IArchiveFileSet fileset, IArchiveNode parentNode) {
super(ArchivesUIMessages.FilesetInfoWizardPage_new_title, ArchivesUIMessages.FilesetInfoWizardPage_new_title, null);
@@ -122,8 +127,10 @@
private Group createPreviewGroup(Composite mainComposite, Group info) {
Group previewGroup = new Group(mainComposite, SWT.NONE);
- previewGroup.setLayoutData(createFormData(info,5,info,300,0,5,100,-5));
+ previewGroup.setLayoutData(createFormData(info,5,100,-5,0,5,100,-5));
previewGroup.setLayout(new FormLayout());
+ Label invisibleLabel = new Label(previewGroup, SWT.NONE);
+ invisibleLabel.setLayoutData(createFormData(0,0,0,200,0,0,0,1));
previewComposite = new FilesetPreviewComposite(previewGroup, SWT.NONE);
previewComposite.setLayoutData(createFormData(0,0,100,0,0,0,100,0));
previewGroup.setText(ArchivesUIMessages.FilesetInfoWizardPage_previewGroup_label);
@@ -180,7 +187,13 @@
rootDirectoryLabel.setLayoutData(createFormData(rootProjectVal,10,null,0,null,5,0,max));
rootDirValue.setLayoutData(createFormData(rootProjectVal,5,null,0,rootDirectoryLabel,5,100,-5));
-
+ flattenedLabel = new Label(infoGroup, SWT.NONE);
+ flattenedYes = new Button(infoGroup, SWT.RADIO);
+ flattenedNo = new Button(infoGroup, SWT.RADIO);
+ flattenedLabel.setLayoutData(createFormData(rootDirValue,5,null,0,null,0,rootDirValue,-5));
+ flattenedYes.setLayoutData(createFormData(rootDirValue, 5, null,0,flattenedLabel,5,null,0));
+ flattenedNo.setLayoutData(createFormData(rootDirValue, 5, null,0,flattenedYes,5,null,0));
+
// includes composite and it's internals
Composite includesKey = new Composite(infoGroup, SWT.NONE);
includesKey.setLayout(new FormLayout());
@@ -190,8 +203,8 @@
includesImage.setLayoutData(createFormData(0,0,null,0,0,0,null,0));
includesTextLabel.setLayoutData(createFormData(0,0,null,0,includesImage,5,null,0));
- includesKey.setLayoutData(createFormData(rootDirValue,5,null,0,null,5,0,max));
- includesText.setLayoutData(createFormData(rootDirValue,5,null,0,includesKey,10,100,-5));
+ includesKey.setLayoutData(createFormData(flattenedLabel,5,null,0,null,5,0,max));
+ includesText.setLayoutData(createFormData(flattenedLabel,5,null,0,includesKey,10,100,-5));
// excludes composite and it's internals
@@ -204,7 +217,7 @@
excludesTextLabel.setLayoutData(createFormData(0,0,null,0,excludesImage,5,null,0));
excludesKey.setLayoutData(createFormData(includesText,5,null,0,null,5,0,max));
- excludesText.setLayoutData(createFormData(includesText,5,null,0,excludesKey,10,100,-5));
+ excludesText.setLayoutData(createFormData(includesText,5,100,-5,excludesKey,10,100,-5));
// customize widgets
destinationKey.setText(ArchivesUIMessages.FilesetInfoWizardPage_destination_label);
@@ -220,10 +233,13 @@
excludesTextLabel.setText(ArchivesUIMessages.FilesetInfoWizardPage_excludes_label);
rootDirText.setEnabled(false);
+ flattenedLabel.setText("Flatten?");
+ flattenedYes.setText("Yes");
+ flattenedNo.setText("No");
+
return infoGroup;
}
-
private void addListeners ()
{
includesText.addModifyListener(new ModifyListener () {
@@ -252,7 +268,15 @@
browseFilesystemForRootDir();
}
});
-
+
+ SelectionAdapter flattenAdapter = new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ flattened = flattenedYes.getSelection();
+ changePreview();
+ }
+ };
+ flattenedYes.addSelectionListener(flattenAdapter);
+ flattenedNo.addSelectionListener(flattenAdapter);
}
public IArchiveNode getRootNode () {
@@ -267,6 +291,10 @@
return excludes;
}
+ public boolean getFlatten() {
+ return flattened;
+ }
+
public String getAbsoluteRootDir () {
return rootDir.toOSString();
}
@@ -296,21 +324,36 @@
rootDirIsWorkspaceRelative = fileset.isInWorkspace();
rootDirText.setText(rootDir.toString());
}
+
+ flattened = fileset.isFlattened();
+ flattenedYes.setSelection(flattened);
+ flattenedNo.setSelection(!flattened);
+
} else {
- IProject[] project = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for( int i = 0; i < project.length; i++ )
- if( project[i].getLocation().equals(parentNode.getProjectPath()))
- rootProjectLabel.setText(project[i].getName());
rootDirIsWorkspaceRelative = true;
rootDir = parentNode.getProjectPath();
workspaceRelativeRootDir = "";
}
+ IProject[] project = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ for( int i = 0; i < project.length; i++ )
+ if( project[i].getLocation().equals(parentNode.getProjectPath()))
+ rootProjectLabel.setText(project[i].getName());
+
}
private void changePreview() {
- IPath root = rootDir;
- IPath paths[] = ArchivesModelCore.findMatchingPaths(root, includesText.getText(), excludesText.getText());
- previewComposite.setInput(paths);
+ IPath inputFiles[] = ArchivesModelCore.findMatchingPaths(rootDir, includes, excludes);
+ IPath filesetRelative;
+ ArrayList<IPath> list = new ArrayList<IPath>();
+ for( int i = 0; i < inputFiles.length; i++ ) {
+ if( flattened )
+ filesetRelative = new Path(inputFiles[i].lastSegment());
+ else
+ filesetRelative = inputFiles[i];
+ if( !list.contains(filesetRelative))
+ list.add(filesetRelative);
+ }
+ previewComposite.setInput(list.toArray());
}
16 years, 6 months
JBoss Tools SVN: r7665 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 17:40:53 -0400 (Mon, 21 Apr 2008)
New Revision: 7665
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-2097 - default server name
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-04-21 21:24:19 UTC (rev 7664)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2008-04-21 21:40:53 UTC (rev 7665)
@@ -166,7 +166,7 @@
else if( name.endsWith(org.jboss.ide.eclipse.as.core.Messages.runtime))
base = name.substring(0, name.indexOf(org.jboss.ide.eclipse.as.core.Messages.runtime)) + org.jboss.ide.eclipse.as.core.Messages.server;
else
- base = name + " " + Messages.wf_Server;
+ base = name + " " + org.jboss.ide.eclipse.as.core.Messages.server;
if( findServer(base) == null ) return base;
int i = 1;
16 years, 6 months
JBoss Tools SVN: r7664 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: providers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-21 17:24:19 -0400 (Mon, 21 Apr 2008)
New Revision: 7664
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java
Log:
Absolutely 100% safe changes that prepare for JBIDE-476 that were already changed in my workspace
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-04-21 21:15:45 UTC (rev 7663)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-04-21 21:24:19 UTC (rev 7664)
@@ -45,6 +45,7 @@
public static String ProjectPackagesView_createPackagesMessage;
public static String ProjectPackagesView_newFolderAction_label;
public static String ProjectPackagesView_newFilesetAction_label;
+ public static String ProjectPackagesView_newActionAction_label;
public static String ProjectPackagesView_collapseAllAction_label;
public static String ProjectPackagesView_deletePackageAction_label;
public static String ProjectPackagesView_editPackageAction_label;
@@ -53,6 +54,8 @@
public static String ProjectPackagesView_deleteFolderAction_label;
public static String ProjectPackagesView_editFilesetAction_label;
public static String ProjectPackagesView_deleteFilesetAction_label;
+ public static String ProjectPackagesView_editActionAction_label;
+ public static String ProjectPackagesView_deleteActionAction_label;
public static String ProjectPackagesView_buildArchiveAction_label;
public static String ProjectPackagesView_buildProjectAction_label;
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-04-21 21:15:45 UTC (rev 7663)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-04-21 21:24:19 UTC (rev 7664)
@@ -4,13 +4,16 @@
ProjectPackagesView_newPackageMenu_label=New Archive
ProjectPackagesView_newFolderAction_label=New Folder
ProjectPackagesView_newFilesetAction_label=New Fileset
+ProjectPackagesView_newActionAction_label=New Action
ProjectPackagesView_collapseAllAction_label=Collapse All
ProjectPackagesView_deletePackageAction_label=Delete Archive
ProjectPackagesView_deleteFilesetAction_label=Delete Fileset
ProjectPackagesView_deleteFolderAction_label=Delete Folder
+ProjectPackagesView_deleteActionAction_label=Delete Action
ProjectPackagesView_editPackageAction_label=Edit Archive
ProjectPackagesView_editFolderAction_label=Edit Folder
ProjectPackagesView_editFilesetAction_label=Edit Fileset
+ProjectPackagesView_editActionAction_label=Edit Action
ProjectPackagesView_buildArchiveAction_label=Build Archive (Full)
ProjectPackagesView_buildProjectAction_label=Build Project (Full)
ProjectPackagesView_createFolderDialog_title=Create a folder
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-04-21 21:15:45 UTC (rev 7663)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesLabelProvider.java 2008-04-21 21:24:19 UTC (rev 7664)
@@ -6,6 +6,7 @@
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveAction;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
@@ -76,6 +77,7 @@
case IArchiveNode.TYPE_ARCHIVE: return getPackageText((IArchive)element);
case IArchiveNode.TYPE_ARCHIVE_FOLDER: return getPackageFolderText((IArchiveFolder)element);
case IArchiveNode.TYPE_ARCHIVE_FILESET: return getPackageFileSetText((IArchiveFileSet)element);
+ case IArchiveNode.TYPE_ARCHIVE_ACTION: return getArchiveActionText((IArchiveAction)element);
}
}
@@ -94,6 +96,10 @@
return text;
}
+ private String getArchiveActionText (IArchiveAction action) {
+ return action.toString();
+ }
+
private String getPackageFileSetText (IArchiveFileSet fileset) {
boolean showFullPath = PrefsInitializer.getBoolean(
PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR);
16 years, 6 months