JBoss Tools SVN: r10378 - trunk/portlet/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-09-19 06:42:09 -0400 (Fri, 19 Sep 2008)
New Revision: 10378
Modified:
trunk/portlet/docs/reference/en/modules/installation.xml
trunk/portlet/docs/reference/en/modules/intro.xml
trunk/portlet/docs/reference/en/modules/starting_project.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-407 - updating according Svetlana's remarks;
Modified: trunk/portlet/docs/reference/en/modules/installation.xml
===================================================================
--- trunk/portlet/docs/reference/en/modules/installation.xml 2008-09-19 10:12:56 UTC (rev 10377)
+++ trunk/portlet/docs/reference/en/modules/installation.xml 2008-09-19 10:42:09 UTC (rev 10378)
@@ -8,13 +8,13 @@
<itemizedlist>
<listitem>
- <para>First, you need to have Eclipse Ganymede with JBoss Tools 3.0Alpha installed.</para>
+ <para>First, you need to have Eclipse Ganymede with JBoss Tools 3.0.0.Alpha1 installed.</para>
<tip>
<title>Tip:</title>
<para>Read <ulink url="&gsglink;#JBossToolsInstall">JBoss Tools
- Installation</ulink> section in our Getting Started documentation to find
- out how to install <property>JBoss Tools</property> onto Eclipse.</para>
+ Installation</ulink> section in our Getting Started documentation to find out
+ how to install <property>JBoss Tools</property> onto Eclipse.</para>
</tip>
</listitem>
@@ -27,7 +27,7 @@
<title>Note:</title>
<para>You need JBoss Portal 2.7 if you want to work with a Portlet 2.0</para>
</note>
-
+
</listitem>
<listitem>
@@ -35,4 +35,6 @@
</listitem>
</itemizedlist>
+ <para>Now, when you have it installed, we are going to demonstrate some powerful features of
+ <property>JBoss Portal</property> tooling for Eclipse.</para>
</chapter>
Modified: trunk/portlet/docs/reference/en/modules/intro.xml
===================================================================
--- trunk/portlet/docs/reference/en/modules/intro.xml 2008-09-19 10:12:56 UTC (rev 10377)
+++ trunk/portlet/docs/reference/en/modules/intro.xml 2008-09-19 10:42:09 UTC (rev 10378)
@@ -3,7 +3,7 @@
<?dbhtml filename="intro.html"?>
<title>Introduction</title>
- <para>Starting from 3.0 version, JBoss set of plugins extends <property>JBoss Portal</property>
+ <para>Starting from 3.0.0.Alpha1 version, JBoss set of plugins extends <property>JBoss Portal</property>
features. Thus, this guide is intended to explain you how to manage the functionality
<property>JBoss Tools</property> provide to ease the development with <property>JBoss
Portal</property>.</para>
@@ -47,7 +47,7 @@
Configuration to enable Portlet Facet in it.</para>
</entry>
<entry>
- <link linkend="creating _project_with_jbossportal">creating a Dynamic
+ <link linkend="creating _project_with_jbossportal">Creating a Dynamic
Web Project</link>
</entry>
</row>
@@ -59,10 +59,11 @@
</entry>
<entry>
- <para>The wizard enables creating a JSR-186/JSR-286 compliant portlet.</para>
+ <para>The wizard enables creating a JSR-186/JSR-286 compliant
+ portlet.</para>
</entry>
<entry>
- <link linkend="adding_java_portlet">adding Java Portlet to a
+ <link linkend="adding_java_portlet">Adding Java Portlet to a
project</link>
</entry>
</row>
@@ -72,10 +73,12 @@
<para>Create JSF/Seam Portlet wizard</para>
</entry>
<entry>
- <para>This wizard creates a JSF/Seam portlet that uses JBoss Portlet Bridge</para>
+ <para>This wizard creates a JSF/Seam portlet that uses JBoss Portlet
+ Bridge</para>
</entry>
<entry>
- <link linkend="adding_JsfSeam_portlet">adding JSF/Seam Portlet to a project</link>
+ <link linkend="adding_JsfSeam_portlet">Adding JSF/Seam Portlet to a
+ project</link>
</entry>
</row>
@@ -108,8 +111,9 @@
<listitem>
<para>
- <ulink url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss Tools
- Forum</ulink>
+ <ulink
+ url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201"
+ >JBoss Tools Forum</ulink>
</para>
</listitem>
@@ -123,7 +127,7 @@
<listitem>
<para>
<ulink url="http://www.jboss.com/products/devstudio/docs">Stable JBossTools/JBDS
- documentation</ulink> (supplied with the latest JBDS release, 1.1.0GA
+ documentation</ulink> (supplied with the latest JBDS release, 1.1.0 GA
currently) </para>
</listitem>
</itemizedlist>
Modified: trunk/portlet/docs/reference/en/modules/starting_project.xml
===================================================================
--- trunk/portlet/docs/reference/en/modules/starting_project.xml 2008-09-19 10:12:56 UTC (rev 10377)
+++ trunk/portlet/docs/reference/en/modules/starting_project.xml 2008-09-19 10:42:09 UTC (rev 10378)
@@ -43,7 +43,7 @@
</figure>
<para>On the next page you should give a name to the runtime. Let's call it
- <emphasis>JBoss Portal 2.7 Runtime</emphasis>. And then point it to the location of
+ <emphasis>JBoss Portal 2.7 Runtime</emphasis>, and then point it to the location of
your JBoss AS + Portal installation.</para>
<note>
@@ -65,8 +65,8 @@
<para>Click on <emphasis>
<property>Finish</property>.</emphasis> It returns you to the <property>New Dynamic
- Web Project</property> wizard where it' also necessary to set the project
- Configuration. <property>JBoss Tools</property> (starting from 3.0 Alpha) support the
+ Web Project</property> wizard where it's also necessary to set the project
+ Configuration. <property>JBoss Tools</property> (starting from 3.0.0.Alpha1) support the
JSR-168 Portlet Specification (Portlet 1.0), JSR-286 Portlet Specification (Portlet
2.0). Thus you can choose <emphasis>Portlet Project v1.0</emphasis> or <emphasis>Portlet
Project v2.0</emphasis>.</para>
15 years, 9 months
JBoss Tools SVN: r10377 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-09-19 06:12:56 -0400 (Fri, 19 Sep 2008)
New Revision: 10377
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
JBIDE-2521
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-19 09:48:39 UTC (rev 10376)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-19 10:12:56 UTC (rev 10377)
@@ -77,7 +77,47 @@
Attr styleAttr = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_STYLE);
if (styleAttr!=null) {
try {
- styleStr = styleAttr.getValue();
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorder = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BORDER);
+ StringBuffer stringBuffer = new StringBuffer();
+
+ if (attrBorder != null) {
+ stringBuffer.append("border-width:").append(attrBorder.getNodeValue()) //$NON-NLS-1$
+ .append(";"); //$NON-NLS-1$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueColor = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_VALUE_COLOR);
+ if (attrValueColor != null) {
+ stringBuffer.append("color:").append(attrValueColor.getNodeValue()).append(";"); //$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueBackgroundColor = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_VALUE_BACKGROUND_COLOR);
+ if (attrValueBackgroundColor != null) {
+ stringBuffer.append("background-color:").append(attrValueBackgroundColor.getNodeValue()).append(";"); //$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBachkgroundColor = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BACKGROUND_COLOR);
+ if (attrBachkgroundColor != null) {
+ //early for displaying any tag was used <div><span></span></div>
+ //and this property was for inner span, now used only one element
+ //and this property duplicates
+ stringBuffer.append("background-color:").append(attrBachkgroundColor.getNodeValue()).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorderColor = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BORDER_COLOR);
+ if (attrBorderColor != null) {
+ stringBuffer.append("border-color:").append(attrBorderColor.getNodeValue()).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ //-----------END
+ if(stringBuffer.toString().length()>0) {
+ styleStr = stringBuffer.toString();
+ } else {
+ styleStr = styleAttr.getValue();
+ }
VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(styleStr, true);
styleExpr = info.getExpression();
dependencyMap.setCreator(this, info.getDependencySet());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-19 09:48:39 UTC (rev 10376)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-19 10:12:56 UTC (rev 10377)
@@ -22,6 +22,8 @@
import java.util.Map;
import java.util.Set;
+import javax.swing.text.Style;
+
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
@@ -193,23 +195,23 @@
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_BORDER = "border"; //$NON-NLS-1$
+ static final String ATTR_ANY_BORDER = "border"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_VALUE_COLOR = "value-color"; //$NON-NLS-1$
+ static final String ATTR_ANY_VALUE_COLOR = "value-color"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_VALUE_BACKGROUND_COLOR = "value-background-color"; //$NON-NLS-1$
+ static final String ATTR_ANY_VALUE_BACKGROUND_COLOR = "value-background-color"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_BACKGROUND_COLOR = "background-color"; //$NON-NLS-1$
+ static final String ATTR_ANY_BACKGROUND_COLOR = "background-color"; //$NON-NLS-1$
@Deprecated
//used just for conversion old configuration to new configuration
//should be deleted from some time
- private static final String ATTR_ANY_BORDER_COLOR = "border-color"; //$NON-NLS-1$
+ static final String ATTR_ANY_BORDER_COLOR = "border-color"; //$NON-NLS-1$
static final String[] ATTR_ANY_PROPERTIES = {"title"}; //$NON-NLS-1$
@@ -636,12 +638,14 @@
if (attr != null) {
anyData.setChildren(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue()));
}
-
-// attr = anyNode.getAttributeNode(ATTR_ANY_DISPLAY);
-// if (attr != null) {
-// anyData.setDisplay(attr.getNodeValue());
-// }
-
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ StringBuffer stringBuffer = new StringBuffer();
+ Node attrDisplay = anyNode.getAttributeNode(ATTR_ANY_DISPLAY);
+ if (attr != null) {
+ stringBuffer.append(HTML.ATTR_DISPLAY).append(":") //$NON-NLS-1$
+ .append(attrDisplay.getNodeValue()).append(";"); //$NON-NLS-1$
+ }
+ //-----------END
attr = anyNode.getAttributeNode(ATTR_ANY_ICON);
if (attr != null){
anyData.setShowIcon(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue()));
@@ -654,33 +658,46 @@
attr = anyNode.getAttributeNode(ATTR_ANY_STYLE);
if (attr !=null) {
- anyData.setValue(attr.getNodeValue());
+ anyData.setStyle(attr.getNodeValue());
}
-// attr = anyNode.getAttributeNode(ATTR_ANY_BORDER);
-// if (attr != null) {
-// anyData.setBorder(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_VALUE_COLOR);
-// if (attr != null) {
-// anyData.setValueColor(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_VALUE_BACKGROUND_COLOR);
-// if (attr != null) {
-// anyData.setValueBackgroundColor(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_BACKGROUND_COLOR);
-// if (attr != null) {
-// anyData.setBackgroundColor(attr.getNodeValue());
-// }
-//
-// attr = anyNode.getAttributeNode(ATTR_ANY_BORDER_COLOR);
-// if (attr != null) {
-// anyData.setBorderColor(attr.getNodeValue());
-// }
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorder = anyNode.getAttributeNode(ATTR_ANY_BORDER);
+ if (attrBorder != null) {
+ stringBuffer.append("border-width:").append(attrBorder.getNodeValue()) //$NON-NLS-1$
+ .append(";"); //$NON-NLS-1$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueColor = anyNode.getAttributeNode(ATTR_ANY_VALUE_COLOR);
+ if (attrValueColor != null) {
+ stringBuffer.append("color:").append(attrValueColor.getNodeValue()).append(";"); //$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrValueBackgroundColor = anyNode.getAttributeNode(ATTR_ANY_VALUE_BACKGROUND_COLOR);
+ if (attrValueBackgroundColor != null) {
+ stringBuffer.append("background-color:").append(attrValueBackgroundColor.getNodeValue()).append(";"); //$NON-NLS-1$//$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBachkgroundColor = anyNode.getAttributeNode(ATTR_ANY_BACKGROUND_COLOR);
+ if (attrBachkgroundColor != null) {
+ //early for displaying any tag was used <div><span></span></div>
+ //and this property was for inner span, now used only one element
+ //and this property duplicates
+ stringBuffer.append("background-color:").append(attrBachkgroundColor.getNodeValue()).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ //-----------END
+ //TODO Max Areshkau This code was leave here for versions compatibility BEGIN
+ Node attrBorderColor = anyNode.getAttributeNode(ATTR_ANY_BORDER_COLOR);
+ if (attrBorderColor != null) {
+ stringBuffer.append("border-color:").append(attrBorderColor.getNodeValue()).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if(stringBuffer.toString().length()>0) {
+ anyData.setStyle(stringBuffer.toString());
+ }
+ //-----------END
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-09-19 09:48:39 UTC (rev 10376)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-09-19 10:12:56 UTC (rev 10377)
@@ -87,6 +87,7 @@
public static final String ATTR_SRC = "src"; //$NON-NLS-1$
public static final String ATTR_ALT = "alt"; //$NON-NLS-1$
public static final String ATTR_JSFC = "jsfc"; //$NON-NLS-1$
+ public static final String ATTR_DISPLAY = "display"; //$NON-NLS-1$
public static final String VALUE_TOP_ALIGN = "top"; //$NON-NLS-1$
public static final String VALUE_MIDDLE_ALIGN = "middle"; //$NON-NLS-1$
15 years, 9 months
JBoss Tools SVN: r10376 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui: gef/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-19 05:48:39 -0400 (Fri, 19 Sep 2008)
New Revision: 10376
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java
Log:
modify some codes for reselecting target/source data
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-19 08:59:14 UTC (rev 10375)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-19 09:48:39 UTC (rev 10376)
@@ -530,7 +530,7 @@
TreeItem item = (TreeItem) items[i];
if (item == null)
continue;
- if (item.getData(REFERENCE_MODEL) != null) {
+ if (item.getData(REFERENCE_MODEL) != null && !item.isDisposed()) {
} else {
AbstractStructuredDataModel model = null;
@@ -561,9 +561,49 @@
protected void createSourceGraphModels() {
Tree tree = sourceViewer.getTree();
TreeItem[] items = tree.getItems();
+ clearExsitingGraphModels(SourceModel.class);
createGraphModels(items, SourceModel.class);
}
+
+ private void disConnectGraphModel(Class clazz,TreeItemRelationModel model){
+ if(clazz == SourceModel.class){
+ List list = model.getModelSourceConnections();
+ List temp = new ArrayList(list);
+ for (Iterator iterator = temp.iterator(); iterator.hasNext();) {
+ LineConnectionModel line = (LineConnectionModel) iterator.next();
+ line.disConnect();
+ }
+ temp.clear();
+ }
+
+ if(clazz == TargetModel.class){
+ List list = model.getModelTargetConnections();
+ List temp = new ArrayList(list);
+ for (Iterator iterator = temp.iterator(); iterator.hasNext();) {
+ LineConnectionModel line = (LineConnectionModel) iterator.next();
+ line.disConnect();
+ }
+ temp.clear();
+ }
+ }
+
+ private void clearExsitingGraphModels(Class<? extends Object> clazz) {
+ if(rootModel != null){
+ List children = rootModel.getChildren();
+ List removeList = new ArrayList();
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if(object.getClass() == clazz){
+ removeList.add(object);
+ disConnectGraphModel(clazz,(TreeItemRelationModel)object);
+ }
+ }
+ rootModel.removeChildrenList(removeList);
+ }
+ }
+
+
protected void createTargetGraphModels() {
Tree tree = targetViewer.getTree();
TreeItem[] items = tree.getItems();
@@ -920,6 +960,15 @@
.getCurrentCreationWizard();
String typeID = cw.getInputDataTypeID();
if (UIUtils.setTheProvidersForTreeViewer(viewer, typeID)) {
+ if (viewer.getInput() != null) {
+ if (!MessageDialog
+ .openQuestion(
+ getSite().getShell(),
+ "Changed Data?",
+ "Do you want to change the data?if you do this , all connections will be losted")) {
+ return;
+ }
+ }
viewer.setInput(cw.getTreeViewerInputContents());
try {
// viewer.expandAll();
@@ -932,7 +981,6 @@
targetDataTypeID = typeID;
}
} catch (Exception e) {
- e.printStackTrace();
MessageDialog.openError(getSite().getShell(), "Error",
"a error occurs during filling Data into the viewer:\n"
+ e.toString());
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java 2008-09-19 08:59:14 UTC (rev 10375)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java 2008-09-19 09:48:39 UTC (rev 10376)
@@ -3,6 +3,7 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -130,7 +131,7 @@
}
/**
- * ���ýڵ��Java���͡��������Ҫ������ȫ������<code>java.lang.String</code>
+ * ���ýڵ��Java���͡��������Ҫ������ȫ�����ￄ1�7code>java.lang.String</code>
* ���������Ǹ������ͣ�������Ϊ<code>null</code>��
*
* @param typeString
@@ -150,12 +151,12 @@
/**
* ��ģ�������ü������ģ�ͷ���ı�ʱ����������Ѹı�֪ͨEditPart��
* EditPart��Ҫʵ��PropertyChangeListener�ӿ�
- * �����������ʱ�����PropertyChangeListener�ӿ��е�peopertyChange����4��ɴ�����
+ * �����������ʱ�����PropertyChangeListener�ӿ��е�peopertyChange����4��ɴ����ￄ1�7
*/
private PropertyChangeSupport listeners = new PropertyChangeSupport(this);
/**
- * Ϊģ����Ӽ�����
+ * Ϊģ����Ӽ����ￄ1�7
*
* @param listener
* PropertyChangeSupport ������
@@ -175,10 +176,10 @@
}
/**
- * ��ģ�ͷ���仯ʱ��Ҫ��������4����������
+ * ��ģ�ͷ���仯ʱ��Ҫ�������ￄ1�7����������
*
* @param propName
- * �ı������
+ * �ı�����ￄ1�7
* @param oldValue
* @param newValue
*/
@@ -188,7 +189,7 @@
}
/**
- * ���ص�ǰģ�����е���Ԫ�ء����ǰģ��û����Ԫ��
+ * ���ص�ǰģ�����е���Ԫ�ء����ǰģ��û����Ԫ�ￄ1�7
*
* @return ��ǰģ�����е���Ԫ��
*/
@@ -238,9 +239,17 @@
protected void setLeftValueToChild(AbstractStructuredDataModel child) {
child.setLeft(this.isLeft);
}
+
+
+ public void removeChildrenList(Collection children){
+ if(this.children != null && children != null){
+ this.children.removeAll(children);
+ firePropertyChange(P_CHILDREN, children, null);
+ }
+ }
/**
- * ɾ����Ԫ�أ���֪ͨģ����Ԫ�ط���ı�
+ * ɾ����Ԫ�أ���֪ͨģ����Ԫ�ط���ıￄ1�7
*
* @param child
* ��Ԫ��
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java 2008-09-19 08:59:14 UTC (rev 10375)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/LineConnectionModel.java 2008-09-19 09:48:39 UTC (rev 10376)
@@ -12,6 +12,11 @@
super();
}
+ public void disConnect(){
+ this.detachSource();
+ this.detachTarget();
+ }
+
public void connect() {
this.attachSource();
this.attachTarget();
15 years, 9 months
JBoss Tools SVN: r10375 - in trunk/esb/plugins/org.jboss.tools.esb.project.ui: META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-09-19 04:59:14 -0400 (Fri, 19 Sep 2008)
New Revision: 10375
Added:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/
trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
Log:
JBIDE-2793: add icon and image to esb project wizard
JBIDE-2738: java.lang.ClassCastException when select JBoss esb while creating the project.
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2008-09-19 05:42:06 UTC (rev 10374)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2008-09-19 08:59:14 UTC (rev 10375)
@@ -29,5 +29,6 @@
org.eclipse.jst.j2ee.core;bundle-version="1.1.200",
org.eclipse.jst.j2ee.ui;bundle-version="1.1.200",
org.eclipse.jdt.core;bundle-version="3.4.0",
- org.jboss.tools.esb.project.core;bundle-version="1.0.0"
+ org.jboss.tools.esb.project.core;bundle-version="1.0.0",
+ org.jboss.tools.common.model.ui;bundle-version="2.0.0"
Eclipse-LazyStart: true
Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
===================================================================
(Binary files differ)
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-09-19 05:42:06 UTC (rev 10374)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-09-19 08:59:14 UTC (rev 10375)
@@ -7,6 +7,7 @@
<wizard
category="org.jboss.tools.esb.category1"
class="org.jboss.tools.esb.project.ui.wizards.ESBProjectWizard"
+ icon="icons/wizards/esb.gif"
id="JBoss.ESB.Project.Wizard"
name="ESB Project Wizard"
project="true">
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2008-09-19 05:42:06 UTC (rev 10374)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2008-09-19 08:59:14 UTC (rev 10375)
@@ -1,18 +1,14 @@
package org.jboss.tools.esb.project.ui.wizards;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.ui.INewWizard;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.esb.core.ESBProjectUtilities;
import org.jboss.tools.esb.project.ui.wizards.pages.ESBProjectFirstPage;
@@ -21,11 +17,13 @@
public ESBProjectWizard() {
setWindowTitle("New ESB Project Wizard");
+ setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT));
}
public ESBProjectWizard(IDataModel model) {
super(model);
setWindowTitle("New ESB Project Wizard");
+ setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT));
}
@@ -41,7 +39,7 @@
@Override
protected ImageDescriptor getDefaultPageImageDescriptor() {
- return null;
+ return ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT);
}
@Override
@@ -51,4 +49,4 @@
-}
+}
\ No newline at end of file
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-09-19 05:42:06 UTC (rev 10374)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-09-19 08:59:14 UTC (rev 10375)
@@ -8,8 +8,6 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
@@ -27,7 +25,6 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
@@ -36,16 +33,13 @@
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.internal.ValidationProblem.Type;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.jboss.tools.esb.core.ESBProjectUtilities;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.core.runtime.JBossRuntime;
import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
import org.jboss.tools.esb.project.ui.preference.controls.JBossRuntimeListFieldEditor;
-import org.jboss.tools.esb.project.ui.wizards.ESBProjectWizard;
public class ESBFacetInstallationPage extends AbstractFacetWizardPage implements IFacetWizardPage, IJBossESBFacetDataModelProperties {
@@ -68,7 +62,9 @@
private void setDefaultOutputFolder(){
JavaFacetInstallConfig cfg = findJavaFacetInstallConfig();
- cfg.setDefaultOutputFolder(new Path(ESBProjectUtilities.BUILD_CLASSES));
+ if(cfg != null){
+ cfg.setDefaultOutputFolder(new Path(ESBProjectUtilities.BUILD_CLASSES));
+ }
}
protected Composite createTopLevelComposite(Composite parent) {
@@ -159,16 +155,12 @@
private IFacetedProjectWorkingCopy getFacetedProjectWorkingCopy(){
- IWizard wizard = this.getWizard();
- if(wizard instanceof NewProjectDataModelFacetWizard){
- IDataModel wModel = ((NewProjectDataModelFacetWizard)wizard).getDataModel();
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) wModel.getProperty( FACETED_PROJECT_WORKING_COPY );
- return fpjwc;
+ Object obj = model.getProperty(FACETED_PROJECT_WORKING_COPY);
+ if(obj instanceof IFacetedProjectWorkingCopy){
+ return (IFacetedProjectWorkingCopy)obj;
}
- else{
- return null;
- }
+
+ return null;
}
private JavaFacetInstallConfig findJavaFacetInstallConfig()
{
@@ -178,6 +170,8 @@
final IFacetedProject.Action javaInstallAction
= fpjwc.getProjectFacetAction( JavaFacetUtils.JAVA_FACET );
+ if(javaInstallAction == null) return null;
+
final Object config = javaInstallAction.getConfig();
if( config instanceof JavaFacetInstallConfig )
@@ -238,6 +232,9 @@
}
});
+ if("".equals(cmbRuntimes.getText())){
+ hasRuntime = false;
+ }
/*Composite chkcom = new Composite(runtimeGroup, SWT.NONE);
chkcom.setLayout(new GridLayout(3, true));
chkcom.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -337,9 +334,12 @@
private IProjectFacetVersion getSelectedESBVersion(){
IFacetedProjectWorkingCopy fpwc = getFacetedProjectWorkingCopy();
IProjectFacet facet = ProjectFacetsManager.getProjectFacet(ESBProjectUtilities.ESB_PROJECT_FACET);
+ if(fpwc != null){
+ return fpwc.getProjectFacetVersion(facet);
+ }else{
+ return null;
+ }
- return fpwc.getProjectFacetVersion(facet);
-
}
protected void saveJBosswsRuntimeToModel(JBossRuntime jbws) {
@@ -387,6 +387,9 @@
setErrorMessage("Please specify a valid source folder.");
hasValidSrc = false;
setPageComplete(isPageComplete());
+ }else if(!hasRuntime){
+ setErrorMessage("Please specify a ESB runtime");
+ setPageComplete(isPageComplete());
}
/* else if (!duplicateMsg.equals("")) {
setErrorMessage("Duplicated jar on classpath:" + duplicateMsg);
@@ -408,14 +411,14 @@
}
- private void fillMessageGroup(Composite parent){
+/* private void fillMessageGroup(Composite parent){
Group messageGroup = new Group(parent, SWT.BORDER);
messageGroup.setText("Target Message Product");
messageGroup.setLayout(new GridLayout(1, false));
messageGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
}
-
+*/
public void setConfig(Object config) {
this.model = (IDataModel)config;
@@ -434,4 +437,4 @@
}
-}
+}
\ No newline at end of file
15 years, 9 months
JBoss Tools SVN: r10374 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-09-19 01:42:06 -0400 (Fri, 19 Sep 2008)
New Revision: 10374
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
Log:
JBIDE-2738:fix the isue, java.lang.ClassCastException when select JBoss esb while creating the project.
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-09-19 04:50:15 UTC (rev 10373)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-09-19 05:42:06 UTC (rev 10374)
@@ -8,6 +8,8 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
@@ -37,6 +39,7 @@
import org.eclipse.wst.common.project.facet.core.internal.ValidationProblem.Type;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
+import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.jboss.tools.esb.core.ESBProjectUtilities;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.core.runtime.JBossRuntime;
@@ -149,16 +152,23 @@
private void setConfigFolder(String folderName){
JavaFacetInstallConfig cfg = findJavaFacetInstallConfig();
- cfg.setSourceFolder(new Path(folderName));
+ if(cfg != null){
+ cfg.setSourceFolder(new Path(folderName));
+ }
}
private IFacetedProjectWorkingCopy getFacetedProjectWorkingCopy(){
- ESBProjectWizard wizard = (ESBProjectWizard)this.getWizard();
- IDataModel wModel = wizard.getDataModel();
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) wModel.getProperty( FACETED_PROJECT_WORKING_COPY );
- return fpjwc;
+ IWizard wizard = this.getWizard();
+ if(wizard instanceof NewProjectDataModelFacetWizard){
+ IDataModel wModel = ((NewProjectDataModelFacetWizard)wizard).getDataModel();
+ final IFacetedProjectWorkingCopy fpjwc
+ = (IFacetedProjectWorkingCopy) wModel.getProperty( FACETED_PROJECT_WORKING_COPY );
+ return fpjwc;
+ }
+ else{
+ return null;
+ }
}
private JavaFacetInstallConfig findJavaFacetInstallConfig()
{
@@ -187,7 +197,7 @@
Group runtimeGroup = new Group(parent, SWT.BORDER);
runtimeGroup.setText("JBoss ESB Runtime");
- runtimeGroup.setLayout(new GridLayout(4, false));
+ runtimeGroup.setLayout(new GridLayout(2, false));
runtimeGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
/* Button btnServerSupplied = new Button(runtimeGroup, SWT.RADIO);
@@ -228,7 +238,25 @@
}
});
+ /*Composite chkcom = new Composite(runtimeGroup, SWT.NONE);
+ chkcom.setLayout(new GridLayout(3, true));
+ chkcom.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ Button jbpm = new Button(chkcom, SWT.CHECK);
+ jbpm.setText("Depends on jbpm.esb");
+
+ Button smooks = new Button(chkcom, SWT.CHECK);
+ smooks.setText("Depends on Smooks.esb");
+
+ Button jbrules = new Button(chkcom, SWT.CHECK);
+ jbrules.setText("Depends on jrules.esb");
+
+ Button spring = new Button(chkcom, SWT.CHECK);
+ spring.setText("Depends on spring.esb");
+
+ Button soap = new Button(chkcom, SWT.CHECK);
+ soap.setText("Depends on soap.esb");*/
+
}
15 years, 9 months
JBoss Tools SVN: r10373 - in trunk/ws/tests/org.jboss.tools.ws.core.test: src/org/jboss/tools/ws/core/test/command and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-09-19 00:50:15 -0400 (Fri, 19 Sep 2008)
New Revision: 10373
Modified:
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
Log:
change other jboss ws version for fit 2.0 (JBIDE-2636 --version number for jbossws runtimes are free-form, should be more controlled)
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-09-19 04:50:03 UTC (rev 10372)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/ClientTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-09-19 04:50:15 UTC (rev 10373)
@@ -4,6 +4,6 @@
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.web" version="2.4"/>
- <installed facet="jbossws.core" version="2.0.1"/>
+ <installed facet="jbossws.core" version="2.0"/>
<installed facet="jst.java" version="5.0"/>
</faceted-project>
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-09-19 04:50:03 UTC (rev 10372)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-09-19 04:50:15 UTC (rev 10373)
@@ -68,7 +68,7 @@
protected static final int DEFAULT_STARTUP_TIME = 150000;
protected static final int DEFAULT_SHUTDOWN_TIME = 90000;
- protected static final String JBOSSWS_HOME_DEFAULT = "/home/grid/Software/jboss-4.2.2.GA";
+ protected static final String JBOSSWS_HOME_DEFAULT = "D:/softinstall/jboss-4.2.2.GA/jboss-4.2.2.GA";
public static final String JBOSS_RUNTIME_42 = "org.jboss.ide.eclipse.as.runtime.42";
public static final String JBOSS_AS_42_HOME = System.getProperty(JBOSS_RUNTIME_42, JBOSSWS_HOME_DEFAULT);
public static final String JBOSS_SERVER_42 = "org.jboss.ide.eclipse.as.42";
@@ -92,7 +92,7 @@
javaVersion = ProjectFacetsManager.getProjectFacet("jst.java").getVersion("5.0");
dynamicWebVersion = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.5");
jbosswsFacet = ProjectFacetsManager.getProjectFacet("jbossws.core");
- jbosswsFacetVersion = jbosswsFacet.getVersion("2.0.1");
+ jbosswsFacetVersion = jbosswsFacet.getVersion("2.0");
}
15 years, 9 months
JBoss Tools SVN: r10372 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-09-19 00:50:03 -0400 (Fri, 19 Sep 2008)
New Revision: 10372
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
Log:
change other jboss ws version for fit 2.0 (JBIDE-2636 --version number for jbossws runtimes are free-form, should be more controlled)
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-09-19 03:13:48 UTC (rev 10371)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-09-19 04:50:03 UTC (rev 10372)
@@ -41,7 +41,7 @@
class="org.jboss.tools.ws.creation.ui.wsrt.JBossWebServiceRuntime">
<required-facet-version facet="jst.web" version="2.3" allow-newer="true" />
- <required-facet-version facet="jbossws.core" version="2.0.1" allow-newer="true" />
+ <required-facet-version facet="jbossws.core" version="2.0" allow-newer="true" />
</clientRuntime>
</extension>
15 years, 9 months
JBoss Tools SVN: r10371 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-18 23:13:48 -0400 (Thu, 18 Sep 2008)
New Revision: 10371
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
urgent - publisher weights were inaccurate, made deployment of single-file deployments (such as the seam project datasource) not publish.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-09-19 01:07:50 UTC (rev 10370)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-09-19 03:13:48 UTC (rev 10371)
@@ -5,7 +5,7 @@
<extension-point id="pollers" name="org.jboss.ide.eclipse.as.core.runtime.server.pollers" schema="schema/pollers.exsd"/>
<extension-point id="pollerFailureHandler" name="org.jboss.ide.eclipse.as.core.runtime.server.pollerFailureHandler" schema="schema/pollerFailureHandler.exsd"/>
<extension-point id="publishers" name="org.jboss.ide.eclipse.as.core.publishers" schema="schema/publishers.exsd"/>
-
+
<extension
point="org.eclipse.wst.server.core.serverTypes">
<serverType
@@ -22,9 +22,9 @@
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.32"
startBeforePublish="false"
startTimeout="450000"
- stopTimeout="450000"
+ stopTimeout="450000"
supportsRemoteHosts="false"/>
-
+
<serverType
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior"
class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
@@ -41,7 +41,7 @@
startTimeout="450000"
stopTimeout="450000"
supportsRemoteHosts="false"/>
-
+
<serverType
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior"
class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
@@ -56,7 +56,7 @@
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.42"
startBeforePublish="false"
startTimeout="450000"
- stopTimeout="450000"
+ stopTimeout="450000"
supportsRemoteHosts="false"/>
<serverType
@@ -73,7 +73,7 @@
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.50"
startBeforePublish="false"
startTimeout="450000"
- stopTimeout="450000"
+ stopTimeout="450000"
supportsRemoteHosts="false"/>
@@ -93,7 +93,7 @@
startTimeout="100000"
stopTimeout="100000"
supportsRemoteHosts="true"/>
-
+
</extension>
<extension
@@ -119,7 +119,7 @@
versions="1.0"/>
<moduleType
types="jboss.singlefile"
- versions="1.0"/>
+ versions="1.0"/>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -152,7 +152,7 @@
<moduleType
types="jst.jboss.esb"
versions="4.2,4.3,4.4,5.0">
- </moduleType>
+ </moduleType>
</runtimeType>
<runtimeType
vendor="%providerName"
@@ -294,7 +294,7 @@
public="false">
</launchConfigurationType>
</extension>
-
+
<extension
point="org.eclipse.debug.core.sourcePathComputers">
<sourcePathComputer
@@ -302,7 +302,7 @@
id="org.jboss.ide.eclipse.as.core.serverSourcePathComputer">
</sourcePathComputer>
</extension>
-
+
<!-- Module Factory Stuff -->
<extension
@@ -317,7 +317,7 @@
</moduleType>
</moduleFactory>
</extension>
-
+
<extension
point="org.eclipse.wst.server.core.launchableAdapters">
<launchableAdapter
@@ -348,10 +348,10 @@
supportsStartup="false">
</serverPoller>
</extension>
-
-
+
+
<!-- Stuff for the dual model of runtimes... facet time baby! -->
<extension
point="org.eclipse.jst.server.core.runtimeFacetMappings">
@@ -384,13 +384,13 @@
<runtime-component-version
type="org.jboss.ide.eclipse.as.runtime.stripped.component"
version="1.0"/>
-
+
<supported>
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.stripped.component"
version="1.0"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
- <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.ejb" version="2.0,2.1,3.0"/>
<facet id="jst.ear" version="1.2,1.3,1.4,5.0"/>
@@ -423,7 +423,7 @@
id="org.jboss.ide.eclipse.as.runtime.component"
version="3.2"/>
<facet id="jst.web" version="2.2,2.3,2.4"/>
- <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.ejb" version="2.0,2.1"/>
<facet id="jst.ear" version="1.2,1.3,1.4"/>
@@ -436,7 +436,7 @@
id="org.jboss.ide.eclipse.as.runtime.component"
version="4.0"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
- <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.connector" version="1.0,1.5"/>
<facet id="jst.ejb" version="2.0,2.1,3.0"/>
@@ -449,7 +449,7 @@
id="org.jboss.ide.eclipse.as.runtime.component"
version="4.2"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
- <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.connector" version="1.0,1.5"/>
<facet id="jst.ejb" version="2.0,2.1,3.0"/>
@@ -462,7 +462,7 @@
id="org.jboss.ide.eclipse.as.runtime.component"
version="5.0"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
- <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.connector" version="1.0,1.5"/>
<facet id="jst.ejb" version="2.0,2.1,3.0"/>
@@ -470,9 +470,9 @@
<facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
</supported>
</extension>
-
-
+
+
<extension
point="org.eclipse.jst.j2ee.classpathdep">
<filteredClasspathContainer
@@ -528,14 +528,14 @@
<public publicId="-//JBoss//DTD JBOSS 4.2//EN"
uri="dtd/jboss_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"/>
-
+
<public publicId="-//JBoss//DTD J2EE Application 1.4//EN"
uri="dtd/jboss-app_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd"/>
<public publicId="-//JBoss//DTD J2EE Application 4.2//EN"
uri="dtd/jboss-app_4_2.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd"/>
-
+
<public publicId="-//JBoss//DTD Web Application 2.4//EN"
uri="dtd/jboss-web_4_0.dtd"
webURL="http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"/>
@@ -567,6 +567,7 @@
</public>
</catalogContribution>
</extension>
+
<extension
point="org.jboss.ide.eclipse.as.core.publishers">
<publisher
@@ -582,4 +583,20 @@
priority="0">
</publisher>
</extension>
+
+ <extension
+ point="org.jboss.ide.eclipse.as.core.publishers">
+ <publisher
+ class="org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher"
+ priority="7">
+ </publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.as.core.publishers.JstPublisher"
+ priority="5">
+ </publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.as.core.publishers.NullPublisher"
+ priority="0">
+ </publisher>
+ </extension>
</plugin>
15 years, 9 months
JBoss Tools SVN: r10370 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-18 21:07:50 -0400 (Thu, 18 Sep 2008)
New Revision: 10370
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntBuildListener.java
Log:
JBIDE-1426 - more logging for ant to inform along as the build goes
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-09-19 00:38:23 UTC (rev 10369)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2008-09-19 01:07:50 UTC (rev 10370)
@@ -129,7 +129,7 @@
case IStatus.ERROR: return Project.MSG_ERR;
case IStatus.WARNING: return Project.MSG_WARN;
case IStatus.INFO: return Project.MSG_INFO;
- case IStatus.OK: return Project.MSG_VERBOSE;
+ case IStatus.OK: return Project.MSG_DEBUG;
}
return Project.MSG_DEBUG;
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntBuildListener.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntBuildListener.java 2008-09-19 00:38:23 UTC (rev 10369)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntBuildListener.java 2008-09-19 01:07:50 UTC (rev 10370)
@@ -1,13 +1,15 @@
package org.jboss.ide.eclipse.archives.core.ant;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.AbstractBuildListener;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveBuildListener;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
+import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
-public class AntBuildListener extends AbstractBuildListener {
-
+public class AntBuildListener implements IArchiveBuildListener {
public void buildFailed(IArchive pkg, IStatus status) {
ArchivesCore.getInstance().getLogger().log(status);
}
@@ -16,4 +18,46 @@
ArchivesCore.getInstance().getLogger().log(multi[i]);
}
}
+
+ public void cleanArchive(IArchive pkg) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Cleaned archive " + pkg.getName(), null);
+ }
+ public void cleanProject(IPath project) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Cleaned project " + project, null);
+ }
+ public void fileRemoved(IArchive topLevelArchive, IArchiveFileSet fileset,
+ IPath filePath) {
+ FileWrapper[] wrappers = fileset.getMatches(filePath);
+ for( int i = 0; i < wrappers.length; i++ ) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.OK, "Removed " + filePath + " in " + topLevelArchive.getName()
+ + " at " + wrappers[i].getRootArchiveRelative().toString(), null);
+ }
+ }
+ public void fileUpdated(IArchive topLevelArchive, IArchiveFileSet fileset,
+ IPath filePath) {
+ FileWrapper[] wrappers = fileset.getMatches(filePath);
+ for( int i = 0; i < wrappers.length; i++ ) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.OK, "Updated " + filePath + " in " + topLevelArchive.getName()
+ + " at " + wrappers[i].getRootArchiveRelative().toString(), null);
+ }
+ }
+ public void finishedBuild(IPath project) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Finished building " + project.toString(), null);
+ }
+ public void finishedBuildingArchive(IArchive pkg) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Finished building archive " + pkg.getRootArchiveRelativePath(), null);
+ }
+ public void finishedCollectingFileSet(IArchiveFileSet fileset) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Finished collecting fileset " + fileset.toString(), null);
+ }
+ public void startedBuild(IPath project) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Started building project " + project.toString(), null);
+ }
+ public void startedBuildingArchive(IArchive pkg) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Started building archive " + pkg.toString(), null);
+ }
+ public void startedCollectingFileSet(IArchiveFileSet fileset) {
+ ArchivesCore.getInstance().getLogger().log(IStatus.INFO, "Started collecting fileset " + fileset.toString(), null);
+ }
+
}
15 years, 9 months