JBoss Tools SVN: r7724 - in trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui: wsrt and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-24 03:39:39 -0400 (Thu, 24 Apr 2008)
New Revision: 7724
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java
Log:
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2008-04-24 07:31:27 UTC (rev 7723)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2008-04-24 07:39:39 UTC (rev 7724)
@@ -1,7 +1,16 @@
+/*******************************************************************************
+ * 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.creation.ui.widgets;
-
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java 2008-04-24 07:31:27 UTC (rev 7723)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java 2008-04-24 07:39:39 UTC (rev 7724)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * 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.creation.ui.wsrt;
import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
@@ -10,6 +21,7 @@
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;
+import org.jboss.tools.ws.creation.ui.widgets.Java2WSDLCodeGenConfigWidget;
public class JBossWSJava2WSDLConfigWidgetFactory implements
INamedWidgetContributorFactory {
@@ -50,13 +62,13 @@
}
private void init() {
- // Pages of Axis2 Web Services Java Bean Scenario
- CodeGenConfigWidget servicesXMLSelectWidget = new CodeGenConfigWidget(
+ // Pages of JBossWS Java2WSDL
+ Java2WSDLCodeGenConfigWidget java2WSDLWidget = new Java2WSDLCodeGenConfigWidget(
model);
servicesXMLSelectWidgetContrib = createWidgetContributor(
"JBoss Web Service Code Generation Configuration",
"Please input the appropriate option for the code generation",
- servicesXMLSelectWidget);
+ java2WSDLWidget);
}
private SimpleWidgetContributor createWidgetContributor(String title,
17 years, 8 months
JBoss Tools SVN: r7723 - in trunk/ws/plugins/org.jboss.tools.ws.creation.ui: src/org/jboss/tools/ws/creation/ui/widgets and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-24 03:31:27 -0400 (Thu, 24 Apr 2008)
New Revision: 7723
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/Java2WSDLCodeGenConfigWidget.java
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/JBossWSJava2WSDLConfigWidgetFactory.java
Removed:
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/wsrt/JBossWSConfigWidgetFactory.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
Log:
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-24 07:20:28 UTC (rev 7722)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-24 07:31:27 UTC (rev 7723)
@@ -45,6 +45,14 @@
</clientRuntime>
+ </extension>
+ <extension
+ point="org.eclipse.wst.command.env.ui.widgetRegistry">
+ <widgetFactory
+ class="org.jboss.tools.ws.creation.ui.wsrt.JBossWSJava2WSDLConfigWidgetFactory"
+ id="JBossWSJava2WSDLConfig"
+ insertBeforeCommandId="org.jboos.tools.ws.creation.core.commands.Java2WSDLCommnad">
+ </widgetFactory>
</extension>
</plugin>
Deleted: 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-04-24 07:20:28 UTC (rev 7722)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-04-24 07:31:27 UTC (rev 7723)
@@ -1,65 +0,0 @@
-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.setCustomPackage(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;
- }
-}
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-24 07:31:27 UTC (rev 7723)
@@ -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.setCustomPackage(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;
+ }
+}
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2008-04-24 07:31:27 UTC (rev 7723)
@@ -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 Java2WSDLCodeGenConfigWidget extends SimpleWidgetDataContributor {
+
+ private ServiceModel model;
+
+ public Java2WSDLCodeGenConfigWidget(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.setCustomPackage(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;
+ }
+}
Deleted: 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 2008-04-24 07:20:28 UTC (rev 7722)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSConfigWidgetFactory.java 2008-04-24 07:31:27 UTC (rev 7723)
@@ -1,72 +0,0 @@
-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;
- }
-
-}
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-24 07:31:27 UTC (rev 7723)
@@ -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;
+ }
+
+}
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWSJava2WSDLConfigWidgetFactory.java 2008-04-24 07:31:27 UTC (rev 7723)
@@ -0,0 +1,75 @@
+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 JBossWSJava2WSDLConfigWidgetFactory implements
+ INamedWidgetContributorFactory {
+
+ private SimpleWidgetContributor servicesXMLSelectWidgetContrib;
+ private ServiceModel model;
+
+ public JBossWSJava2WSDLConfigWidgetFactory() {
+ }
+
+ 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$
+ JBossWSJava2WSDLConfigWidgetFactory.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;
+ }
+
+}
17 years, 8 months
JBoss Tools SVN: r7722 - trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-04-24 03:20:28 -0400 (Thu, 24 Apr 2008)
New Revision: 7722
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
Log:
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-04-24 01:57:09 UTC (rev 7721)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-04-24 07:20:28 UTC (rev 7722)
@@ -36,7 +36,7 @@
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- return Status.OK_STATUS;
+ return executeOverride(monitor);
}
public IStatus executeOverride(IProgressMonitor monitor) {
17 years, 8 months
JBoss Tools SVN: r7721 - in trunk/ws/plugins: org.jboss.tools.ws.creation.core/META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-04-23 21:57:09 -0400 (Wed, 23 Apr 2008)
New Revision: 7721
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project
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
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/widgets/CodeGenConfigWidget.java
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.core/.project
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project 2008-04-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project 2008-04-24 01:57:09 UTC (rev 7721)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboos.tools.ws.creation.core</name>
+ <name>org.jboss.tools.ws.creation.core</name>
<comment></comment>
<projects>
</projects>
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-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-04-24 01:57:09 UTC (rev 7721)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.jboos.tools.ws.creation.core
+Bundle-SymbolicName: org.jboss.tools.ws.creation.core
Bundle-Version: 1.0.0
Bundle-Activator: org.jboos.tools.ws.creation.core.JBossWSCreationCore
Bundle-Vendor: %PLUGIN_PROVIDER
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-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-04-24 01:57:09 UTC (rev 7721)
@@ -73,9 +73,9 @@
String commandLine;
String project = model.getWebProjectName();
String projectRoot = JBossWSCreationUtils.getProjectRoot(project).toOSString();
- commandLine = "-o " + projectRoot + Path.SEPARATOR + "src";
+ commandLine = "-s " + projectRoot + Path.SEPARATOR + "src";
- String customePkg = model.getPackageText();
+ String customePkg = model.getCustomPackage();
if(customePkg != null && !"".equals(customePkg)){
commandLine += " -p " + customePkg;
}
Added: 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 (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-04-24 01:57:09 UTC (rev 7721)
@@ -0,0 +1,94 @@
+package org.jboos.tools.ws.creation.core.commands;
+
+import java.io.File;
+import java.io.IOException;
+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.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;
+
+public class WSProviderInvokeCommnad extends AbstractDataModelOperation{
+
+ private ServiceModel model;
+
+
+ public WSProviderInvokeCommnad(ServiceModel model){
+ this.model = model;
+ }
+
+ @Override
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info)
+ throws ExecutionException {
+
+ String runtimeLocation = JbossWSCorePlugin.getDefault().getPreferenceStore().getString("jbosswsruntimelocation");
+ String commandLocation = runtimeLocation + Path.SEPARATOR + "bin";
+ String command = "sh wsprovide.sh ";
+ if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0){
+ command += "cmd wsprovide.bat";
+ }
+ String args = getCommandlineArgs();
+ command += " -k " + args + " " + model.getWsdlURI();
+
+ try {
+
+ InputStreamReader ir = new InputStreamReader(Runtime.getRuntime().exec(command, null, new File(commandLocation)).getInputStream());
+ LineNumberReader input = new LineNumberReader(ir);
+ String str = input.readLine();
+ while(str != null){
+ System.out.println(str);
+ str = input.readLine();
+ }
+
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ refreshProject(model.getWebProjectName(), monitor);
+
+ return Status.OK_STATUS;
+ }
+
+ private void refreshProject(String project, IProgressMonitor monitor){
+ try {
+ JBossWSCreationUtils.getProjectByName(project).refreshLocal(2, monitor);
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ private String getCommandlineArgs(){
+ String commandLine;
+ String project = model.getWebProjectName();
+ String projectRoot = JBossWSCreationUtils.getProjectRoot(project).toOSString();
+ commandLine = "-o " + projectRoot + Path.SEPARATOR + "src";
+
+ String customePkg = model.getCustomPackage();
+ if(customePkg != null && !"".equals(customePkg)){
+ commandLine += " -p " + customePkg;
+ }
+
+ String bindingFileLocation = model.getBindingFileLocation();
+ if(bindingFileLocation != null && !"".equals(bindingFileLocation)){
+ File bindingFile = new File(bindingFileLocation);
+ if(bindingFile.exists()){
+ commandLine += " -b " + bindingFileLocation;
+ }
+ }
+
+ return commandLine;
+
+ }
+}
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-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java 2008-04-24 01:57:09 UTC (rev 7721)
@@ -8,16 +8,25 @@
private String wsdlURI;
private String portName;
private String serviceName;
- private String packageText;
+ private String customPackage;
private String bindingFileLocation;
+ private String serviceClass;
- public String getPackageText() {
- return packageText;
+ public String getServiceClass() {
+ return serviceClass;
}
- public void setPackageText(String packageText) {
- this.packageText = packageText;
+
+ public void setServiceClass(String serviceClass) {
+ this.serviceClass = serviceClass;
}
+
+ public String getCustomPackage() {
+ return customPackage;
+ }
+ public void setCustomPackage(String packageText) {
+ this.customPackage = packageText;
+ }
public String getPortName() {
return portName;
}
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-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2008-04-24 01:57:09 UTC (rev 7721)
@@ -19,6 +19,6 @@
org.eclipse.wst.command.env,
org.eclipse.jdt.core,
org.eclipse.jst.ws.ui,
- org.jboos.tools.ws.creation.core,
+ org.jboss.tools.ws.creation.core,
org.jboss.tools.ws.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-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-24 01:57:09 UTC (rev 7721)
@@ -23,7 +23,7 @@
id="org.jboss.tools.ws.creation.java"
serviceImplementationTypeId="org.eclipse.jst.ws.wsImpl.java"
runtimeId="org.jboss.tools.ws.creation.jbossWebServiceRT"
- bottomUp="false"
+ bottomUp="true"
topDown="true"
class="org.jboss.tools.ws.creation.ui.wsrt.JBossWebServiceRuntime">
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-04-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-04-24 01:57:09 UTC (rev 7721)
@@ -41,7 +41,7 @@
txtCustomPkgName.addModifyListener(new ModifyListener(){
public void modifyText(ModifyEvent e) {
- model.setPackageText(txtCustomPkgName.getText());
+ model.setCustomPackage(txtCustomPkgName.getText());
}});
new Label(configCom, SWT.NONE).setText("Binding file:");
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-23 22:37:46 UTC (rev 7720)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-04-24 01:57:09 UTC (rev 7721)
@@ -1,6 +1,5 @@
package org.jboss.tools.ws.creation.ui.wsrt;
-import java.awt.image.SampleModel;
import java.util.Vector;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -14,6 +13,7 @@
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.commands.WSProviderInvokeCommnad;
import org.jboos.tools.ws.creation.core.data.ServiceModel;
import org.jboss.tools.ws.core.command.JbossWSRuntimeCommand;
@@ -37,6 +37,7 @@
return null;
}
+ @SuppressWarnings({ "restriction", "unchecked" })
@Override
public ICommandFactory develop(IEnvironment env, IContext ctx,
ISelection sel, String project, String earProject) {
@@ -49,6 +50,11 @@
commands.add(new WSDL2JavaCommnad(model));
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)));
+ }
return new SimpleCommandFactory(commands);
}
17 years, 8 months
JBoss Tools SVN: r7720 - trunk/documentation/jboss-tools-docs.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-23 18:37:46 -0400 (Wed, 23 Apr 2008)
New Revision: 7720
Modified:
trunk/documentation/jboss-tools-docs/index.html
Log:
url to ESB Reference Guide was adjusted
Modified: trunk/documentation/jboss-tools-docs/index.html
===================================================================
--- trunk/documentation/jboss-tools-docs/index.html 2008-04-23 21:50:56 UTC (rev 7719)
+++ trunk/documentation/jboss-tools-docs/index.html 2008-04-23 22:37:46 UTC (rev 7720)
@@ -23,7 +23,7 @@
<li>Hibernate Tools Reference Guide<a href="en/hibernatetools/publish/en-US/html/index.html">(html)</a> <a href="en/hibernatetools/publish/en-US/html_single/index.html">(html single)</a> <a href="en/hibernatetools/publish/en-US/pdf/Hibernatetools_Reference_Guide.pdf">(pdf)</a></li>
- <li> ESB Editor Reference Guide<a href="en/esb/publish/en-US/html/index.html">(html)</a> <a href="en/esb/publish/en-US/html_single/index.html">(html single)</a> <a href="en/esb/publish/en-US/pdf/Hibernatetools_Reference_Guide.pdf">(pdf)</a></li>
+ <li> ESB Editor Reference Guide<a href="en/esb_ref_guide/publish/en-US/html/index.html">(html)</a> <a href="en/esb_ref_guide/publish/en-US/html_single/index.html">(html single)</a> <a href="en/esb_ref_guide/publish/en-US/pdf/Hibernatetools_Reference_Guide.pdf">(pdf)</a></li>
<li>JSF Tools Reference Guide<a href="en/jsf_tools_ref_guide/publish/en-US/html/index.html">(html)</a> <a href="en/jsf_tools_ref_guide/publish/en-US/html_single/index.html">(html single)</a> <a href="en/jsf_tools_ref_guide/publish/en-US/pdf/JSF_Tools_Reference_Guide.pdf">(pdf)</a></li>
<li>JSF Tools Tutorial<a href="en/jsf_tools_tutorial/publish/en-US/html/index.html">(html)</a> <a href="en/jsf_tools_tutorial/publish/en-US/html_single/index.html">(html single)</a> <a href="en/jsf_tools_tutorial/publish/en-US/pdf/JSF_Tools_Tutorial.pdf">(pdf)</a></li>
17 years, 8 months
JBoss Tools SVN: r7719 - trunk/common/tests/org.jboss.tools.common.model.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-23 17:50:56 -0400 (Wed, 23 Apr 2008)
New Revision: 7719
Modified:
trunk/common/tests/org.jboss.tools.common.model.test/build.properties
Log:
Fix testGetClassPath Error
java.lang.NullPointerException
at org.eclipse.core.internal.runtime.Activator.getURLConverter(Activator.java:313)
at org.eclipse.core.runtime.FileLocator.resolve(FileLocator.java:185)
at org.jboss.tools.common.test.util.TestProjectProvider.init(TestProjectProvider.java:89)
at org.jboss.tools.common.test.util.TestProjectProvider.<init>(TestProjectProvider.java:68)
at org.jboss.tools.common.model.test.ClassPathTest.setUp(ClassPathTest.java:47)
Modified: trunk/common/tests/org.jboss.tools.common.model.test/build.properties
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.test/build.properties 2008-04-23 19:46:28 UTC (rev 7718)
+++ trunk/common/tests/org.jboss.tools.common.model.test/build.properties 2008-04-23 21:50:56 UTC (rev 7719)
@@ -1,6 +1,8 @@
bin.includes = plugin.xml,\
META-INF/,\
- common-model-tests.jar
+ common-model-tests.jar,\
+ info.xml,\
+ projects/
src.includes = META-INF/,\
MetaModelTest.execution,\
ant.properties,\
17 years, 8 months
JBoss Tools SVN: r7718 - trunk/esb/docs/esb_ref_guide.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-23 15:46:28 -0400 (Wed, 23 Apr 2008)
New Revision: 7718
Modified:
trunk/esb/docs/esb_ref_guide/pom.xml
Log:
adjust pom to other documentation poms
Modified: trunk/esb/docs/esb_ref_guide/pom.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/pom.xml 2008-04-23 19:40:36 UTC (rev 7717)
+++ trunk/esb/docs/esb_ref_guide/pom.xml 2008-04-23 19:46:28 UTC (rev 7718)
@@ -26,15 +26,16 @@
<version>2.0.0</version>
<extensions>true</extensions>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossorg-docbook-xslt</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.richfaces.docs</groupId>
- <artifactId>highlight</artifactId>
- <version>3.1.4.GA</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
</dependency>
</dependencies>
<configuration>
@@ -49,25 +50,25 @@
<!--<cssResource>
<directory>src/main/css</directory>
</cssResource>-->
- <formats>
+ <formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
<finalName>${pom.name}.pdf</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/main-eclipse.xsl</stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
17 years, 8 months
JBoss Tools SVN: r7717 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-04-23 15:40:36 -0400 (Wed, 23 Apr 2008)
New Revision: 7717
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-2122
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-04-23 18:56:09 UTC (rev 7716)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-04-23 19:40:36 UTC (rev 7717)
@@ -312,6 +312,36 @@
value="true">
</persistent>
</extension>
+
+ <extension
+ point="org.eclipse.wst.validation.validator"
+ id="SeamEarProjectValidator"
+ name="Seam Ear Project Validator">
+ <validator>
+ <enablement>
+ <and>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ear"/>
+ </and>
+ </enablement>
+ <filter objectClass="org.eclipse.core.resources.IFile" nameFilter="application.xml"/>
+ <helper class="org.jboss.tools.seam.internal.core.validation.SeamValidationHelper"/>
+ <markerId markerIdValue="seamEarProjectProblem"/>
+ <run
+ class="org.jboss.tools.seam.internal.core.validation.SeamEarProjectValidator"
+ incremental="true"
+ fullBuild="true"
+ />
+ </validator>
+ </extension>
+
+ <extension
+ id="seamEarProjectProblem"
+ name="Seam Ear Project Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.wst.validation.problemmarker"/>
+ <attribute name="kind"/>
+ <persistent value="true"/>
+ </extension>
<extension point="org.jboss.tools.common.model.classes">
<xclass id="org.jboss.tools.seam.internal.core.el.SeamPromptingProvider"
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamEarProjectValidator.java 2008-04-23 19:40:36 UTC (rev 7717)
@@ -0,0 +1,99 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 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.seam.internal.core.validation;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+
+/**
+ * This validator is workaround for bug of WTP 2.0.2
+ * See http://jira.jboss.com/jira/browse/JBIDE-2117
+ * @author Alexey Kazakov
+ */
+public class SeamEarProjectValidator implements IValidatorJob {
+ private IValidationErrorManager errorManager;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)
+ */
+ public ISchedulingRule getSchedulingRule(IValidationContext helper) {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)
+ */
+ public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException {
+
+ SeamValidationHelper seamHelper = (SeamValidationHelper)helper;
+ IProject project = seamHelper.getProject();
+ if(!project.isAccessible()) {
+ return OK_STATUS;
+ }
+ errorManager = new ValidationErrorManager(this, null, reporter, null, ISeamValidator.MARKED_SEAM_PROJECT_MESSAGE_GROUP);
+ errorManager.removeAllMessagesFromResource(project);
+
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ IVirtualReference[] rs = component.getReferences();
+ for (int i = 0; i < rs.length; i++) {
+ IVirtualComponent c = rs[i].getReferencedComponent();
+ if(c == null) {
+ continue;
+ }
+ IVirtualFolder folder = c.getRootFolder();
+ if(folder==null) {
+ continue;
+ }
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(folder.getProject(), false);
+ if(seamProject!=null) {
+ validateEar(project, rs);
+ break;
+ }
+ }
+
+ return OK_STATUS;
+ }
+
+ private void validateEar(IProject ear, IVirtualReference[] rs) {
+ for (int i = 0; i < rs.length; i++) {
+ IVirtualComponent c = rs[i].getReferencedComponent();
+ if(c != null && c instanceof J2EEModuleVirtualArchiveComponent) {
+ J2EEModuleVirtualArchiveComponent component = (J2EEModuleVirtualArchiveComponent)c;
+ System.out.println(c.getName());
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
+ */
+ public void cleanup(IReporter reporter) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)
+ */
+ public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
+ validateInJob(helper, reporter);
+ }
+}
\ No newline at end of file
17 years, 8 months
JBoss Tools SVN: r7715 - trunk/documentation/jboss-tools-docs.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-23 14:34:26 -0400 (Wed, 23 Apr 2008)
New Revision: 7715
Modified:
trunk/documentation/jboss-tools-docs/pom.xml
Log:
enabling ESB component in build
Modified: trunk/documentation/jboss-tools-docs/pom.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/pom.xml 2008-04-23 18:04:19 UTC (rev 7714)
+++ trunk/documentation/jboss-tools-docs/pom.xml 2008-04-23 18:34:26 UTC (rev 7715)
@@ -22,7 +22,7 @@
<module>../../seam/docs/reference</module>
<module>../../struts/docs/struts_tools_ref_guide</module>
<module>../../struts/docs/struts_tools_tutorial</module>
- <!--module>../../esb/docs/esb_ref_guide</module-->
+ <module>../../esb/docs/esb_ref_guide</module>
</modules>
<build>
17 years, 8 months