Author: dennyxu Date: 2008-06-17 01:47:52 -0400 (Tue, 17 Jun 2008) New Revision: 8806 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java Log: JBIDE-2343: fixed JbossWS facet installation does not work issue Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-17 05:28:10 UTC (rev 8805) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-17 05:47:52 UTC (rev 8806) @@ -1,12 +1,11 @@ Label_Custom_Package_Name=Custom package name Label_Catalog_File=Catalog file Label_Button_Text_Seletion= &Add -Label_Generate_Impelemtation=Generate default Web Service Implementation class +Label_Generate_Impelemtation=Generate default Web Service Implementation classes Label_Generate_WSDL=Generete WSDL file Label_Binding_File=Binding files Label_JaxWS_Target=JAX-WS specification -Label_Upate_Webxml=Update default Web.xml -Label_Update_Webxml=Update default Web.xml +Label_Update_Webxml=Update the default Web.xml Value_Target_0=2.0 Value_Target_1=2.1 Label_Button_Text_Remove=Remove Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-17 05:28:10 UTC (rev 8805) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-17 05:47:52 UTC (rev 8806) @@ -25,8 +25,6 @@ public static String Label_Generate_WSDL; public static String Label_JaxWS_Target; - public static String Label_Upate_Webxml; - public static String Label_Update_Webxml; public static String Value_Target_0; public static String Value_Target_1; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-17 05:28:10 UTC (rev 8805) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-17 05:47:52 UTC (rev 8806) @@ -15,6 +15,7 @@ import java.util.EventObject; import java.util.List; +import org.eclipse.core.resources.IProject; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; @@ -111,12 +112,7 @@ String runtimeName = cmbRuntimes.getText(); JbossWSRuntime jr = (JbossWSRuntime) cmbRuntimes .getData(runtimeName); - model.setStringProperty( - IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, - jr.getHomeDir()); - model.setStringProperty( - IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, - runtimeName); + saveJBosswsRuntimeToModel(jr); } }); @@ -143,6 +139,15 @@ changePageStatus(); } + + protected void saveJBosswsRuntimeToModel(JbossWSRuntime jbws){ + model.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, + jbws.getHomeDir()); + model.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, + jbws.getName()); + } protected void setServerSuppliedSelection(EventObject e) { btnServerSupplied.setSelection(true); @@ -197,6 +202,7 @@ // get default jbossws runtime if (jr.isDefault()) { cmRuntime.select(i); + saveJBosswsRuntimeToModel(jr); } } } 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-06-17 05:28:10 UTC (rev 8805) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-06-17 05:47:52 UTC (rev 8806) @@ -160,7 +160,7 @@ gd = new GridData(); gd.horizontalSpan = 3; btnUpdateWebxml.setLayoutData(gd); - btnUpdateWebxml.setText(JBossWSCreationCoreMessages.Label_Upate_Webxml); + btnUpdateWebxml.setText(JBossWSCreationCoreMessages.Label_Update_Webxml); btnUpdateWebxml.setSelection(true); btnUpdateWebxml.addSelectionListener(new SelectionAdapter(){ public void widgetSelected(SelectionEvent e) {