JBoss Tools SVN: r23581 - workspace/rstryker/rse.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-20 05:27:46 -0400 (Tue, 20 Jul 2010)
New Revision: 23581
Added:
workspace/rstryker/rse/as/
Log:
branching for rse work
Copied: workspace/rstryker/rse/as (from rev 23580, trunk/as)
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23580 - workspace/rstryker.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-07-20 05:20:18 -0400 (Tue, 20 Jul 2010)
New Revision: 23580
Added:
workspace/rstryker/rse/
Log:
creating rse branch
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23579 - in trunk/jst/tests/org.jboss.tools.jst.web.ui.test: .settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-07-20 04:51:43 -0400 (Tue, 20 Jul 2010)
New Revision: 23579
Added:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6540
Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs 2010-07-20 08:51:43 UTC (rev 23579)
@@ -0,0 +1,8 @@
+#Fri Jun 11 14:44:27 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-07-20 08:36:09 UTC (rev 23578)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/AddJSFCapabilitiesTest.java 2010-07-20 08:51:43 UTC (rev 23579)
@@ -2,12 +2,14 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.PlatformUI;
@@ -84,6 +86,10 @@
} catch (CoreException e) {
fail(e.getMessage());
}
+
+ IFile f = project.getFile(new Path(".settings/org.eclipse.wst.common.project.facet.core.xml"));
+ assertNotNull(f);
+ assertTrue(f.exists());
}
static String RUNTIME = "org.jboss.ide.eclipse.as.runtime.42";
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23578 - in trunk/ws/plugins/org.jboss.tools.ws.ui: src/org/jboss/tools/ws/ui/messages and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-07-20 04:36:09 -0400 (Tue, 20 Jul 2010)
New Revision: 23578
Added:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardPage.java
Removed:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java
Log:
JBIDE-6592: commit to trunk for M2
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-07-20 08:36:09 UTC (rev 23578)
@@ -31,7 +31,8 @@
javax.wsdl;bundle-version="1.6.2",
org.jdom,
javax.xml.ws,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ org.eclipse.emf.common
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.ws.ui,
org.jboss.tools.ws.ui.messages,
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-07-20 08:36:09 UTC (rev 23578)
@@ -31,19 +31,17 @@
JBossWSLibraryListFieldEditor_ActionRemove=&Remove
JBossWSLibraryListFieldEditor_LIBRARY_JARS=Library Jars
JBossWS_GenerateWizard_Title=Generate a Sample Web Service
-JBossWS_GenerateWizard_GenerateWebXmlPage_Title=Project and Web Service Name
-JBossWS_GenerateWizard_GenerateWebXmlPage_Description=Specify the Dynamic Web Project and service name for the new sample web service.
-JBossWS_GenerateWizard_GenerateSampleClassPage_Title=Sample Web Service Class
-JBossWS_GenerateWizard_GenerateSampleClassPage_Description=Define the package and class name for the generated sample web service class.
-JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label=Name
-JBossWS_GenerateWizard_WizardPage_CheckButton_Label=Use the default value
-JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label=Package
-JBossWS_GenerateWizard_GenerateSampleClassPage_ClassName_Label=Class
+JBossWS_GenerateWizard_GenerateWizardPage_Title=Project and Web Service Name
+JBossWS_GenerateWizard_GenerateWizardPage_Description=Specify the Dynamic Web Project, service, package and class name for the sample web service and web service class.
+JBossWS_GenerateWizard_GenerateWizardPage_ServiceName_Label=Name
+JBossWS_GenerateWizard_GenerateWizardPage_Package_Label=Package
+JBossWS_GenerateWizard_GenerateWizardPage_ClassName_Label=Class
JBossWS_GenerateWizard_MessageDialog_Title=Error
JBossWS_UI_PLUGIN_NO_MESSAGES=No message
-JBossWSGenerateWebXmlWizardPage_Project_Group=Dynamic Web Project Name
-JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip=If no Dynamic Web Project exists, you must create one before creating your sample web service.
-JBossWSGenerateWebXmlWizardPage_Web_Service_Group=Web Service
+JBossWS_GenerateWizard_GenerateWizardPage_Project_Group=Dynamic Web Project Name
+JBossWS_GenerateWizard_GenerateWizardPage_Project_Group_Tooltip=If no Dynamic Web Project exists, you must create one before creating your sample web service.
+JBossWS_GenerateWizard_GenerateWizardPage_Web_Service_Group=Web Service
+JBossWS_GenerateWizard_GenerateWizardPage_Class_Group=Sample Web Service Class
JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime
JBossWSFacetInstallPage_New=New...
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-07-20 08:36:09 UTC (rev 23578)
@@ -63,19 +63,17 @@
public static String JBossWSLibraryListFieldEditor_ActionRemove;
public static String JBossWSLibraryListFieldEditor_LIBRARY_JARS;
public static String JBossWS_GenerateWizard_Title;
- public static String JBossWS_GenerateWizard_GenerateWebXmlPage_Title;
- public static String JBossWS_GenerateWizard_GenerateWebXmlPage_Description;
- public static String JBossWS_GenerateWizard_GenerateSampleClassPage_Title;
- public static String JBossWS_GenerateWizard_GenerateSampleClassPage_Description;
- public static String JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label;
- public static String JBossWS_GenerateWizard_WizardPage_CheckButton_Label;
- public static String JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label;
- public static String JBossWS_GenerateWizard_GenerateSampleClassPage_ClassName_Label;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Title;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Description;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_ServiceName_Label;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Package_Label;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_ClassName_Label;
public static String JBossWS_GenerateWizard_MessageDialog_Title;
public static String JBossWS_UI_PLUGIN_NO_MESSAGES;
- public static String JBossWSGenerateWebXmlWizardPage_Project_Group;
- public static String JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip;
- public static String JBossWSGenerateWebXmlWizardPage_Web_Service_Group;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Project_Group;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Project_Group_Tooltip;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Web_Service_Group;
+ public static String JBossWS_GenerateWizard_GenerateWizardPage_Class_Group;
public static String JBossWSFacetInstallPage_ServerSuppliedJBossWS;
public static String JBossWSFacetInstallPage_New;
Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateSampleClassWizardPage.java 2010-07-20 08:36:09 UTC (rev 23578)
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.ui.wizards;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.ws.creation.core.data.ServiceModel;
-import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
-
-public class JBossWSGenerateSampleClassWizardPage extends WizardPage {
- private JBossWSGenerateWizard wizard;
- private Text packageName;
- private Text className;
- private Button checkDefault;
-
- protected JBossWSGenerateSampleClassWizardPage(String pageName) {
- super(pageName);
- this
- .setTitle(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateSampleClassPage_Title);
- this
- .setDescription(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateSampleClassPage_Description);
- }
-
- public void createControl(Composite parent) {
- Composite composite = createDialogArea(parent);
- this.wizard = (JBossWSGenerateWizard) this.getWizard();
- new Label(composite, SWT.NONE)
- .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateSampleClassPage_Package_Label);
- packageName = new Text(composite, SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- packageName.setLayoutData(gd);
- packageName.setText(wizard.getPackageName());
- packageName.setEnabled(!wizard.isUseDefaultClassName());
- packageName.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- wizard.setPackageName(packageName.getText());
- setPageComplete(isPageComplete());
- }
-
- });
-
- new Label(composite, SWT.NONE)
- .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateSampleClassPage_ClassName_Label);
- className = new Text(composite, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- className.setLayoutData(gd);
- className.setText(updateDefaultName());
- className.setEnabled(!wizard.isUseDefaultClassName());
- className.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- wizard.setClassName(className.getText());
- setPageComplete(isPageComplete());
- }
-
- });
-
- checkDefault = new Button(composite, SWT.CHECK);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- checkDefault.setLayoutData(gd);
- checkDefault.setSelection(wizard.isUseDefaultClassName());
- checkDefault
- .setText(JBossWSUIMessages.JBossWS_GenerateWizard_WizardPage_CheckButton_Label);
- checkDefault.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (checkDefault.getSelection()) {
- checkDefault.setSelection(true);
- packageName.setText(wizard.PACKAGEDEFAULT);
- className.setText(wizard.CLASSDEFAULT);
- } else {
- checkDefault.setSelection(false);
- }
- packageName.setEnabled(!checkDefault.getSelection());
- className.setEnabled(!checkDefault.getSelection());
- wizard.setUseDefaultClassName(!checkDefault.getSelection());
- }
-
- });
- setControl(composite);
-
- }
-
- public boolean isPageComplete() {
- return validate();
- }
-
- private Composite createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 7;
- layout.marginWidth = 7;
- layout.verticalSpacing = 4;
- layout.horizontalSpacing = 4;
- layout.numColumns = 2;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- private String updateDefaultName() {
- ServiceModel model = wizard.getServiceModel();
- JBossWSGenerateWizardValidator.setServiceModel(model);
- String currentName = wizard.getClassName();
- if (wizard.getProject() == null) {
- return currentName;
- } else {
- boolean isDynamicWebProject = false;
- try {
- if (wizard.getProject().getNature(
- "org.eclipse.wst.common.project.facet.core.nature") != null) { //$NON-NLS-1$
- isDynamicWebProject = true;
- }
- } catch (CoreException e) {
- // ignore
- }
- if (!isDynamicWebProject) {
- return currentName;
- }
- }
- String testName = currentName;
- IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(
- testName, wizard.getProject());
- int i = 1;
- while (status != null && status.getSeverity() == IStatus.ERROR) {
- testName = currentName + i;
- wizard.setClassName(testName);
- model = wizard.getServiceModel();
- JBossWSGenerateWizardValidator.setServiceModel(model);
- status = JBossWSGenerateWizardValidator.isWSClassValid(testName,
- wizard.getProject());
- i++;
- }
- return testName;
- }
-
- protected boolean validate() {
- ServiceModel model = wizard.getServiceModel();
- JBossWSGenerateWizardValidator.setServiceModel(model);
- IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(model
- .getCustomClassName(), wizard.getProject());
- if (status != null) {
- if (status.getSeverity() == IStatus.ERROR) {
- setMessage(status.getMessage(), DialogPage.ERROR);
- return false;
- } else if (status.getSeverity() == IStatus.WARNING) {
- setMessage(status.getMessage(), DialogPage.WARNING);
- return true;
- }
- }
- setMessage(null);
- return true;
- }
-
- protected void refresh() {
- className.setText(updateDefaultName());
- }
-}
Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWebXmlWizardPage.java 2010-07-20 08:36:09 UTC (rev 23578)
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.ui.wizards;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.ws.creation.core.data.ServiceModel;
-import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
-import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
-
-public class JBossWSGenerateWebXmlWizardPage extends WizardPage {
-
- private JBossWSGenerateWizard wizard;
- private Text name;
- private Combo projects;
- private Button checkDefault;
- private boolean bHasChanged = false;
-
- protected JBossWSGenerateWebXmlWizardPage(String pageName) {
- super(pageName);
- this
- .setTitle(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWebXmlPage_Title);
- this
- .setDescription(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWebXmlPage_Description);
- }
-
- public void createControl(Composite parent) {
- Composite composite = createDialogArea(parent);
- this.wizard = (JBossWSGenerateWizard) this.getWizard();
-
- Group group = new Group(composite, SWT.NONE);
- group
- .setText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Project_Group);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- group.setLayout(new GridLayout(2, false));
- group.setLayoutData(gd);
-
- projects = new Combo(group, SWT.BORDER | SWT.DROP_DOWN);
- projects
- .setToolTipText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Project_Group_Tooltip);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- projects.setLayoutData(gd);
- refreshProjectList(wizard.getServiceModel().getWebProjectName());
-
- projects.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- wizard.setProject(projects.getText());
- name.setText(updateDefaultName());
- wizard.getSecondPage().refresh();
- bHasChanged = true;
- setPageComplete(isPageComplete());
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
-
- Group group2 = new Group(composite, SWT.NONE);
- group2
- .setText(JBossWSUIMessages.JBossWSGenerateWebXmlWizardPage_Web_Service_Group);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- group2.setLayout(new GridLayout(2, false));
- group2.setLayoutData(gd);
-
- new Label(group2, SWT.NONE)
- .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWebXmlPage_ServiceName_Label);
- name = new Text(group2, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- name.setLayoutData(gd);
- name.setText(updateDefaultName());
- name.setEnabled(!wizard.isUseDefaultServiceName());
- name.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- wizard.setServiceName(name.getText());
- bHasChanged = true;
- setPageComplete(isPageComplete());
- }
-
- });
-
- checkDefault = new Button(group2, SWT.CHECK);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- checkDefault.setLayoutData(gd);
- checkDefault.setSelection(wizard.isUseDefaultServiceName());
- checkDefault
- .setText(JBossWSUIMessages.JBossWS_GenerateWizard_WizardPage_CheckButton_Label);
- checkDefault.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (checkDefault.getSelection()) {
- checkDefault.setSelection(true);
- name.setText(wizard.NAMEDEFAULT);
- } else {
- checkDefault.setSelection(false);
- }
- name.setEnabled(!checkDefault.getSelection());
- wizard.setUseDefaultServiceName(!checkDefault.getSelection());
- }
-
- });
-
- setControl(composite);
- }
-
- private void refreshProjectList(String projectName) {
- String[] projectNames = getProjects();
- boolean foundInitialProject = false;
- projects.removeAll();
- for (int i = 0; i < projectNames.length; i++) {
- projects.add(projectNames[i]);
- if (projectNames[i].equals(projectName)) {
- foundInitialProject = true;
- }
- }
- if (foundInitialProject)
- projects.setText(projectName);
- }
-
- public IWizardPage getNextPage() {
- wizard.setServiceName(name.getText());
- return super.getNextPage();
- }
-
- private Composite createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 7;
- layout.marginWidth = 7;
- layout.verticalSpacing = 4;
- layout.horizontalSpacing = 4;
- layout.numColumns = 2;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- @Override
- public boolean isPageComplete() {
- return validate();
- }
-
- private String updateDefaultName() {
- ServiceModel model = wizard.getServiceModel();
- JBossWSGenerateWizardValidator.setServiceModel(model);
- String currentName = wizard.getServiceName();
- IStatus status = JBossWSGenerateWizardValidator.isWSNameValid();
- try {
- if (status.getSeverity() == IStatus.ERROR
- && !JavaEEProjectUtilities.isDynamicWebProject(wizard
- .getProject())) {
- return currentName;
- }
- } catch (NullPointerException npe) {
- return currentName;
- }
- String testName = currentName;
- int i = 1;
- while (status != null) {
- testName = currentName + i;
- wizard.setServiceName(testName);
- model = wizard.getServiceModel();
- JBossWSGenerateWizardValidator.setServiceModel(model);
- status = JBossWSGenerateWizardValidator.isWSNameValid();
- i++;
- }
- return testName;
- }
-
- private boolean validate() {
- ServiceModel model = wizard.getServiceModel();
- JBossWSGenerateWizardValidator.setServiceModel(model);
- if (!projects.isDisposed() && projects.getText().length() > 0) {
- model.setWebProjectName(projects.getText());
- }
-
- if (((JBossWSGenerateWizard) this.getWizard()).getProject() == null) {
- setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected);
- return false;
- }
-
- IFile web = ((JBossWSGenerateWizard) this.getWizard()).getWebFile();
- if (web == null || !web.exists()) {
- setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NotDynamicWebProject);
- return false;
- }
-
- try {
- if ("" .equals(JBossWSCreationUtils.getJavaProjectSrcLocation(((JBossWSGenerateWizard) this.getWizard()).getProject()))) { //$NON-NLS-1$
- setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoSrcInProject);
- return false;
- }
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
-
- IStatus status = JBossWSGenerateWizardValidator.isWSNameValid();
- if (status != null) {
- setErrorMessage(status.getMessage());
- return false;
- } else {
- setErrorMessage(null);
- return true;
- }
- }
-
- private String[] getProjects() {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
- .getProjects();
- ArrayList<String> dynamicProjects = new ArrayList<String>();
- for (int i = 0; i < projects.length; i++) {
- boolean isDynamicWebProject = JavaEEProjectUtilities
- .isDynamicWebProject(projects[i]);
- if (isDynamicWebProject) {
- dynamicProjects.add(projects[i].getName());
- }
- }
- return dynamicProjects.toArray(new String[dynamicProjects.size()]);
- }
-
- protected boolean hasChanged() {
- return bHasChanged;
- }
-}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizard.java 2010-07-20 08:36:09 UTC (rev 23578)
@@ -35,9 +35,6 @@
public class JBossWSGenerateWizard extends Wizard implements INewWizard {
- private JBossWSGenerateWebXmlWizardPage firstPage;
- private JBossWSGenerateSampleClassWizardPage secondPage;
-
String NAMEDEFAULT = "HelloWorld"; //$NON-NLS-1$
String PACKAGEDEFAULT = "org.jboss.samples.webservices"; //$NON-NLS-1$
String CLASSDEFAULT = "HelloWorld"; //$NON-NLS-1$
@@ -64,10 +61,9 @@
public void addPages() {
super.addPages();
- firstPage = new JBossWSGenerateWebXmlWizardPage("first"); //$NON-NLS-1$
- secondPage = new JBossWSGenerateSampleClassWizardPage("second"); //$NON-NLS-1$
- addPage(firstPage);
- addPage(secondPage);
+ JBossWSGenerateWizardPage onePage =
+ new JBossWSGenerateWizardPage("onePage"); //$NON-NLS-1$
+ addPage(onePage);
}
@Override
@@ -207,14 +203,6 @@
return model;
}
- public JBossWSGenerateWebXmlWizardPage getFirstPage() {
- return this.firstPage;
- }
-
- public JBossWSGenerateSampleClassWizardPage getSecondPage() {
- return this.secondPage;
- }
-
public void setProject (String projectName) {
if (projectName != null && projectName.trim().length() > 0) {
IProject test =
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardPage.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardPage.java 2010-07-20 08:36:09 UTC (rev 23578)
@@ -0,0 +1,323 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.ui.wizards;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils;
+import org.jboss.tools.ws.ui.messages.JBossWSUIMessages;
+
+public class JBossWSGenerateWizardPage extends WizardPage {
+
+ private JBossWSGenerateWizard wizard;
+ private Text name;
+ private Combo projects;
+ private boolean bHasChanged = false;
+ private Text packageName;
+ private Text className;
+
+ protected JBossWSGenerateWizardPage(String pageName) {
+ super(pageName);
+ this
+ .setTitle(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Title);
+ this
+ .setDescription(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Description);
+ }
+
+ public void createControl(Composite parent) {
+ Composite composite = createDialogArea(parent);
+ this.wizard = (JBossWSGenerateWizard) this.getWizard();
+
+ Group group = new Group(composite, SWT.NONE);
+ group
+ .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Project_Group);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ group.setLayout(new GridLayout(2, false));
+ group.setLayoutData(gd);
+
+ projects = new Combo(group, SWT.BORDER | SWT.DROP_DOWN);
+ projects
+ .setToolTipText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Project_Group_Tooltip);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ projects.setLayoutData(gd);
+ refreshProjectList(wizard.getServiceModel().getWebProjectName());
+
+ projects.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ wizard.setProject(projects.getText());
+ name.setText(updateDefaultName());
+ className.setText(updateDefaultClassName());
+ bHasChanged = true;
+ setPageComplete(isPageComplete());
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+ });
+
+ Group group2 = new Group(composite, SWT.NONE);
+ group2
+ .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Web_Service_Group);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ group2.setLayout(new GridLayout(2, false));
+ group2.setLayoutData(gd);
+
+ new Label(group2, SWT.NONE)
+ .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_ServiceName_Label);
+ name = new Text(group2, SWT.BORDER);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ name.setLayoutData(gd);
+ name.setText(updateDefaultName());
+ name.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ wizard.setServiceName(name.getText());
+ bHasChanged = true;
+ setPageComplete(isPageComplete());
+ }
+
+ });
+
+ Group group3 = new Group(composite, SWT.NONE);
+ group3.setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Class_Group);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ group3.setLayout(new GridLayout(2, false));
+ group3.setLayoutData(gd);
+
+ new Label(group3, SWT.NONE)
+ .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Package_Label);
+ packageName = new Text(group3, SWT.BORDER);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ packageName.setLayoutData(gd);
+ packageName.setText(wizard.getPackageName());
+ packageName.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ wizard.setPackageName(packageName.getText());
+ setPageComplete(isPageComplete());
+ }
+
+ });
+
+ new Label(group3, SWT.NONE)
+ .setText(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_ClassName_Label);
+ className = new Text(group3, SWT.BORDER);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ className.setLayoutData(gd);
+ className.setText(updateDefaultClassName());
+ className.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ wizard.setClassName(className.getText());
+ setPageComplete(isPageComplete());
+ }
+
+ });
+
+ setControl(composite);
+ }
+
+ private void refreshProjectList(String projectName) {
+ String[] projectNames = getProjects();
+ boolean foundInitialProject = false;
+ projects.removeAll();
+ for (int i = 0; i < projectNames.length; i++) {
+ projects.add(projectNames[i]);
+ if (projectNames[i].equals(projectName)) {
+ foundInitialProject = true;
+ }
+ }
+ if (foundInitialProject)
+ projects.setText(projectName);
+ }
+
+ public IWizardPage getNextPage() {
+ return super.getNextPage();
+ }
+
+ private Composite createDialogArea(Composite parent) {
+ // create a composite with standard margins and spacing
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 7;
+ layout.marginWidth = 7;
+ layout.verticalSpacing = 4;
+ layout.horizontalSpacing = 4;
+ layout.numColumns = 2;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ return composite;
+ }
+
+ @Override
+ public boolean isPageComplete() {
+ return validate();
+ }
+
+ private String updateDefaultName() {
+ ServiceModel model = wizard.getServiceModel();
+ JBossWSGenerateWizardValidator.setServiceModel(model);
+ String currentName = wizard.getServiceName();
+ IStatus status = JBossWSGenerateWizardValidator.isWSNameValid();
+ try {
+ if (status.getSeverity() == IStatus.ERROR
+ && !JavaEEProjectUtilities.isDynamicWebProject(wizard
+ .getProject())) {
+ return currentName;
+ }
+ } catch (NullPointerException npe) {
+ return currentName;
+ }
+ String testName = currentName;
+ int i = 1;
+ while (status != null) {
+ testName = currentName + i;
+ wizard.setServiceName(testName);
+ model = wizard.getServiceModel();
+ JBossWSGenerateWizardValidator.setServiceModel(model);
+ status = JBossWSGenerateWizardValidator.isWSNameValid();
+ i++;
+ }
+ return testName;
+ }
+
+ private String updateDefaultClassName() {
+ ServiceModel model = wizard.getServiceModel();
+ JBossWSGenerateWizardValidator.setServiceModel(model);
+ String currentName = wizard.getClassName();
+ if (wizard.getProject() == null) {
+ return currentName;
+ } else {
+ boolean isDynamicWebProject = false;
+ try {
+ if (wizard.getProject().getNature(
+ "org.eclipse.wst.common.project.facet.core.nature") != null) { //$NON-NLS-1$
+ isDynamicWebProject = true;
+ }
+ } catch (CoreException e) {
+ // ignore
+ }
+ if (!isDynamicWebProject) {
+ return currentName;
+ }
+ }
+ String testName = currentName;
+ IStatus status = JBossWSGenerateWizardValidator.isWSClassValid(
+ testName, wizard.getProject());
+ int i = 1;
+ while (status != null && status.getSeverity() == IStatus.ERROR) {
+ testName = currentName + i;
+ wizard.setClassName(testName);
+ model = wizard.getServiceModel();
+ JBossWSGenerateWizardValidator.setServiceModel(model);
+ status = JBossWSGenerateWizardValidator.isWSClassValid(testName,
+ wizard.getProject());
+ i++;
+ }
+ return testName;
+ }
+
+
+ private boolean validate() {
+ ServiceModel model = wizard.getServiceModel();
+ JBossWSGenerateWizardValidator.setServiceModel(model);
+ if (!projects.isDisposed() && projects.getText().length() > 0) {
+ model.setWebProjectName(projects.getText());
+ }
+
+ if (((JBossWSGenerateWizard) this.getWizard()).getProject() == null) {
+ setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected);
+ return false;
+ }
+
+ IFile web = ((JBossWSGenerateWizard) this.getWizard()).getWebFile();
+ if (web == null || !web.exists()) {
+ setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NotDynamicWebProject);
+ return false;
+ }
+
+ try {
+ if ("" .equals(JBossWSCreationUtils.getJavaProjectSrcLocation(((JBossWSGenerateWizard) this.getWizard()).getProject()))) { //$NON-NLS-1$
+ setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoSrcInProject);
+ return false;
+ }
+ } catch (JavaModelException e) {
+ e.printStackTrace();
+ }
+
+ IStatus status = JBossWSGenerateWizardValidator.isWSNameValid();
+ if (status != null) {
+ setErrorMessage(status.getMessage());
+ return false;
+ }
+
+ IStatus classNameStatus = JBossWSGenerateWizardValidator.isWSClassValid(model
+ .getCustomClassName(), wizard.getProject());
+ if (classNameStatus != null) {
+ if (classNameStatus.getSeverity() == IStatus.ERROR) {
+ setMessage(classNameStatus.getMessage(), DialogPage.ERROR);
+ return false;
+ } else if (classNameStatus.getSeverity() == IStatus.WARNING) {
+ setMessage(classNameStatus.getMessage(), DialogPage.WARNING);
+ return true;
+ }
+ }
+
+ setMessage(JBossWSUIMessages.JBossWS_GenerateWizard_GenerateWizardPage_Description);
+ setErrorMessage(null);
+ return true;
+ }
+
+ private String[] getProjects() {
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
+ .getProjects();
+ ArrayList<String> dynamicProjects = new ArrayList<String>();
+ for (int i = 0; i < projects.length; i++) {
+ boolean isDynamicWebProject = JavaEEProjectUtilities
+ .isDynamicWebProject(projects[i]);
+ if (isDynamicWebProject) {
+ dynamicProjects.add(projects[i].getName());
+ }
+ }
+ return dynamicProjects.toArray(new String[dynamicProjects.size()]);
+ }
+
+ protected boolean hasChanged() {
+ return bHasChanged;
+ }
+}
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-07-20 06:29:52 UTC (rev 23577)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSGenerateWizardValidator.java 2010-07-20 08:36:09 UTC (rev 23578)
@@ -105,6 +105,39 @@
}
}
return null;
+ } else if (object instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
+ org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) object;
+ if (model != null) {
+ for (int i = 0; i < descriptors.length; i++) {
+ if (descriptors[i].getName().trim().length() == 0) {
+ return StatusUtils
+ .errorStatus(JBossWSUIMessages.Error_JBossWS_GenerateWizard_ServiceName_Empty);
+ }
+ List<?> theServlets = webApp.getServlets();
+ for (int j = 0; j < theServlets.size(); j++) {
+ org.eclipse.jst.j2ee.webapplication.Servlet aServlet = (org.eclipse.jst.j2ee.webapplication.Servlet) theServlets
+ .get(j);
+ if (aServlet.getServletName().equals(
+ descriptors[i].getName())) {
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same);
+ }
+ }
+ List<?> theServletMappings = webApp.getServletMappings();
+ for (int j = 0; j < theServletMappings.size(); j++) {
+ org.eclipse.jst.j2ee.webapplication.ServletMapping aServletMapping = (org.eclipse.jst.j2ee.webapplication.ServletMapping) theServletMappings
+ .get(j);
+ String url = aServletMapping.getUrlPattern();
+ if (aServletMapping.getServlet().getServletName().equals(
+ descriptors[i].getName())
+ || url.equals(descriptors[i].getMappings())) {
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same);
+ }
+ }
+ }
+ }
+ return null;
}
return null;
}
@@ -122,8 +155,8 @@
|| !JavaEEProjectUtilities.isDynamicWebProject(project)) {
return null;
} else {
- IStatus status = JBossWSUIUtils.validatePackageName(model
- .getCustomPackage(), JavaCore.create(project));
+ IStatus status = JBossWSUIUtils.validatePackageName(
+ model.getCustomPackage(), JavaCore.create(project));
if (status != null && status.getSeverity() == IStatus.ERROR) {
return status;
}
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23577 - in branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: dbm and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-07-20 02:29:52 -0400 (Tue, 20 Jul 2010)
New Revision: 23577
Removed:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/dbm/utils/
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java
Log:
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java 2010-07-20 06:24:19 UTC (rev 23576)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/RuntimeMetadata.java 2010-07-20 06:29:52 UTC (rev 23577)
@@ -184,7 +184,7 @@
if (inputPath != null) {
String resolvedFilePath;
try {
- resolvedFilePath = org.jboss.tools.smooks.dbm.utils.SmooksUIUtils.parseFilePath(inputPath.trim());
+ resolvedFilePath = SmooksUIUtils.parseFilePath(inputPath.trim());
} catch (Exception e) {
// It's not a valid config...
inputFile = new File(inputPath.trim());
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23574 - in trunk/xulrunner: plugins/org.mozilla.xulrunner.carbon.macosx.x86 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-20 00:49:41 -0400 (Tue, 20 Jul 2010)
New Revision: 23574
Modified:
trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx.x86/pom.xml
trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx.x86/pom.xml
Log:
fix artifactIDs for x86 plugins; fix ref in feature.xml
Modified: trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-07-20 04:25:50 UTC (rev 23573)
+++ trunk/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-07-20 04:49:41 UTC (rev 23574)
@@ -55,18 +55,20 @@
unpack="false"/>
<plugin
- id="org.mozilla.xulrunner.cocoa.macosx"
+ id="org.mozilla.xulrunner.cocoa.macosx.x86"
os="macosx"
ws="cocoa"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.mozilla.xulrunner.carbon.macosx"
+ id="org.mozilla.xulrunner.carbon.macosx.x86"
os="macosx"
ws="carbon"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx.x86/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx.x86/pom.xml 2010-07-20 04:25:50 UTC (rev 23573)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx.x86/pom.xml 2010-07-20 04:49:41 UTC (rev 23574)
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
- <artifactId>org.mozilla.xulrunner.carbon.macosx</artifactId>
+ <artifactId>org.mozilla.xulrunner.carbon.macosx.x86</artifactId>
<version>1.9.2</version>
<packaging>eclipse-plugin</packaging>
<build>
@@ -23,7 +23,7 @@
<environment>
<os>macosx</os>
<ws>carbon</ws>
- <arch></arch>
+ <arch>x86</arch>
</environment>
</environments>
</configuration>
Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx.x86/pom.xml
===================================================================
--- trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx.x86/pom.xml 2010-07-20 04:25:50 UTC (rev 23573)
+++ trunk/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx.x86/pom.xml 2010-07-20 04:49:41 UTC (rev 23574)
@@ -8,7 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.xulrunner.plugins</groupId>
- <artifactId>org.mozilla.xulrunner.cocoa.macosx</artifactId>
+ <artifactId>org.mozilla.xulrunner.cocoa.macosx.x86</artifactId>
<version>1.9.2</version>
<packaging>eclipse-plugin</packaging>
<build>
@@ -23,7 +23,7 @@
<environment>
<os>macosx</os>
<ws>cocoa</ws>
- <arch></arch>
+ <arch>x86</arch>
</environment>
</environments>
</configuration>
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23573 - in branches/jbosstools-3.2.0.M1/build: results and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-20 00:25:50 -0400 (Tue, 20 Jul 2010)
New Revision: 23573
Modified:
branches/jbosstools-3.2.0.M1/build/publish.sh
branches/jbosstools-3.2.0.M1/build/results/build.xml
Log:
port from trunk
Modified: branches/jbosstools-3.2.0.M1/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-19 22:06:20 UTC (rev 23572)
+++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-20 04:25:50 UTC (rev 23573)
@@ -102,6 +102,9 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
+ ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt"
+ fi
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
if [[ -f ${buildxml} ]]; then
ANT_SCRIPT=${buildxml}
@@ -136,14 +139,13 @@
# publish to download.jboss.org, unless errors found - avoid destroying last-good update site
if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
- # publish update site dir
+ # publish build dir (including update sites/zips/logs/metadata
if [[ -d ${STAGINGDIR} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/
+ date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/; # create a new unique dir
+ if [[ ${RELEASE} == "Yes" ]]; then
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME}/ # update existing snapshot dir
+ fi
fi
- # publish update site zip
- if [[ -f ${WORKSPACE}/results/${SNAPNAME} ]]; then
- date; rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/
- fi
# extra publish step for aggregate update sites ONLY
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
Modified: branches/jbosstools-3.2.0.M1/build/results/build.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/results/build.xml 2010-07-19 22:06:20 UTC (rev 23572)
+++ branches/jbosstools-3.2.0.M1/build/results/build.xml 2010-07-20 04:25:50 UTC (rev 23573)
@@ -6,6 +6,9 @@
<!-- should be set by Hudson -->
<!-- <property name="JOB_NAME" value="jbosstools-3.2.0.M2.continuous" /> -->
+ <!-- if a different template file (eg., a partially expanded one) should be used, feed it in here -->
+ <property name="template.file" value="download-template.xml" />
+
<!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
<condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}">
<available file="${WORKSPACE}/results" />
@@ -89,7 +92,7 @@
<target name="build.results" depends="init">
<!--
1. resolve variables in download-template.xml to produce download.xml
- 2. XSL transform download.xml to produce download.snippet.txt
+ 2. XSL transform download.xml to produce download-snippet.txt
3. manually copy the contents of this file into a page under
http://www.jboss.org/tools/downloads/
-->
@@ -129,13 +132,23 @@
</and>
<then>
<if>
- <equals arg1="${filename}" arg2="${JOB_NAME}-Sources-${ZIPSUFFIX}.zip" />
+ <!-- only set the update variable if it's NOT coming from the aggregate build -->
+ <and>
+ <equals arg1="${filename}" arg2="${JOB_NAME}-Sources-${ZIPSUFFIX}.zip" />
+ <not>
+ <contains string="${JOB_NAME}" substring="aggregate" />
+ </not>
+ </and>
<then>
<var name="COMPONENT" unset="true" />
<var name="COMPONENT" value="sources" />
</then>
<elseif>
- <equals arg1="${filename}" arg2="${JOB_NAME}-Update-${ZIPSUFFIX}.zip" />
+ <!-- only set the update variable if it's coming from the aggregate build; others should be ignored -->
+ <and>
+ <equals arg1="${filename}" arg2="${JOB_NAME}-Update-${ZIPSUFFIX}.zip" />
+ <contains string="${JOB_NAME}" substring="aggregate" />
+ </and>
<then>
<var name="COMPONENT" unset="true" />
<var name="COMPONENT" value="update" />
@@ -159,15 +172,67 @@
</sequential>
</for>
- <copy todir="${output.dir}" overwrite="true">
- <fileset file="download-template.xml" />
- <mapper type="merge" to="download.xml" />
- <filterchain>
- <expandproperties />
- </filterchain>
- </copy>
- <xslt in="${output.dir}/download.xml" out="${output.dir}/download-snippet.txt" style="download.xsl" />
- <delete file="${output.dir}/download.xml" />
+ <if>
+ <!-- default operation from template file -->
+ <equals arg1="${template.file}" arg2="download-template.xml" />
+ <then>
+ <copy todir="${output.dir}" overwrite="true">
+ <fileset file="${template.file}" />
+ <mapper type="merge" to="download.xml" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <xslt in="${output.dir}/download.xml" out="${output.dir}/download-snippet.txt" style="download.xsl" />
+ <delete file="${output.dir}/download.xml" />
+ </then>
+ <elseif>
+ <!-- use previously XLST'd file from an upstream build -->
+ <or>
+ <contains string="${template.file}" substring="http:" />
+ <contains string="${template.file}" substring="https:" />
+ <contains string="${template.file}" substring="ftp:" />
+ </or>
+ <then>
+ <propertyregex property="template.file.cleaned"
+ input="${template.file}"
+ defaultvalue="${template.file}"
+ regexp=".+/([^/]+)"
+ replace="\1"
+ override="true" />
+ <get src="${template.file}" dest="${output.dir}/${template.file.cleaned}.in" ignoreerrors="true" />
+ <if>
+ <available file="${output.dir}/${template.file.cleaned}.in" type="file" />
+ <then>
+ <!-- use pre-existing snippet file -->
+ <copy todir="${output.dir}" overwrite="true">
+ <fileset file="${template.file.cleaned}.in" />
+ <mapper type="merge" to="download-snippet.txt" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <delete file="${output.dir}/${template.file.cleaned}.in" quiet="true" />
+ </then>
+ <else>
+ <!-- fall back to default template file -->
+ <var name="template.file" value="download-template.xml" />
+ <copy todir="${output.dir}" overwrite="true">
+ <fileset file="${template.file}" />
+ <mapper type="merge" to="download.xml" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <xslt in="${output.dir}/download.xml"
+ out="${output.dir}/download-snippet.txt"
+ style="download.xsl" />
+ <delete file="${output.dir}/download.xml" />
+ </else>
+ </if>
+ </then>
+ </elseif>
+ </if>
</target>
</project>
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23572 - in trunk: deltacloud and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-07-19 18:06:20 -0400 (Mon, 19 Jul 2010)
New Revision: 23572
Added:
trunk/deltacloud/
trunk/deltacloud/features/
trunk/deltacloud/plugins/
trunk/deltacloud/tests/
Log:
add initial deltacloud structure
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23570 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF and 15 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-19 17:05:39 -0400 (Mon, 19 Jul 2010)
New Revision: 23570
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF
Log:
remove version ranges to support xulrunner 1.9.2
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -9,7 +9,7 @@
org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.jst.jsp,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.jsf.vpe.richfaces;bundle-version="2.1.0",
org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0",
org.eclipse.jface.text;bundle-version="3.5.0"
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -13,7 +13,7 @@
org.jboss.tools.vpe,
org.eclipse.core.resources,
org.jboss.tools.jst.jsp,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.eclipse.jface.text;bundle-version="3.5.0"
Export-Package: org.jboss.tools.jsf.vpe.facelets,
org.jboss.tools.jsf.vpe.facelets.template
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -7,7 +7,7 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.vpe.html,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.vpe,
org.jboss.tools.jsf.vpe.jsf,
org.jboss.tools.common,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -9,7 +9,7 @@
org.eclipse.core.runtime,
org.jboss.tools.common,
org.jboss.tools.vpe,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.jst.web,
org.jboss.tools.jst.jsp,
org.eclipse.wst.sse.core,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -9,7 +9,7 @@
org.eclipse.core.runtime,
org.jboss.tools.common,
org.jboss.tools.vpe,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.jst.jsp,
org.eclipse.wst.sse.core,
org.eclipse.jst.jsp.core,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -9,7 +9,7 @@
org.eclipse.core.runtime,
org.jboss.tools.common,
org.jboss.tools.vpe,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.jst.jsp,
org.eclipse.jface.text;bundle-version="3.5.0"
Bundle-ActivationPolicy: lazy
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -13,11 +13,11 @@
org.eclipse.wst.sse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.ide,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.eclipse.wst.sse.core,
org.jboss.tools.vpe.xulrunner,
- org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.jsf;bundle-version="3.1.0"
+ org.jboss.tools.jsf.vpe.facelets,
+ org.jboss.tools.jsf.vpe.jsf
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-ClassPath: lib/jhighlight-1.0.jar,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -13,7 +13,7 @@
org.eclipse.wst.sse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.ide,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0",
org.eclipse.jface.text;bundle-version="3.5.0",
org.eclipse.wst.sse.core;bundle-version="1.1.4",
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -16,31 +16,31 @@
org.jboss.tools.jst.jsp,
org.jboss.tools.jst.web,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.jsf.vpe.jsf;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0",
- org.jboss.tools.vpe.html;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.ajax4jsf;bundle-version="3.1.0",
+ org.mozilla.xpcom,
+ org.jboss.tools.jsf.vpe.jsf,
+ org.jboss.tools.jsf.vpe.facelets,
+ org.jboss.tools.vpe.html,
+ org.jboss.tools.jsf.vpe.ajax4jsf,
org.jboss.tools.jsf.vpe.jbpm;bundle-version="1.0.0",
- org.jboss.tools.jsf.vpe.jstl;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.myfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.richfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.seam;bundle-version="3.1.0",
- org.jboss.tools.jsf;bundle-version="3.1.0",
- org.jboss.tools.jsf.ui;bundle-version="3.1.0",
- org.jboss.tools.jst.text.ext;bundle-version="3.1.0",
- org.jboss.tools.jst.web.ui;bundle-version="3.1.0",
- org.jboss.tools.common.el.core;bundle-version="3.1.0",
- org.jboss.tools.common.el.ui;bundle-version="3.1.0",
- org.jboss.tools.common.model.ui;bundle-version="3.1.0",
- org.jboss.tools.common.resref.ui;bundle-version="3.1.0",
- org.jboss.tools.common.ui;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext.facelets;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0",
- org.jboss.tools.vpe.jsp;bundle-version="3.1.0",
- org.jboss.tools.vpe.resref;bundle-version="3.1.0",
- org.jboss.tools.vpe.ui.palette;bundle-version="3.1.0"
+ org.jboss.tools.jsf.vpe.jstl,
+ org.jboss.tools.jsf.vpe.myfaces,
+ org.jboss.tools.jsf.vpe.richfaces,
+ org.jboss.tools.jsf.vpe.seam,
+ org.jboss.tools.jsf,
+ org.jboss.tools.jsf.ui,
+ org.jboss.tools.jst.text.ext,
+ org.jboss.tools.jst.web.ui,
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.common.el.ui,
+ org.jboss.tools.common.model.ui,
+ org.jboss.tools.common.resref.ui,
+ org.jboss.tools.common.ui,
+ org.jboss.tools.jsf.text.ext,
+ org.jboss.tools.jsf.text.ext.facelets,
+ org.jboss.tools.jsf.text.ext.richfaces,
+ org.jboss.tools.vpe.jsp,
+ org.jboss.tools.vpe.resref,
+ org.jboss.tools.vpe.ui.palette
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.facelets.test
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -15,7 +15,7 @@
org.jboss.tools.common.text.ext,
org.jboss.tools.common.model,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.vpe.ui.test;visibility:=reexport,
org.eclipse.jface.text,
org.jboss.tools.jsf.vpe.jsf,
@@ -30,18 +30,18 @@
org.eclipse.jdt.ui;bundle-version="3.5.0",
org.jboss.tools.common.ui,
org.jboss.tools.jst.web.ui;bundle-version="2.0.0",
- org.jboss.tools.vpe.jsp;bundle-version="3.1.0",
- org.jboss.tools.vpe.html;bundle-version="3.1.0",
+ org.jboss.tools.vpe.jsp,
+ org.jboss.tools.vpe.html,
org.jboss.tools.jsf.vpe.jsf,
- org.jboss.tools.jsf.vpe.ajax4jsf;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.richfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.myfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.jstl;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext.facelets;bundle-version="3.1.0",
- org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0",
- org.jboss.tools.jst.text.ext;bundle-version="3.1.0"
+ org.jboss.tools.jsf.vpe.ajax4jsf,
+ org.jboss.tools.jsf.vpe.facelets,
+ org.jboss.tools.jsf.vpe.richfaces,
+ org.jboss.tools.jsf.vpe.myfaces,
+ org.jboss.tools.jsf.vpe.jstl,
+ org.jboss.tools.jsf.text.ext,
+ org.jboss.tools.jsf.text.ext.facelets,
+ org.jboss.tools.jsf.text.ext.richfaces,
+ org.jboss.tools.jst.text.ext
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.jboss.tools.jsf.vpe.jsf.test
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -9,17 +9,17 @@
org.junit,
org.eclipse.ui.ide,
org.jboss.tools.jst.jsp,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.vpe.ui.test,
org.jboss.tools.common.el.core;bundle-version="2.0.0",
- org.jboss.tools.jsf.vpe.richfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.ajax4jsf;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.jsf;bundle-version="3.1.0",
- org.jboss.tools.vpe.html;bundle-version="3.1.0",
- org.jboss.tools.vpe.jsp;bundle-version="3.1.0",
- org.jboss.tools.vpe.resref;bundle-version="3.1.0",
- org.jboss.tools.vpe.xulrunner;bundle-version="3.1.0"
+ org.jboss.tools.jsf.vpe.richfaces,
+ org.jboss.tools.jsf.vpe.ajax4jsf,
+ org.jboss.tools.jsf.vpe.facelets,
+ org.jboss.tools.jsf.vpe.jsf,
+ org.jboss.tools.vpe.html,
+ org.jboss.tools.vpe.jsp,
+ org.jboss.tools.vpe.resref,
+ org.jboss.tools.vpe.xulrunner
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.richfaces.test
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -14,11 +14,11 @@
org.jboss.tools.vpe.ui.test,
org.jboss.tools.jst.jsp,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.richfaces;bundle-version="3.1.0",
- org.jboss.tools.jsf.vpe.seam;bundle-version="3.1.0",
- org.jboss.tools.vpe.html;bundle-version="3.1.0"
+ org.mozilla.xpcom,
+ org.jboss.tools.jsf.vpe.facelets,
+ org.jboss.tools.jsf.vpe.richfaces,
+ org.jboss.tools.jsf.vpe.seam,
+ org.jboss.tools.vpe.html
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jsf.vpe.seam.test
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -16,9 +16,9 @@
org.jboss.tools.common.text.ext,
org.jboss.tools.common.model,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.vpe.ui.test,
- org.jboss.tools.vpe.html;bundle-version="3.1.0"
+ org.jboss.tools.vpe.html
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -14,8 +14,8 @@
org.jboss.tools.vpe.ui.test,
org.jboss.tools.jst.jsp,
org.jboss.tools.vpe.xulrunner,
- org.mozilla.xpcom;bundle-version="1.9.1",
- org.jboss.tools.vpe.jsp;bundle-version="3.1.0"
+ org.mozilla.xpcom,
+ org.jboss.tools.vpe.jsp
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.jsp.test
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -18,17 +18,17 @@
org.jboss.tools.common.text.ext;bundle-version="2.0.0",
org.jboss.tools.jst.web;bundle-version="2.0.0",
org.hamcrest;bundle-version="1.1.0",
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.mozilla.xpcom,
org.jboss.tools.vpe.xulrunner;bundle-version="2.1.0",
org.eclipse.jface.text;bundle-version="3.5.0",
org.jboss.tools.jst.jsp;bundle-version="2.0.0",
org.junit4,
org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
- org.jboss.tools.vpe.docbook;bundle-version="3.1.0",
- org.jboss.tools.vpe.html;bundle-version="3.1.0",
- org.jboss.tools.vpe.jsp;bundle-version="3.1.0",
- org.jboss.tools.vpe.resref;bundle-version="3.1.0",
- org.jboss.tools.vpe.ui.palette;bundle-version="3.1.0"
+ org.jboss.tools.vpe.docbook,
+ org.jboss.tools.vpe.html,
+ org.jboss.tools.vpe.jsp,
+ org.jboss.tools.vpe.resref,
+ org.jboss.tools.vpe.ui.palette
Eclipse-RegisterBuddy: org.apache.log4j
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -12,12 +12,12 @@
org.eclipse.ui.ide,
org.jboss.tools.jst.jsp,
org.jboss.tools.jst.css,
- org.jboss.tools.vpe.xulrunner;bundle-version="3.1.0",
- org.mozilla.xpcom;bundle-version="1.9.1",
+ org.jboss.tools.vpe.xulrunner,
+ org.mozilla.xpcom,
org.eclipse.jface.text,
- org.jboss.tools.common.model.ui;bundle-version="3.1.0",
- org.jboss.tools.tests;bundle-version="3.1.0";visibility:=reexport,
- org.jboss.tools.vpe.resref;bundle-version="3.1.0",
+ org.jboss.tools.common.model.ui,
+ org.jboss.tools.tests;visibility:=reexport,
+ org.jboss.tools.vpe.resref,
javax.servlet;bundle-version="2.5.0",
org.eclipse.wst.xml.xpath.core
Bundle-ActivationPolicy: lazy
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF 2010-07-19 20:25:11 UTC (rev 23569)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF 2010-07-19 21:05:39 UTC (rev 23570)
@@ -10,8 +10,8 @@
org.junit,
org.jboss.tools.common,
org.jboss.tools.vpe.xulrunner,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.mozilla.xpcom;bundle-version="1.9.1"
+ org.jboss.tools.tests,
+ org.mozilla.xpcom
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.vpe.xulrunner.test,
org.jboss.tools.vpe.xulrunner.view
15 years, 9 months
- 1
- 0
JBoss Tools SVN: r23569 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-19 16:25:11 -0400 (Mon, 19 Jul 2010)
New Revision: 23569
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml
Log:
bump up feature to 1.9.2
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-07-19 20:24:45 UTC (rev 23568)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-07-19 20:25:11 UTC (rev 23569)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.vpe.features</groupId>
<artifactId>org.jboss.tools.xulrunner.feature</artifactId>
- <version>1.9.12.qualifier</version>
+ <version>1.9.2.qualifier</version>
<packaging>eclipse-feature</packaging>
</project>
15 years, 9 months
- 1
- 0