JBoss Tools SVN: r33163 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.
by jbosstools-commits@lists.jboss.org
Author: psrna
Date: 2011-07-25 05:04:19 -0400 (Mon, 25 Jul 2011)
New Revision: 33163
Modified:
trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
Log:
bot tests added to the bottest-site
Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
===================================================================
--- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:03:10 UTC (rev 33162)
+++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:04:19 UTC (rev 33163)
@@ -37,20 +37,20 @@
<!-- <plugin id="org.jboss.tools.bpmn.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
<plugin id="org.jboss.tools.bpel.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
-<!-- <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
+ <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.hibernate.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<!-- <plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.jst.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.maven.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.modeshape.rest.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.seam.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
+ <plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.jst.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.maven.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.modeshape.rest.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.seam.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<!-- <plugin id="org.jboss.tools.smooks.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.struts.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.vpe.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
-<!-- <plugin id="org.jboss.tools.ws.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
+ <plugin id="org.jboss.tools.struts.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.vpe.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.ws.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
</feature>
14 years, 5 months
JBoss Tools SVN: r33162 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/META-INF and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-25 05:03:10 -0400 (Mon, 25 Jul 2011)
New Revision: 33162
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferences/
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferences/ServerTypePreferencePage.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
Log:
JBIDE-1354 - UI preparation by creation of a superclass
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java 2011-07-25 02:23:15 UTC (rev 33161)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/DefaultFilesetPreferencePage.java 2011-07-25 09:03:10 UTC (rev 33162)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ide.eclipse.archives.webtools.filesets;
import java.util.ArrayList;
@@ -2,272 +12,83 @@
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.ui.preferences.ServerTypePreferencePage;
-public class DefaultFilesetPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage {
-
- private Combo servers;
- private TreeViewer viewer;
- private Button addButton;
- private Button removeButton;
- private HashMap<String, ArrayList<Fileset>> cacheMap
- = new HashMap<String, ArrayList<Fileset>>();
- private ArrayList<String> changed = new ArrayList<String>();
-
- public DefaultFilesetPreferencePage() {
- }
-
- public DefaultFilesetPreferencePage(String title) {
- super(title);
- }
-
- public DefaultFilesetPreferencePage(String title, ImageDescriptor image) {
- super(title, image);
- }
-
- public void init(IWorkbench workbench) {
- }
-
+public class DefaultFilesetPreferencePage extends ServerTypePreferencePage {
+ private FilesetPreferenceComposite rootComp;
@Override
protected Control createContents(Composite parent) {
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayout(new FormLayout());
- c.setLayoutData(new GridData(GridData.FILL_BOTH));
- Label l = new Label(c, SWT.None);
- l.setText(Messages.DefaultFilesetsLabel);
- l.setLayoutData(createFormData(0,5,null,0,0,5,100,-5));
-
- servers = new Combo(c, SWT.READ_ONLY);
- servers.setLayoutData(createFormData(l,5,null,0,0,5,null,0));
- servers.setItems(getComboItems());
-
- viewer = new TreeViewer(c);
- viewer.getTree().setLayoutData(createFormData(
- servers,5,100,-5,0,5,80,0));
- viewer.setLabelProvider(getLabelProvider());
- viewer.setContentProvider(getContentProvider());
-
- addButton = new Button(c, SWT.PUSH);
- addButton.setText(Messages.DefaultFilesetsAdd);
- addButton.setLayoutData(createFormData(
- servers,5,null,0,viewer.getTree(),5,100,-5));
- removeButton = new Button(c, SWT.PUSH);
- removeButton.setText(Messages.DefaultFilesetsRemove);
- removeButton.setLayoutData(createFormData(
- addButton,5,null,0,viewer.getTree(),5,100,-5));
-
- servers.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- public void widgetSelected(SelectionEvent e) {
- getCurrentServerSets();
- viewer.refresh();
- } });
-
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- addPressed();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- removePressed();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
- servers.select(0);
- getCurrentServerSets();
- viewer.setInput(ResourcesPlugin.getWorkspace());
- c.layout();
- return c;
+ rootComp = new FilesetPreferenceComposite(parent, SWT.NONE);
+ rootComp.setLayoutData(new GridData(GridData.FILL_BOTH));
+ rootComp.layout();
+ return rootComp;
}
-
- protected void addPressed() {
- FilesetDialog d = new FilesetDialog(addButton.getShell(), "", null); //$NON-NLS-1$
- d.setShowViewer(false);
- if( d.open() == Window.OK) {
- Fileset fs = d.getFileset();
- String id = getCurrentId();
- cacheMap.get(id).add(fs);
- if( !changed.contains(id))
- changed.add(id);
- viewer.refresh();
+
+ public boolean performOk() {
+ String[] changed2 = rootComp.getChanged();
+ ArrayList<Object> list;
+ Fileset[] arr;
+ for( int i = 0; i < changed2.length; i++ ) {
+ list = rootComp.getDataForServer(changed2[i]);
+ arr = (Fileset[]) list.toArray(new Fileset[list.size()]);
+ IPath fileToWrite = FilesetUtil.DEFAULT_FS_ROOT.append(changed2[i]);
+ FilesetUtil.saveFilesets(fileToWrite.toFile(), arr);
}
- }
+ rootComp.clearChanged();
+ return true;
+ }
- protected void removePressed() {
- Fileset fs = null;
- IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
- fs = (Fileset)sel.getFirstElement();
- if( fs != null ) {
- String id = getCurrentId();
- cacheMap.get(id).remove(fs);
- if( !changed.contains(id))
- changed.add(id);
- viewer.refresh();
- }
- }
+ public static class FilesetPreferenceComposite extends ServerTypePreferenceComposite {
- protected String getCurrentId() {
- int index = servers.getSelectionIndex();
- if( index == 0 )
- return FilesetUtil.DEFAULT_FS_ALL_SERVERS;
- if( index == -1 )
- return null;
- IServerType type = getServerTypes()[index-1];
- String id = type.getId();
- return id;
- }
- protected Fileset[] getCurrentServerSets() {
- String id = getCurrentId();
- List<Fileset> list = new ArrayList<Fileset>();
- if( id != null ) {
- list = cacheMap.get(id);
- if( list == null ) {
- IPath fileToRead = FilesetUtil.DEFAULT_FS_ROOT.append(id);
- Fileset[] sets = FilesetUtil.loadFilesets(fileToRead.toFile(), null);
- list = Arrays.asList(sets);
- cacheMap.put(id, new ArrayList<Fileset>(list));
- }
+ public FilesetPreferenceComposite(Composite parent, int style) {
+ super(parent, style);
}
- return (Fileset[]) list.toArray(new Fileset[list.size()]);
- }
-
- protected LabelProvider getLabelProvider() {
- return new FilesetLabelProvider();
- }
-
- protected ITreeContentProvider getContentProvider() {
- return new ITreeContentProvider() {
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ public String getDescriptionLabel() {
+ return Messages.DefaultFilesetsLabel;
+ }
+ protected void addPressed() {
+ FilesetDialog d = new FilesetDialog(addButton.getShell(), "", null); //$NON-NLS-1$
+ d.setShowViewer(false);
+ if( d.open() == Window.OK) {
+ Fileset fs = d.getFileset();
+ addObject(fs);
}
-
- public void dispose() {
- }
- public Object[] getElements(Object inputElement) {
- return getCurrentServerSets();
- }
- public boolean hasChildren(Object element) {
- return false;
- }
- public Object getParent(Object element) {
- return null;
- }
- public Object[] getChildren(Object parentElement) {
- return null;
- }
- };
- }
-
- private String[] getComboItems() {
- ArrayList<String> list = new ArrayList<String>();
- IServerType[] types = getServerTypes();
- list.add(Messages.DefaultFilesetsAllServerTypes);
- for( int i = 0; i < types.length; i++ )
- list.add(types[i].getName());
- return (String[]) list.toArray(new String[list.size()]);
- }
-
- private IServerType[] types = null;
- private IServerType[] getServerTypes() {
- if( types == null ) {
- ArrayList<IServerType> sorted = new ArrayList<IServerType>();
- ArrayList<IServerType> all = new ArrayList(
- Arrays.asList( ServerCore.getServerTypes()));
- Iterator<IServerType> i = all.iterator();
- IServerType t;
- while(i.hasNext()) {
- t = i.next();
- if( t.getId().startsWith("org.jboss.ide.eclipse.as.")) {//$NON-NLS-1$
- sorted.add(t);
- i.remove();
- }
- }
- sorted.addAll(all);
- types = (IServerType[]) sorted.toArray(new IServerType[sorted.size()]);
}
- return types;
- }
- private FormData createFormData(Object topStart, int topOffset,
- Object bottomStart, int bottomOffset, Object leftStart,
- int leftOffset, Object rightStart, int rightOffset) {
- FormData data = new FormData();
-
- if (topStart != null) {
- data.top = topStart instanceof Control ? new FormAttachment(
- (Control) topStart, topOffset) : new FormAttachment(
- ((Integer) topStart).intValue(), topOffset);
+ protected LabelProvider getLabelProvider() {
+ return new FilesetLabelProvider();
}
-
- if (bottomStart != null) {
- data.bottom = bottomStart instanceof Control ? new FormAttachment(
- (Control) bottomStart, bottomOffset) : new FormAttachment(
- ((Integer) bottomStart).intValue(), bottomOffset);
+
+ protected void initializeDataModel() {
+ super.initializeDataModel();
}
- if (leftStart != null) {
- data.left = leftStart instanceof Control ? new FormAttachment(
- (Control) leftStart, leftOffset) : new FormAttachment(
- ((Integer) leftStart).intValue(), leftOffset);
+ protected Object[] getCurrentServerDataModel() {
+ return getCurrentServerSets();
}
-
- if (rightStart != null) {
- data.right = rightStart instanceof Control ? new FormAttachment(
- (Control) rightStart, rightOffset) : new FormAttachment(
- ((Integer) rightStart).intValue(), rightOffset);
+
+ protected Fileset[] getCurrentServerSets() {
+ String id = getCurrentId();
+ ArrayList<Object> list = new ArrayList<Object>();
+ if( id != null ) {
+ list = getDataForServer(id);
+ if( list == null ) {
+ IPath fileToRead = FilesetUtil.DEFAULT_FS_ROOT.append(id);
+ Fileset[] sets = FilesetUtil.loadFilesets(fileToRead.toFile(), null);
+ list = new ArrayList<Object>();
+ list.addAll(Arrays.asList(sets));
+ cacheMap.put(id, list);
+ }
+ }
+ return (Fileset[]) list.toArray(new Fileset[list.size()]);
}
- return data;
- }
-
- public boolean performOk() {
- String[] changed2 = (String[]) changed.toArray(new String[changed.size()]);
- ArrayList<Fileset> list;
- Fileset[] arr;
- for( int i = 0; i < changed2.length; i++ ) {
- list = cacheMap.get(changed2[i]);
- arr = (Fileset[]) list.toArray(new Fileset[list.size()]);
- IPath fileToWrite = FilesetUtil.DEFAULT_FS_ROOT.append(changed2[i]);
- FilesetUtil.saveFilesets(fileToWrite.toFile(), arr);
- }
- changed.clear();
- return true;
- }
-
+ } // end inner class
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2011-07-25 02:23:15 UTC (rev 33161)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/Fileset.java 2011-07-25 09:03:10 UTC (rev 33162)
@@ -50,10 +50,12 @@
*/
public String getFolder() {
String tmp = folder == null ? "" : folder; //$NON-NLS-1$
- tmp = tmp.replace("${jboss_config_dir}", //$NON-NLS-1$
- "${jboss_config_dir:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
- tmp = tmp.replace("${jboss_config}", //$NON-NLS-1$
- "${jboss_config:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+ if( server != null ) {
+ tmp = tmp.replace("${jboss_config_dir}", //$NON-NLS-1$
+ "${jboss_config_dir:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+ tmp = tmp.replace("${jboss_config}", //$NON-NLS-1$
+ "${jboss_config:" + server.getName() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
try {
StringSubstitutionEngine engine = new StringSubstitutionEngine();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-07-25 02:23:15 UTC (rev 33161)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-07-25 09:03:10 UTC (rev 33162)
@@ -57,6 +57,7 @@
org.jboss.ide.eclipse.as.ui.dialogs,
org.jboss.ide.eclipse.as.ui.editor,
org.jboss.ide.eclipse.as.ui.launch,
+ org.jboss.ide.eclipse.as.ui.preferences,
org.jboss.ide.eclipse.as.ui.views,
org.jboss.ide.eclipse.as.ui.views.server.extensions,
org.jboss.ide.eclipse.as.ui.wizards,
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferences/ServerTypePreferencePage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferences/ServerTypePreferencePage.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferences/ServerTypePreferencePage.java 2011-07-25 09:03:10 UTC (rev 33162)
@@ -0,0 +1,397 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ide.eclipse.as.ui.preferences;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+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.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.ui.UIUtil;
+
+public class ServerTypePreferencePage extends PreferencePage implements
+ IWorkbenchPreferencePage {
+
+ public ServerTypePreferencePage() {
+ }
+
+ public ServerTypePreferencePage(String title) {
+ super(title);
+ }
+
+ public ServerTypePreferencePage(String title, ImageDescriptor image) {
+ super(title, image);
+ }
+
+ public void init(IWorkbench workbench) {
+ }
+
+ @Override
+ protected Control createContents(Composite parent) {
+ ServerTypePreferenceComposite c = new ServerTypePreferenceComposite(parent, SWT.NONE);
+ c.setLayoutData(new GridData(GridData.FILL_BOTH));
+ c.layout();
+ return c;
+ }
+
+ public static class ServerTypePreferenceComposite extends Composite {
+
+ protected ArrayList<String> changed;
+ protected HashMap<String, ArrayList<Object>> cacheMap;
+
+ protected Combo servers;
+ protected TreeViewer viewer;
+ protected Button addButton;
+ protected Button removeButton;
+ protected Button moveUp;
+ protected Button moveDown;
+ public ServerTypePreferenceComposite(Composite parent, int style) {
+ super(parent, style);
+ setLayout(new FormLayout());
+ Label l = new Label(this, SWT.None);
+ l.setText(getDescriptionLabel());
+ l.setLayoutData(createFormData(0,5,null,0,0,5,100,-5));
+
+ servers = new Combo(this, SWT.READ_ONLY);
+ servers.setLayoutData(createFormData(l,5,null,0,0,5,null,0));
+ servers.setItems(getComboItems());
+
+ viewer = new TreeViewer(this);
+ viewer.getTree().setLayoutData(createFormData(
+ servers,5,100,-5,0,5,80,0));
+ viewer.setLabelProvider(getLabelProvider());
+ viewer.setContentProvider(getContentProvider());
+ viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleViewerSelectionChanged();
+ }
+ });
+
+
+ Composite buttonWrapper = new Composite(this, SWT.NONE);
+ buttonWrapper.setLayoutData(createFormData(servers,5,null,0,viewer.getTree(),5,100,-5));
+ buttonWrapper.setLayout(new GridLayout(1, true));
+
+ createRightColumnButtons(buttonWrapper);
+ servers.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ public void widgetSelected(SelectionEvent e) {
+ getCurrentServerDataModel(); // force load
+ viewer.refresh();
+ updateMoveUpMoveDown();
+ } });
+
+ servers.select(0);
+ initializeDataModel(); // force load
+ viewer.setInput(ResourcesPlugin.getWorkspace());
+ updateMoveUpMoveDown();
+ }
+
+ protected void handleViewerSelectionChanged() {
+ updateMoveUpMoveDown();
+ }
+ protected void updateMoveUpMoveDown() {
+ boolean enableUp = true;
+ boolean enableDown = true;
+ IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
+ if( sel != null ) {
+ if( sel.size() > 1 || sel.size() == 0 ) {
+ enableUp = false;
+ enableDown = false;
+ }
+ if( sel.getFirstElement() == null ) {
+ enableUp = enableDown = false;
+ } else {
+ Object selected = sel.getFirstElement();
+ Object[] arr = getCurrentServerDataModel();
+ ArrayList<Object> asList = new ArrayList<Object>();
+ asList.addAll(Arrays.asList(arr));
+ int index = asList.indexOf(selected);
+ if( index == 0 ) {
+ enableUp = false;
+ }
+ if( index == arr.length - 1) {
+ enableDown = false;
+ }
+ }
+ }
+ if( moveUp != null )
+ moveUp.setEnabled(enableUp);
+ if( moveDown != null )
+ moveDown.setEnabled(enableDown);
+ }
+
+ protected void initializeDataModel() {
+ cacheMap = new HashMap<String, ArrayList<Object>>();
+ changed = new ArrayList<String>();
+ getCurrentServerDataModel();
+ }
+
+ public String getDescriptionLabel() {
+ return "Desc label";
+ }
+ protected void createRightColumnButtons(Composite c) {
+ insertAddRemove(c);
+ insertMoveUpDown(c);
+ }
+
+ protected void insertAddRemove(Composite c) {
+ addButton = new Button(c, SWT.PUSH);
+ addButton.setText("Add...");
+ addButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ removeButton = new Button(c, SWT.PUSH);
+ removeButton.setText("Remove");
+ removeButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ addButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ addPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+ removeButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ removePressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ }
+
+ protected void insertMoveUpDown(Composite c) {
+ moveUp = new Button(c, SWT.PUSH);
+ moveUp.setText("MoveUp");
+ moveUp.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ moveDown = new Button(c, SWT.PUSH);
+ moveDown.setText("Move down");
+ moveDown.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ moveUp.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ moveUpPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+ moveDown.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ moveDownPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ }
+ protected Object[] getCurrentServerDataModel() {
+ return new Object[]{};
+ }
+
+
+ protected void addObject(Object o) {
+ if( o != null ) {
+ String id = getCurrentId();
+ cacheMap.get(id).add(o);
+ if( !changed.contains(id))
+ changed.add(id);
+ viewer.refresh();
+ }
+ }
+
+ protected void removeObject(Object o) {
+ if( o != null ) {
+ String id = getCurrentId();
+ cacheMap.get(id).remove(o);
+ if( !changed.contains(id))
+ changed.add(id);
+ viewer.refresh();
+ }
+ }
+
+ protected void removePressed() {
+ IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
+ Object o = sel.getFirstElement();
+ removeObject(o);
+ }
+ protected void addPressed() {
+ // TODO
+ }
+
+ protected void moveUpPressed() {
+ IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
+ Object fs = (Object)sel.getFirstElement();
+ String id = getCurrentId();
+ Object[] sets = getCurrentServerDataModel();
+ ArrayList<Object> asList = new ArrayList<Object>();
+ asList.addAll(Arrays.asList(sets));
+ int ind = asList.indexOf(fs);
+ asList.remove(ind);
+ asList.add(ind-1, fs);
+ cacheMap.put(id, asList);
+ if( !changed.contains(id))
+ changed.add(id);
+ updateMoveUpMoveDown();
+ viewer.refresh();
+ }
+
+ protected void moveDownPressed() {
+ IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
+ Object fs = (Object)sel.getFirstElement();
+ String id = getCurrentId();
+ Object[] sets = getCurrentServerDataModel();
+ ArrayList<Object> asList = new ArrayList<Object>();
+ asList.addAll(Arrays.asList(sets));
+ int ind = asList.indexOf(fs);
+ asList.remove(ind);
+ asList.add(ind+1, fs);
+ cacheMap.put(id, asList);
+ if( !changed.contains(id))
+ changed.add(id);
+ updateMoveUpMoveDown();
+ viewer.refresh();
+ }
+
+ protected String getCurrentId() {
+ int index = servers.getSelectionIndex();
+ if( showAllServerTypeOption() && index == 0 )
+ return "All Servers";
+ if( index == -1 )
+ return null;
+ int i2 = showAllServerTypeOption() ? index - 1 : index;
+ IServerType type = getServerTypes()[i2];
+ String id = type.getId();
+ return id;
+ }
+
+ public ArrayList<Object> getDataForServer(String serverId) {
+ return cacheMap.get(serverId);
+ }
+
+ protected LabelProvider getLabelProvider() {
+ return new LabelProvider();
+ }
+
+ protected ITreeContentProvider getContentProvider() {
+ return new ITreeContentProvider() {
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+
+ public void dispose() {
+ }
+ public Object[] getElements(Object inputElement) {
+ return getCurrentServerDataModel();
+ }
+ public boolean hasChildren(Object element) {
+ return false;
+ }
+ public Object getParent(Object element) {
+ return null;
+ }
+ public Object[] getChildren(Object parentElement) {
+ return null;
+ }
+ };
+ }
+
+ // Return true if all server types, false if only jbt server types
+ protected boolean getAllServerTypes() {
+ return true;
+ }
+ // Return true if we show a combo option for "all server types" or not
+ protected boolean showAllServerTypeOption() {
+ return true;
+ }
+
+
+ private String[] getComboItems() {
+ ArrayList<String> list = new ArrayList<String>();
+ if( showAllServerTypeOption())
+ list.add(0,"All Server Types");
+ IServerType[] types = getServerTypes();
+ for( int i = 0; i < types.length; i++ )
+ list.add(types[i].getName());
+ return (String[]) list.toArray(new String[list.size()]);
+ }
+
+ private IServerType[] types = null;
+ private IServerType[] getServerTypes() {
+ if( types == null ) {
+ ArrayList<IServerType> retval = new ArrayList<IServerType>();
+ ArrayList<IServerType> all = new ArrayList<IServerType>(
+ Arrays.asList( ServerCore.getServerTypes()));
+ if( !getAllServerTypes()) {
+ Iterator<IServerType> i = all.iterator();
+ IServerType t;
+ while(i.hasNext()) {
+ t = i.next();
+ if( !t.getId().startsWith("org.jboss.ide.eclipse.as.")) {//$NON-NLS-1$
+ i.remove();
+ }
+ }
+ }
+ retval = all;
+ Collections.sort(retval, new Comparator<IServerType>(){
+ public int compare(IServerType o1, IServerType o2) {
+ return o1.getName().compareTo(o2.getName());
+ }});
+ types = (IServerType[]) all.toArray(new IServerType[all.size()]);
+ }
+ return types;
+ }
+
+ private FormData createFormData(Object topStart, int topOffset,
+ Object bottomStart, int bottomOffset, Object leftStart,
+ int leftOffset, Object rightStart, int rightOffset) {
+ return UIUtil.createFormData2(topStart, topOffset, bottomStart, bottomOffset, leftStart, leftOffset, rightStart, rightOffset);
+ }
+
+ public String[] getChanged() {
+ return (String[]) changed.toArray(new String[changed.size()]);
+ }
+
+ public void clearChanged() {
+ changed.clear();
+ }
+ } // inner class ends
+
+ public boolean performOk() {
+ // TODO do stuff
+ return true;
+ }
+}
14 years, 5 months
JBoss Tools SVN: r33161 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 22:23:15 -0400 (Sun, 24 Jul 2011)
New Revision: 33161
Modified:
trunk/jsf/docs/userguide/en-US/Book_Info.xml
trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml
Log:
updated to remove Spring chapter as it hasn't been writen. Fixes TOOLSDOC-181
Modified: trunk/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Book_Info.xml 2011-07-25 02:22:59 UTC (rev 33160)
+++ trunk/jsf/docs/userguide/en-US/Book_Info.xml 2011-07-25 02:23:15 UTC (rev 33161)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
-<pubsnumber>1</pubsnumber>
+<pubsnumber>2</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml 2011-07-25 02:22:59 UTC (rev 33160)
+++ trunk/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml 2011-07-25 02:23:15 UTC (rev 33161)
@@ -5,7 +5,7 @@
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Visual_Web_Tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<xi:include href="spring_tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!--<xi:include href="spring_tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<xi:include href="editors.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="palette.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="css_perspective.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
14 years, 5 months
JBoss Tools SVN: r33160 - branches/jbosstools-3.2.x/jsf/docs/userguide/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 22:22:59 -0400 (Sun, 24 Jul 2011)
New Revision: 33160
Modified:
branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Book_Info.xml
branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml
Log:
updated to remove Spring chapter as it hasn't been writen. Fixes TOOLSDOC-181
Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Book_Info.xml 2011-07-25 00:47:12 UTC (rev 33159)
+++ branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Book_Info.xml 2011-07-25 02:22:59 UTC (rev 33160)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
-<pubsnumber>1</pubsnumber>
+<pubsnumber>2</pubsnumber>
<abstract>
<para>The Visual Web Tools Reference Guide explains extensive collection of specialized wizards, editors and views that can be used in various scenarios while developing Web applications.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml 2011-07-25 00:47:12 UTC (rev 33159)
+++ branches/jbosstools-3.2.x/jsf/docs/userguide/en-US/Visual_Web_Tools_Reference_Guide.xml 2011-07-25 02:22:59 UTC (rev 33160)
@@ -5,7 +5,7 @@
<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="Visual_Web_Tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
-<xi:include href="spring_tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<!--<xi:include href="spring_tools.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -->
<xi:include href="editors.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="palette.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
<xi:include href="css_perspective.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
14 years, 5 months
JBoss Tools SVN: r33159 - trunk/jsf/docs/jsf_tools_ref_guide/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 20:47:12 -0400 (Sun, 24 Jul 2011)
New Revision: 33159
Modified:
trunk/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml
Log:
updated pubs number for brew
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml 2011-07-25 00:46:42 UTC (rev 33158)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml 2011-07-25 00:47:12 UTC (rev 33159)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The JSF Tools Reference Guide explains how to use the JSF Tools module to develop JSF applications.</para>
</abstract>
14 years, 5 months
JBoss Tools SVN: r33158 - branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 20:46:42 -0400 (Sun, 24 Jul 2011)
New Revision: 33158
Modified:
branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml
Log:
updated pubs number for brew
Modified: branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml 2011-07-25 00:41:39 UTC (rev 33157)
+++ branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/Book_Info.xml 2011-07-25 00:46:42 UTC (rev 33158)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The JSF Tools Reference Guide explains how to use the JSF Tools module to develop JSF applications.</para>
</abstract>
14 years, 5 months
JBoss Tools SVN: r33157 - in trunk/jsf/docs/jsf_tools_ref_guide/en-US: images/jsf_support and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 20:41:39 -0400 (Sun, 24 Jul 2011)
New Revision: 33157
Modified:
trunk/jsf/docs/jsf_tools_ref_guide/en-US/images/jsf_support/jsf_support_11.png
trunk/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml
trunk/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml
Log:
updated to fix TOOLSDOC-178
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/images/jsf_support/jsf_support_11.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml 2011-07-25 00:41:19 UTC (rev 33156)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml 2011-07-25 00:41:39 UTC (rev 33157)
@@ -17,7 +17,7 @@
JSF Tools does not lock you into any one <property>JavaServer Faces</property> implementation. You can always specify the desired <property>JavaServer Faces</property> implementation while creating a new JSF project (see <xref linkend="new_jsf_project"/>), adding JSF capability to any existing Eclipse project (see <xref linkend="add_jsf_capability"/>), or importing existing JSF projects (see <xref linkend="ImportingExsJSFProjWithAnyStr74447"/>).
</para>
<para>
- At this point the special wizard will prompt you to specify an appropriate JSF environment. It may be <property>JSF 1.1.02 RI</property>, or <property>JSF 1.2</property> which integrates a number of new features and changes. The wizard also lets you select JSF implementation with a component orientation such as <property>JSF 1.2</property> with <property>Facelets</property> or <property>MyFaces 1.1.4</property>.
+ At this point the special wizard will prompt you to specify an appropriate JSF environment. It may be <property>JSF 1.1.02 RI</property>, <property>JSF 1.2</property> or <property>JSF 2.0</property>. The wizard also lets you select JSF implementation with a component orientation such as <property>JSF 1.2</property> with <property>Facelets</property> or <property>MyFaces 1.1.4</property>.
</para>
<figure>
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml 2011-07-25 00:41:19 UTC (rev 33156)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml 2011-07-25 00:41:39 UTC (rev 33157)
@@ -98,17 +98,22 @@
<entry>
<para>
<emphasis>
- <property>JSFBlankWithLibs</property>
+ <property>JSFBlankWithoutLibs</property>
</emphasis>
</para>
</entry>
<entry>
- <para>This template will create a standard Web project structure with all the JSF capabilities</para>
+ <para>
+ This template will create a standard Web project structure with all the JSF capabilities.
+ </para>
+ <para>
+ Use a template without libs to avoid library conflicts when your server already has JSF libraries installed.
+ </para>
</entry>
</row>
- <row>
+ <!-- <row>
<entry>
<para>
<emphasis>
@@ -120,7 +125,7 @@
<entry>
<para>This template will create a standard Web project structure, and also include a sample application that is ready to run</para>
</entry>
- </row>
+ </row> -->
<row>
<entry>
@@ -133,7 +138,13 @@
<entry>
<para>
+ This template will create a standard Web project structure, and also include a sample application that is ready to run.
+ </para>
+ <!-- <para>
Some servers already provide JSF libs, and you risk library conflicts while deploying your project. To avoid such conflicts, use a template without libs if you have a server with its own JSF libraries.
+ </para> -->
+ <para>
+ Use a template without libs to avoid library conflicts when your server already has JSF libraries installed.
</para>
</entry>
</row>
14 years, 5 months
JBoss Tools SVN: r33156 - in branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US: images/jsf_support and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 20:41:19 -0400 (Sun, 24 Jul 2011)
New Revision: 33156
Modified:
branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/images/jsf_support/jsf_support_11.png
branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml
branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml
Log:
updated to fix TOOLSDOC-178
Modified: branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/images/jsf_support/jsf_support_11.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml 2011-07-24 23:15:37 UTC (rev 33155)
+++ branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/jsf_support.xml 2011-07-25 00:41:19 UTC (rev 33156)
@@ -17,7 +17,7 @@
JSF Tools does not lock you into any one <property>JavaServer Faces</property> implementation. You can always specify the desired <property>JavaServer Faces</property> implementation while creating a new JSF project (see <xref linkend="new_jsf_project"/>), adding JSF capability to any existing Eclipse project (see <xref linkend="add_jsf_capability"/>), or importing existing JSF projects (see <xref linkend="ImportingExsJSFProjWithAnyStr74447"/>).
</para>
<para>
- At this point the special wizard will prompt you to specify an appropriate JSF environment. It may be <property>JSF 1.1.02 RI</property>, or <property>JSF 1.2</property> which integrates a number of new features and changes. The wizard also lets you select JSF implementation with a component orientation such as <property>JSF 1.2</property> with <property>Facelets</property> or <property>MyFaces 1.1.4</property>.
+ At this point the special wizard will prompt you to specify an appropriate JSF environment. It may be <property>JSF 1.1.02 RI</property>, <property>JSF 1.2</property> or <property>JSF 2.0</property>. The wizard also lets you select JSF implementation with a component orientation such as <property>JSF 1.2</property> with <property>Facelets</property> or <property>MyFaces 1.1.4</property>.
</para>
<figure>
Modified: branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml
===================================================================
--- branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml 2011-07-24 23:15:37 UTC (rev 33155)
+++ branches/jbosstools-3.2.x/jsf/docs/jsf_tools_ref_guide/en-US/projects.xml 2011-07-25 00:41:19 UTC (rev 33156)
@@ -98,17 +98,22 @@
<entry>
<para>
<emphasis>
- <property>JSFBlankWithLibs</property>
+ <property>JSFBlankWithoutLibs</property>
</emphasis>
</para>
</entry>
<entry>
- <para>This template will create a standard Web project structure with all the JSF capabilities</para>
+ <para>
+ This template will create a standard Web project structure with all the JSF capabilities.
+ </para>
+ <para>
+ Use a template without libs to avoid library conflicts when your server already has JSF libraries installed.
+ </para>
</entry>
</row>
- <row>
+ <!-- <row>
<entry>
<para>
<emphasis>
@@ -120,7 +125,7 @@
<entry>
<para>This template will create a standard Web project structure, and also include a sample application that is ready to run</para>
</entry>
- </row>
+ </row> -->
<row>
<entry>
@@ -133,7 +138,13 @@
<entry>
<para>
+ This template will create a standard Web project structure, and also include a sample application that is ready to run.
+ </para>
+ <!-- <para>
Some servers already provide JSF libs, and you risk library conflicts while deploying your project. To avoid such conflicts, use a template without libs if you have a server with its own JSF libraries.
+ </para> -->
+ <para>
+ Use a template without libs to avoid library conflicts when your server already has JSF libraries installed.
</para>
</entry>
</row>
14 years, 5 months
JBoss Tools SVN: r33155 - in branches/jbosstools-3.2.x/drools/docs/reference/en-US: images/create_new_project and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 19:15:37 -0400 (Sun, 24 Jul 2011)
New Revision: 33155
Modified:
branches/jbosstools-3.2.x/drools/docs/reference/en-US/Book_Info.xml
branches/jbosstools-3.2.x/drools/docs/reference/en-US/images/create_new_project/create_new_project8.png
branches/jbosstools-3.2.x/drools/docs/reference/en-US/images/editors/editors1f.png
branches/jbosstools-3.2.x/drools/docs/reference/en-US/introduction.xml
Log:
updated to fix TOOLSDOC-224
Modified: branches/jbosstools-3.2.x/drools/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/drools/docs/reference/en-US/Book_Info.xml 2011-07-24 23:15:27 UTC (rev 33154)
+++ branches/jbosstools-3.2.x/drools/docs/reference/en-US/Book_Info.xml 2011-07-24 23:15:37 UTC (rev 33155)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The Drools Tools Reference Guide explains how to use the Drools Tools for creating, executing and debugging Drools processes and rules.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/drools/docs/reference/en-US/images/create_new_project/create_new_project8.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.2.x/drools/docs/reference/en-US/images/editors/editors1f.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.2.x/drools/docs/reference/en-US/introduction.xml
===================================================================
--- branches/jbosstools-3.2.x/drools/docs/reference/en-US/introduction.xml 2011-07-24 23:15:27 UTC (rev 33154)
+++ branches/jbosstools-3.2.x/drools/docs/reference/en-US/introduction.xml 2011-07-24 23:15:37 UTC (rev 33155)
@@ -100,7 +100,7 @@
</entry>
</row>
- <row>
+ <!-- <row>
<entry>
<para>The Guided editor</para>
</entry>
@@ -108,8 +108,8 @@
<para>This rules allows you to build rules in a GUI driven fashion based on your object model</para>
</entry>
<entry>
- <!--link linkend="guided_editor">The Guided Editor</link--></entry>
- </row>
+ <link linkend="guided_editor">The Guided Editor</link></entry>
+ </row> -->
<row>
<entry>
14 years, 5 months
JBoss Tools SVN: r33154 - in trunk/drools/docs/reference/en-US: images/create_new_project and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-24 19:15:27 -0400 (Sun, 24 Jul 2011)
New Revision: 33154
Modified:
trunk/drools/docs/reference/en-US/Book_Info.xml
trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project8.png
trunk/drools/docs/reference/en-US/images/editors/editors1f.png
trunk/drools/docs/reference/en-US/introduction.xml
Log:
updated to fix TOOLSDOC-224
Modified: trunk/drools/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/drools/docs/reference/en-US/Book_Info.xml 2011-07-23 01:09:07 UTC (rev 33153)
+++ trunk/drools/docs/reference/en-US/Book_Info.xml 2011-07-24 23:15:27 UTC (rev 33154)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The Drools Tools Reference Guide explains how to use the Drools Tools for creating, executing and debugging Drools processes and rules.</para>
</abstract>
Modified: trunk/drools/docs/reference/en-US/images/create_new_project/create_new_project8.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/images/editors/editors1f.png
===================================================================
(Binary files differ)
Modified: trunk/drools/docs/reference/en-US/introduction.xml
===================================================================
--- trunk/drools/docs/reference/en-US/introduction.xml 2011-07-23 01:09:07 UTC (rev 33153)
+++ trunk/drools/docs/reference/en-US/introduction.xml 2011-07-24 23:15:27 UTC (rev 33154)
@@ -100,7 +100,7 @@
</entry>
</row>
- <row>
+ <!-- <row>
<entry>
<para>The Guided editor</para>
</entry>
@@ -108,8 +108,8 @@
<para>This rules allows you to build rules in a GUI driven fashion based on your object model</para>
</entry>
<entry>
- <!--link linkend="guided_editor">The Guided Editor</link--></entry>
- </row>
+ <link linkend="guided_editor">The Guided Editor</link></entry>
+ </row> -->
<row>
<entry>
14 years, 5 months