JBoss Tools SVN: r12470 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2008-12-08 10:56:06 -0500 (Mon, 08 Dec 2008)
New Revision: 12470
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml
Log:
JUnit test for rich:datasvroller was updated. Left and right angle quotes are processed through its char codes both in java and xhtml.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml 2008-12-08 15:56:02 UTC (rev 12469)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml 2008-12-08 15:56:06 UTC (rev 12470)
@@ -5,8 +5,8 @@
CLASS="rich-dtascroller-table">
<TBODY>
<TR>
- <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">««</TD>
- <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">«</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">««</TD>
+ <TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">«</TD>
<TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">
<BR _MOZ_DIRTY="" TYPE="_moz"/>
</TD>
17 years, 4 months
JBoss Tools SVN: r12469 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2008-12-08 10:56:02 -0500 (Mon, 08 Dec 2008)
New Revision: 12469
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java
Log:
JUnit test for rich:datasvroller was updated. Left and right angle quotes are processed through its char codes both in java and xhtml.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java 2008-12-08 15:11:42 UTC (rev 12468)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableScrollerTemplate.java 2008-12-08 15:56:02 UTC (rev 12469)
@@ -33,10 +33,10 @@
private static final String COMPONENT_NAME = "richFacesDataTableScroller"; //$NON-NLS-1$
private static final String STYLE_PATH = "dataTableScroller/dataTableScroller.css"; //$NON-NLS-1$
- private static final String RIGHT_DOUBLE_SCROLL_SYMBOL = "��"; //$NON-NLS-1$
- private static final String RIGHT_SINGLE_SCROLL_SYMBOL = "�"; //$NON-NLS-1$
- private static final String LEFT_DOUBLE_SCROLL_SYMBOL = "��"; //$NON-NLS-1$
- private static final String LEFT_SINGLE_SCROLL_SYMBOL = "�"; //$NON-NLS-1$
+ private static final String RIGHT_DOUBLE_SCROLL_SYMBOL = "\u00BB\u00BB"; //$NON-NLS-1$
+ private static final String RIGHT_SINGLE_SCROLL_SYMBOL = "\u00BB"; //$NON-NLS-1$
+ private static final String LEFT_DOUBLE_SCROLL_SYMBOL = "\u00AB\u00AB"; //$NON-NLS-1$
+ private static final String LEFT_SINGLE_SCROLL_SYMBOL = "\u00AB"; //$NON-NLS-1$
/*
* Default cells number in datascroller.
17 years, 4 months
JBoss Tools SVN: r12468 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2008-12-08 10:11:42 -0500 (Mon, 08 Dec 2008)
New Revision: 12468
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
- each constant of HtmlComponentUtil has been commented and (if it did not exist before) moved to HTML and RichFaces classes
- some methods of ComponentUtil have been fixed and commented
- fixed an issue with dataOrderedList: attribute 'rows' did not work
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-08 12:46:37 UTC (rev 12467)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-08 15:11:42 UTC (rev 12468)
@@ -526,27 +526,33 @@
}
/**
- * Move attributes from sourceNode to html.
- *
- * @param visualNode the visual node
- * @param sourceNode the source node
- * @param htmlAttrName the html attr name
- * @param defValue the def value
- * @param prefValue the pref value
- * @param attrName the attr name
+ * Move attributes from sourceNode to targetNode.
+ *
+ * @param sourceNode source node to copy the attribute from
+ * @param targetNode target visual node
+ * @param sourceAttrName source attribute name to copy the attribute value from
+ * @param targetAttrName target attribute name
+ * @param prefValue the value that will be concatenated with source attribute and set to
+ * target attribute if the source attribute exists
+ * @param defValue the value that will be set to target attribute is the source node
+ * does not have specified attribute
*/
- public static void correctAttribute(Element sourceNode, nsIDOMElement visualNode, String attrName, String htmlAttrName,
+ public static void correctAttribute(Element sourceNode, nsIDOMElement targetNode,
+ String sourceAttrName, String targetAttrName,
String prefValue, String defValue) {
- String attrValue = ((Element) sourceNode).getAttribute(attrName);
+ String attrValue = ((Element) sourceNode).getAttribute(sourceAttrName);
if (prefValue != null && prefValue.trim().length() > 0 && attrValue != null) {
attrValue = prefValue.trim() + Constants.WHITE_SPACE + attrValue;
}
if (attrValue != null) {
- visualNode.setAttribute(htmlAttrName, attrValue);
+ targetNode.setAttribute(targetAttrName, attrValue);
} else if (defValue != null) {
- visualNode.setAttribute(htmlAttrName, defValue);
- } else
- visualNode.removeAttribute(attrName);
+ targetNode.setAttribute(targetAttrName, defValue);
+ } else {
+ // FIXME: probably a bugged line -
+ // removing source attribute from target node [commented by yradtsevich]
+ targetNode.removeAttribute(sourceAttrName);
+ }
}
/**
@@ -561,13 +567,11 @@
* @return boolean value from string
*/
public static boolean string2boolean(String str) {
- if ((str == null) || (Constants.EMPTY.equals(str))) {
- return true;
- } else if ((Constants.TRUE.equalsIgnoreCase(str))
- || (Constants.FALSE.equalsIgnoreCase(str))) {
- return new Boolean(str).booleanValue();
- }
- return true;
+ if (Constants.FALSE.equals(str)) {
+ return false;
+ } else {
+ return true;
+ }
}
/**
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-12-08 12:46:37 UTC (rev 12467)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-12-08 15:11:42 UTC (rev 12468)
@@ -10,171 +10,278 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.richfaces;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.util.HTML;
+
/**
* Util class which contains basic html tags.
*
* @deprecated use org.jboss.tools.vpe.editor.util.HTML and
* org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces
* @author Max Areshkau
- *
+ * @author yradtsevich
*/
public class HtmlComponentUtil {
- /** HTML TAG DL */
+ /**
+ * @deprecated use {@link HTML#TAG_DL} instead
+ */
public static final String HTML_TAG_DL = "dl"; //$NON-NLS-1$
- /** HTML TAG BR */
+ /**
+ * @deprecated use {@link HTML#TAG_BR} instead
+ */
public static final String HTML_TAG_BR = "br"; //$NON-NLS-1$
- /** HTML TAG COLGROUP */
+ /**
+ * @deprecated use {@link HTML#TAG_COLGROUP} instead
+ */
public static final String HTML_TAG_COLGROUP = "colgroup"; //$NON-NLS-1$
- /** HTML TAG THEAD */
+ /**
+ * @deprecated use {@link HTML#TAG_THEAD} instead
+ */
public static final String HTML_TAG_THEAD = "thead"; //$NON-NLS-1$
- /** HTML TAG TFOOT */
+ /**
+ * @deprecated use {@link HTML#TAG_TFOOT} instead
+ */
public static final String HTML_TAG_TFOOT = "tfoot"; //$NON-NLS-1$
- /** HTML TAG CAPTION */
+ /**
+ * @deprecated use {@link HTML#TAG_CAPTION} instead
+ */
public static final String HTML_TAG_CAPTION = "caption"; //$NON-NLS-1$
- /** HTML TAG DT */
+ /**
+ * @deprecated use {@link HTML#TAG_DT} instead
+ */
public static final String HTML_TAG_DT = "dt"; //$NON-NLS-1$
- /** HTML TAG DD */
+ /**
+ * @deprecated use {@link HTML#TAG_DD} instead
+ */
public static final String HTML_TAG_DD = "dd"; //$NON-NLS-1$
- /** HTML_TAG_TABLE * */
+ /**
+ * @deprecated use {@link HTML#TAG_TABLE} instead
+ */
public static final String HTML_TAG_TABLE = "TABLE"; //$NON-NLS-1$
- /** HTML_TAG_TBODY * */
+ /**
+ * @deprecated use {@link HTML#TAG_TBODY} instead
+ */
public static final String HTML_TAG_TBODY = "TBODY"; //$NON-NLS-1$
- /** HTML_TAG_TR * */
+ /**
+ * @deprecated use {@link HTML#TAG_TR} instead
+ */
public static final String HTML_TAG_TR = "TR"; //$NON-NLS-1$
- /** HTML_TAG_TD * */
+ /**
+ * @deprecated use {@link HTML#TAG_TD} instead
+ */
public static final String HTML_TAG_TD = "TD"; //$NON-NLS-1$
- /** HTML_TAG_TH * */
+ /**
+ * @deprecated use {@link HTML#TAG_TH} instead
+ */
public static final String HTML_TAG_TH = "TH"; //$NON-NLS-1$
- /** HTML_TAG_INPUT * */
+ /**
+ * @deprecated use {@link HTML#TAG_INPUT} instead
+ */
public static final String HTML_TAG_INPUT = "INPUT"; //$NON-NLS-1$
- /** HTML_TAG_IMG * */
+ /**
+ * @deprecated use {@link HTML#TAG_IMG} instead
+ */
public static final String HTML_TAG_IMG = "IMG"; //$NON-NLS-1$
- /** HTML_TAG_DIV */
+ /**
+ * @deprecated use {@link HTML#TAG_DIV} instead
+ */
public static final String HTML_TAG_DIV = "DIV"; //$NON-NLS-1$
- /** HTML_TAG_SPAN */
+ /**
+ * @deprecated use {@link HTML#TAG_SPAN} instead
+ */
public static final String HTML_TAG_SPAN = "SPAN"; //$NON-NLS-1$
- /** HTML_TAG_A */
+ /**
+ * @deprecated use {@link HTML#TAG_A} instead
+ */
public static final String HTML_TAG_A = "A"; //$NON-NLS-1$
- /** HTML_TAG_B */
+ /**
+ * @deprecated use {@link HTML#TAG_B} instead
+ */
public static final String HTML_TAG_B = "B"; //$NON-NLS-1$
- /** HTML_TAG_LI */
+ /**
+ * @deprecated use {@link HTML#TAG_LI} instead
+ */
public static final String HTML_TAG_LI = "LI"; //$NON-NLS-1$
- /** HTML_TABLE_COLSPAN * */
+ /**
+ * @deprecated use {@link HTML#ATTR_COLSPAN} instead
+ */
public static final String HTML_TABLE_COLSPAN = "colspan"; //$NON-NLS-1$
- /** HTML_HEIGHT_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_HEIGHT} instead
+ */
public static final String HTML_HEIGHT_ATTR = "height"; //$NON-NLS-1$
- /** HTML_CLASS_ATTR * */
+ /**
+ * @deprecated use {@link RichFaces#ATTR_STYLE_CLASS} instead
+ */
public static final String HTML_STYLECLASS_ATTR = "styleClass"; //$NON-NLS-1$
- /** HTML_CLASS_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_CLASS} instead
+ */
public static final String HTML_CLASS_ATTR = "class"; //$NON-NLS-1$
- /** HTML_CELLSPACING_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_CELLSPACING} instead
+ */
public static final String HTML_CELLSPACING_ATTR = "cellspacing"; //$NON-NLS-1$
- /** HTML_CELLPADDING_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_CELLPADDING} instead
+ */
public static final String HTML_CELLPADDING_ATTR = "cellpadding"; //$NON-NLS-1$
- /** HTML_ALIGN_LEFT_VALUE * */
+ /**
+ * @deprecated use {@link HTML#VALUE_ALIGN_LEFT} instead
+ */
public static final String HTML_ALIGN_LEFT_VALUE = "left"; //$NON-NLS-1$
- /** HTML_ALIGN_RIGHT_VALUE * */
+ /**
+ * @deprecated use {@link HTML#VALUE_ALIGN_RIGHT} instead
+ */
public static final String HTML_ALIGN_RIGHT_VALUE = "right"; //$NON-NLS-1$
- /** HTML_ALIGN_CENTER_VALUE * */
+ /**
+ * @deprecated use {@link HTML#VALUE_ALIGN_CENTER} instead
+ */
public static final String HTML_ALIGN_CENTER_VALUE = "center"; //$NON-NLS-1$
- /** HTML_ATR_WIDTH */
+ /**
+ * @deprecated use {@link HTML#ATTR_WIDTH} instead
+ */
public static final String HTML_ATR_WIDTH = "width"; //$NON-NLS-1$
- /** HTML_ATR_WIDTH */
+ /**
+ * @deprecated use {@link HTML#ATTR_HEIGHT} instead
+ */
public static final String HTML_ATR_HEIGHT = "height"; //$NON-NLS-1$
- /** HTML_ATR_src */
+ /**
+ * @deprecated use {@link HTML#ATTR_SRC} instead
+ */
public static final String HTML_ATR_SRC = "src"; //$NON-NLS-1$
- /** style */
+ /**
+ * @deprecated use {@link HTML#ATTR_STYLE} instead
+ */
public static final String HTML_STYLE_ATTR = "style"; //$NON-NLS-1$
- /** scope */
+ /**
+ * @deprecated use {@link HTML#ATTR_SCOPE} instead
+ */
public static final String HTML_SCOPE_ATTR = "scope"; //$NON-NLS-1$
- /** HTML_TABLE_ATR_ */
+ /**
+ * @deprecated use {@link HTML#ATTR_BORDER} instead
+ */
public static final String HTML_BORDER_ATTR = "border"; //$NON-NLS-1$
- /** HTML_ALIGN_ATR */
+ /**
+ * @deprecated use {@link HTML#ATTR_ALIGN} instead
+ */
public static final String HTML_ALIGN_ATTR = "align"; //$NON-NLS-1$
- /** HTML_TABLE_ATR_ */
+ // TODO: move the constant from this class to somewhere
public static final String FILE_PROTOCOL = "file://"; //$NON-NLS-1$
- /** HTML_COLSPAN_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_COLSPAN} instead
+ */
public static final String HTML_COLSPAN_ATTR = "colspan"; //$NON-NLS-1$
- /** HTML_ROWSPAN_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_ROWSPAN} instead
+ */
public static final String HTML_ROWSPAN_ATTR = "rowspan"; //$NON-NLS-1$
- /** HTML_ROW_ATTR * */
+ /** @deprecated there is no tag with row attribute */
+ // TODO: remove the attribute from the code
public static final String HTML_ROW_ATTR = "row"; //$NON-NLS-1$
- /** HTML_SIZE_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_SIZE} instead
+ */
public static final String HTML_SIZE_ATTR = "size"; //$NON-NLS-1$
- /** HTML_TYPE_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_TYPE} instead
+ */
public static final String HTML_TYPE_ATTR = "type"; //$NON-NLS-1$
- /** HTML_READONLY_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_READONLY} instead
+ */
public static final String HTML_READONLY_ATTR = "readonly"; //$NON-NLS-1$
- /** HTML_TAG_BUTTON * */
+ /**
+ * @deprecated use {@link HTML#TAG_BUTTON} instead
+ */
public static final String HTML_TAG_BUTTON = "button"; //$NON-NLS-1$
- /** HTML_VALUE_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_VALUE} instead
+ */
public static final String HTML_VALUE_ATTR = "value"; //$NON-NLS-1$
- /** CSS_BORDER_WIDTH */
+ /**
+ * @deprecated use {@link HTML#STYLE_PARAMETER_BORDER_WIDTH} instead
+ */
public static final String CSS_BORDER_WIDTH = "border-width"; //$NON-NLS-1$
- /** CSS_BORDER_STYLE */
+ /**
+ * @deprecated use {@link HTML#STYLE_PARAMETER_BORDER_STYLE} instead
+ */
public static final String CSS_BORDER_STYLE = "border-style"; //$NON-NLS-1$
+ /**
+ * @deprecated use {@link HTML#STYLE_PARAMETER_DISPLAY} instead
+ */
public static final String CSS_DISPLAY = "display"; //$NON-NLS-1$
- /** HTML_WIDTH_ATTR * */
+ /**
+ * @deprecated use {@link HTML#ATTR_WIDTH} instead
+ */
public static final String HTML_WIDTH_ATTR = "width"; //$NON-NLS-1$
- /** HTML_ATTR_VALIGN */
+ /**
+ * @deprecated use {@link HTML#ATTR_VALIGN} instead
+ */
public static final String HTML_ATTR_VALIGN = "valign"; //$NON-NLS-1$
- /** HTML_ATTR_VALIGN_MIDDLE_VALUE */
+ /**
+ * @deprecated use {@link HTML#STYLE_VALUE_MIDDLE} instead
+ */
public static final String HTML_ATTR_VALIGN_MIDDLE_VALUE = "middle"; //$NON-NLS-1$
- /** HTML_ATTR_BACKGROUND */
+ /**
+ * @deprecated use {@link HTML#ATTR_BACKGROUND} instead
+ */
public static final String HTML_ATTR_BACKGROUND = "background"; //$NON-NLS-1$
- /** HTML_ATTR_BACKGROUND */
+ /**
+ * @deprecated use {@link HTML#ATTR_DISABLED} instead
+ */
public static final String HTML_ATTR_DISABLED = "disabled"; //$NON-NLS-1$
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java 2008-12-08 12:46:37 UTC (rev 12467)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataOrderedListTemplate.java 2008-12-08 15:11:42 UTC (rev 12468)
@@ -22,39 +22,43 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.util.HTML;
public class RichFacesDataOrderedListTemplate extends VpeAbstractTemplate {
- /** CSS_FILE_NAME */
- final static private String CSS_FILE_NAME = "dataOrderedList/dataOrderedList.css";
+ private static final String ORDERED_LIST_CLASSES = "dr-list rich-orderedlist"; //$NON-NLS-1$
+ private static final String LIST_ITEM_CLASSES = "dr-list-item rich-list-item"; //$NON-NLS-1$
+ private static final String CSS_FILE_NAME = "dataOrderedList/dataOrderedList.css"; //$NON-NLS-1$
+
public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
Element sourceElement = (Element)sourceNode;
- nsIDOMElement orderedList = visualDocument.createElement("ol");
+ nsIDOMElement orderedList = visualDocument.createElement(HTML.TAG_OL);
ComponentUtil.setCSSLink(pageContext, CSS_FILE_NAME, "richFacesDataOrderList");
VisualDomUtil.copyAttributes(sourceNode, orderedList);
ComponentUtil.correctAttribute(sourceElement, orderedList,
- HtmlComponentUtil.HTML_STYLECLASS_ATTR,
- HtmlComponentUtil.HTML_CLASS_ATTR,
- "dr-list rich-orderedlist",
- "dr-list rich-orderedlist");
+ RichFaces.ATTR_STYLE_CLASS,
+ HTML.ATTR_CLASS,
+ ORDERED_LIST_CLASSES,
+ ORDERED_LIST_CLASSES);
ComponentUtil.correctAttribute(sourceElement, orderedList,
- HtmlComponentUtil.HTML_STYLE_ATTR,
- HtmlComponentUtil.HTML_STYLE_ATTR, null, null);
+ RichFaces.ATTR_STYLE,
+ HTML.ATTR_STYLE , null, null);
VpeCreationData creatorInfo = new VpeCreationData(orderedList);
- int rows = 3;
+ int rows = 1;
try {
- rows = Integer.parseInt(sourceElement.getAttribute(HtmlComponentUtil.HTML_ROW_ATTR));
+ rows = Integer.parseInt(sourceElement.getAttribute(RichFaces.ATTR_ROWS));
} catch (NumberFormatException x) {
- rows = 3;
+ // this is OK, rows still equals 1
}
for (int i = 0; i < rows; i++) {
- nsIDOMElement listItem = visualDocument.createElement("li");
- listItem.setAttribute("class", "dr-list-item rich-list-item");
+ nsIDOMElement listItem = visualDocument.createElement(HTML.TAG_LI);
+ listItem.setAttribute(HTML.ATTR_CLASS, LIST_ITEM_CLASSES);
orderedList.appendChild(listItem);
VpeChildrenInfo info = new VpeChildrenInfo(listItem);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-12-08 12:46:37 UTC (rev 12467)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2008-12-08 15:11:42 UTC (rev 12468)
@@ -66,7 +66,7 @@
/** The Constant ATTR_NAME. */
public static final String ATTR_NAME = "name"; //$NON-NLS-1$
public static final String ATTR_POPUP = "popup";//$NON-NLS-1$
- /** The Constant ATTR_ROW_CLASSES. */
+ public static final String ATTR_ROWS = "rows"; //$NON-NLS-1$
public static final String ATTR_ROW_CLASSES = "rowClasses"; //$NON-NLS-1$
public static final String ATTR_SELECT_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$
public static final String ATTR_SELECT_ITEM_VALUE = "itemValue"; //$NON-NLS-1$
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-12-08 12:46:37 UTC (rev 12467)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-12-08 15:11:42 UTC (rev 12468)
@@ -38,6 +38,7 @@
public static final String TAG_TD = "TD"; //$NON-NLS-1$
public static final String TAG_DL = "DL"; //$NON-NLS-1$
public static final String TAG_DT = "DT"; //$NON-NLS-1$
+ public static final String TAG_DD = "DD"; //$NON-NLS-1$
public static final String TAG_COL = "COL"; //$NON-NLS-1$
public static final String TAG_COLS = "COLS"; //$NON-NLS-1$
public static final String TAG_COLGROUP = "COLGROUP"; //$NON-NLS-1$
@@ -93,6 +94,7 @@
public static final String ATTR_READONLY = "readonly"; //$NON-NLS-1$
public static final String ATTR_SCOPE = "scope"; //$NON-NLS-1$
public static final String ATTR_SPAN = "span"; //$NON-NLS-1$
+ public static final String ATTR_BACKGROUND = "background"; //$NON-NLS-1$
/**Use this constant if you have to span a column to entire row.*/
/* While in HTML 4.01 standard "colspan='0'" should be used for this purpose,
@@ -102,6 +104,7 @@
public static final String VALUE_ALIGN_TOP = "top"; //$NON-NLS-1$
public static final String VALUE_ALIGN_RIGHT = "right"; //$NON-NLS-1$
+ public static final String VALUE_ALIGN_LEFT = "left"; //$NON-NLS-1$
public static final String VALUE_ALIGN_MIDDLE = "middle"; //$NON-NLS-1$
public static final String VALUE_CLASS_DELIMITER = " "; //$NON-NLS-1$
public static final String VALUE_TYPE_TEXT = "text"; //$NON-NLS-1$
@@ -121,9 +124,12 @@
public static final String STYLE_PARAMETER_LEFT = "left"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_HEIGHT = "height"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_BACKGROUND_IMAGE = "background-image"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_BORDER_WIDTH = "border-width"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_BORDER_STYLE = "border-style"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_MAX_HEIGHT = "max-height"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_ZINDEX = "z-index"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_CLEAR = "clear"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_TABLE_LAYOUT = "table-layout"; //$NON-NLS-1$
public static final String STYLE_VALUE_FIXED = "fixed"; //$NON-NLS-1$
+ public static final String STYLE_VALUE_MIDDLE = "middle"; //$NON-NLS-1$
}
17 years, 4 months
JBoss Tools SVN: r12467 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template: util and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2008-12-08 07:46:37 -0500 (Mon, 08 Dec 2008)
New Revision: 12467
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3066, checking if h:commandLink is placed inside h:form or a4j:form was added.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java 2008-12-08 09:00:41 UTC (rev 12466)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCommandLinkTemplate.java 2008-12-08 12:46:37 UTC (rev 12467)
@@ -12,6 +12,7 @@
import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -27,32 +28,69 @@
*/
public class JsfCommandLinkTemplate extends AbstractOutputJsfTemplate {
+ private static final String H_FORM = "h:form"; //$NON-NLS-1$
+ private static final String A4J_FORM = "a4j:form"; //$NON-NLS-1$
+ private static final String OUTSIDE_FORM_TEXT = ": This link is disabled as it is not nested within a JSF form."; //$NON-NLS-1$
+
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
Element element = (Element) sourceNode;
+ nsIDOMElement parentElement;
boolean disabled = ComponentUtil.string2boolean(ComponentUtil
.getAttribute(element, HTML.ATTR_DISABLED));
-
- nsIDOMElement parentElement;
- if (disabled)
+ String value = ComponentUtil.getAttribute(element, HTML.ATTR_VALUE);
+ boolean hasParentForm = hasParentForm(element);
+
+ if (!hasParentForm) {
parentElement = visualDocument.createElement(HTML.TAG_SPAN);
- else
+ } else if (disabled){
+ parentElement = visualDocument.createElement(HTML.TAG_SPAN);
+ } else {
parentElement = visualDocument.createElement(HTML.TAG_A);
+ }
- VpeCreationData creationData = new VpeCreationData(parentElement);
-
// copy attributes
copyOutputJsfAttributes(parentElement, element);
- processOutputAttribute(pageContext, visualDocument, element,
- parentElement, creationData);
-
+ VpeCreationData creationData;
+ if (!hasParentForm) {
+ nsIDOMElement topSpan = visualDocument.createElement(HTML.TAG_SPAN);
+ nsIDOMElement noteSpan = visualDocument.createElement(HTML.TAG_SPAN);
+ noteSpan.appendChild(visualDocument.createTextNode(OUTSIDE_FORM_TEXT));
+ topSpan.appendChild(parentElement);
+ topSpan.appendChild(noteSpan);
+ creationData = new VpeCreationData(topSpan);
+ } else {
+ creationData = new VpeCreationData(parentElement);
+ }
+
+ VpeChildrenInfo linkInfo = new VpeChildrenInfo(parentElement);
+ creationData.addChildrenInfo(linkInfo);
+
+ for (Node child : ComponentUtil.getChildren(element)) {
+ linkInfo.addSourceChild(child);
+ }
+ if (ComponentUtil.isNotBlank(value)) {
+ parentElement.appendChild(visualDocument.createTextNode(value));
+ }
return creationData;
}
+ private boolean hasParentForm(Element sourceElement) {
+ Node parent = sourceElement.getParentNode();
+ while (parent != null && parent instanceof Element && parent.getNodeName() != null) {
+ if (parent.getNodeName().indexOf(H_FORM) >= 0
+ || parent.getNodeName().indexOf(A4J_FORM) >= 0) {
+ return true;
+ }
+ parent = parent.getParentNode();
+ }
+ return false;
+ }
+
@Override
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java 2008-12-08 09:00:41 UTC (rev 12466)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java 2008-12-08 12:46:37 UTC (rev 12467)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
@@ -43,30 +44,13 @@
VpeChildrenInfo divInfo = new VpeChildrenInfo(div);
creationData.addChildrenInfo(divInfo);
- for (Node child : getChildren(sourceElement)) {
+ for (Node child : ComponentUtil.getChildren(sourceElement)) {
divInfo.addSourceChild(child);
}
return creationData;
}
- /**
- * Gets the children.
- *
- * @param sourceElement the source element
- *
- * @return the children
- */
- public static List<Node> getChildren(Element sourceElement) {
- ArrayList<Node> children = new ArrayList<Node>();
- NodeList nodeList = sourceElement.getChildNodes();
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node child = nodeList.item(i);
- children.add(child);
- }
- return children;
- }
-
/* (non-Javadoc)
* @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String)
*/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java 2008-12-08 09:00:41 UTC (rev 12466)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java 2008-12-08 12:46:37 UTC (rev 12467)
@@ -10,12 +10,17 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.template.util;
+import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Utilities for jsf templates
@@ -25,115 +30,156 @@
*/
public class ComponentUtil {
- /**
- * Returns value of attribute.
- *
- * @param sourceElement
- * @param attributeName
- * @return
- */
- public static String getAttribute(Element sourceElement,
- String attributeName) {
- String attribute = sourceElement.getAttribute(attributeName);
- if (attribute == null) {
- attribute = "";
- }
- return attribute;
+ /**
+ * Returns value of attribute.
+ *
+ * @param sourceElement
+ * @param attributeName
+ * @return
+ */
+ public static String getAttribute(Element sourceElement,
+ String attributeName) {
+ String attribute = sourceElement.getAttribute(attributeName);
+ if (attribute == null) {
+ attribute = "";
}
+ return attribute;
+ }
- /**
- * Returns value of attribute.
- *
- * @param sourceElement
- * @param attributeName
- * @return
- */
- public static String getAttribute(nsIDOMElement sourceElement,
- String attributeName) {
- String attribute = sourceElement.getAttribute(attributeName);
- if (attribute == null) {
- attribute = "";
- }
- return attribute;
+ /**
+ * Returns value of attribute.
+ *
+ * @param sourceElement
+ * @param attributeName
+ * @return
+ */
+ public static String getAttribute(nsIDOMElement sourceElement,
+ String attributeName) {
+ String attribute = sourceElement.getAttribute(attributeName);
+ if (attribute == null) {
+ attribute = "";
}
-
- /**
- * Returns {@code true} if the {@code element} has attribute
- * {@code disabled} and its value is {@link #string2boolean(String) true}
- */
- public static boolean isDisabled(Element element) {
- return ComponentUtil.string2boolean(
- ComponentUtil.getAttribute(element, JSF.ATTR_DISABLED));
- }
-
- /**
- * Sets attribute {@code "disabled"} of the {@code element} to {@code "disabled"}
- * if the parameter {@code disabled} is {@code true},
- * <br/>
- * otherwise removes attribute {@code "disabled"} from the {@code element}
- * if it is present.
- */
- public static void setDisabled(nsIDOMElement element, boolean disabled) {
- if (disabled) {
- element.setAttribute(HTML.ATTR_DISABLED, HTML.ATTR_DISABLED);
- } else {
- element.removeAttribute(HTML.ATTR_DISABLED);
- }
- }
-
- /**
- * Copies {@code "disabled"} attribute from JSF {@code sourceElement} to
- * HTML {@code targetElement}.
- *
- * @see #isDisabled(Element)
- * @see #setDisabled(nsIDOMElement, boolean)
- */
- public static void copyDisabled(Element sourceElement, nsIDOMElement targetElement) {
- boolean disabled = ComponentUtil.isDisabled(sourceElement);
- ComponentUtil.setDisabled(targetElement, disabled);
- }
+ return attribute;
+ }
- /**
- * Parses string value retrieved from sourceElement.getAttribure(..) method
- * to its boolean value.
- * <p>
- * <code>true</code> is returned only if it specified explicitly,
- * otherwise <code>false</code> is returned.
- *
- * @param str
- * the string to parse
- * @return boolean value from string
- */
- public static boolean string2boolean(String str) {
- return Boolean.parseBoolean(str);
+ /**
+ * Returns {@code true} if the {@code element} has attribute {@code
+ * disabled} and its value is {@link #string2boolean(String) true}
+ */
+ public static boolean isDisabled(Element element) {
+ return ComponentUtil.string2boolean(ComponentUtil.getAttribute(element,
+ JSF.ATTR_DISABLED));
+ }
+
+ /**
+ * Sets attribute {@code "disabled"} of the {@code element} to {@code
+ * "disabled"} if the parameter {@code disabled} is {@code true}, <br/>
+ * otherwise removes attribute {@code "disabled"} from the {@code element}
+ * if it is present.
+ */
+ public static void setDisabled(nsIDOMElement element, boolean disabled) {
+ if (disabled) {
+ element.setAttribute(HTML.ATTR_DISABLED, HTML.ATTR_DISABLED);
+ } else {
+ element.removeAttribute(HTML.ATTR_DISABLED);
}
+ }
- /**
- * get bundle
- *
- * @param pageContext
- * @param attr
- * @return
- */
- public static String getBundleValue(VpePageContext pageContext, Attr attr) {
+ /**
+ * Copies {@code "disabled"} attribute from JSF {@code sourceElement} to
+ * HTML {@code targetElement}.
+ *
+ * @see #isDisabled(Element)
+ * @see #setDisabled(nsIDOMElement, boolean)
+ */
+ public static void copyDisabled(Element sourceElement,
+ nsIDOMElement targetElement) {
+ boolean disabled = ComponentUtil.isDisabled(sourceElement);
+ ComponentUtil.setDisabled(targetElement, disabled);
+ }
- return getBundleValue(pageContext, attr.getNodeValue());
+ /**
+ * Parses string value retrieved from sourceElement.getAttribure(..) method
+ * to its boolean value.
+ * <p>
+ * <code>true</code> is returned only if it specified explicitly, otherwise
+ * <code>false</code> is returned.
+ *
+ * @param str
+ * the string to parse
+ * @return boolean value from string
+ */
+ public static boolean string2boolean(String str) {
+ return Boolean.parseBoolean(str);
+ }
- }
+ /**
+ * get bundle
+ *
+ * @param pageContext
+ * @param attr
+ * @return
+ */
+ public static String getBundleValue(VpePageContext pageContext, Attr attr) {
- /**
- *
- * @param pageContext
- * @param value
- * @param offfset
- * @return
- */
- public static String getBundleValue(VpePageContext pageContext,
- String value) {
+ return getBundleValue(pageContext, attr.getNodeValue());
- BundleMap bundle = pageContext.getBundle();
+ }
- return bundle.getBundleValue(value);
+ /**
+ *
+ * @param pageContext
+ * @param value
+ * @param offfset
+ * @return
+ */
+ public static String getBundleValue(VpePageContext pageContext, String value) {
+ BundleMap bundle = pageContext.getBundle();
+
+ return bundle.getBundleValue(value);
+
+ }
+
+ /**
+ * Gets the children.
+ *
+ * @param sourceElement
+ * the source element
+ *
+ * @return the children
+ */
+ public static List<Node> getChildren(Element sourceElement) {
+ ArrayList<Node> children = new ArrayList<Node>();
+ NodeList nodeList = sourceElement.getChildNodes();
+ for (int i = 0; i < nodeList.getLength(); i++) {
+ Node child = nodeList.item(i);
+ children.add(child);
}
+ return children;
+ }
+
+ /**
+ * Checks if is blank.
+ *
+ * @param value
+ * the value
+ *
+ * @return true, if is blank
+ */
+ public static boolean isBlank(String value) {
+ return ((value == null) || (value.trim().length() == 0));
+ }
+
+ /**
+ * Checks if is not blank.
+ *
+ * @param value
+ * the value
+ *
+ * @return true, if is not blank
+ */
+ public static boolean isNotBlank(String value) {
+ return !isBlank(value);
+ }
}
17 years, 4 months
JBoss Tools SVN: r12466 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2008-12-08 04:00:41 -0500 (Mon, 08 Dec 2008)
New Revision: 12466
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java
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/SmooksResourceConfigFormBlock.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java
Log:
JBIDE-3371
Add new GUI in configuration page
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -33,6 +33,8 @@
public static final String TYPE_XSL = "xsl";
+ public static final String[] TEMPLATE_TYPES = new String[] { "xsl","ftl" };
+
public static final String BEAN_CLASS = "beanClass";
public static final String BEAN_ID = "beanId";
@@ -93,7 +95,11 @@
if(resource == null) return false;
String type = resource.getType();
if(type != null) type = type.trim();
- return TYPE_XSL.equals(type);
+ for (int i = 0; i < TEMPLATE_TYPES.length; i++) {
+ String type1 = TEMPLATE_TYPES[i];
+ if(type1.equalsIgnoreCase(type)) return true;
+ }
+ return false;
}
public static boolean isDateTypeSelector(ResourceConfigType type) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksResourceFactoryImpl.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -50,6 +50,7 @@
result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -891,8 +891,8 @@
throw new RuntimeException(e);
}
}
- throw new RuntimeException(
- "Can't load Java bean model form the config file.");
+// throw new RuntimeException(
+// "Can't load Java bean model form the config file.");
}
// if can't load the source from GraphicalInformation , return NULL
if (current == null && rootClassName == null)
@@ -924,8 +924,8 @@
} catch (ClassNotFoundException e) {
// TODO if can't find the class throws exception
// MODIFY by Dart 2008.11.12
- throw new RuntimeException("Can't find the class : \""
- + rootClassName + "\" to create the JavaBean model");
+// throw new RuntimeException("Can't find the class : \""
+// + rootClassName + "\" to create the JavaBean model");
}
}
boolean rootIsError = false;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -48,6 +48,7 @@
import org.jboss.tools.smooks.ui.SmooksUIActivator;
/**
+ * @deprecated
* @author Dart Peng<br>
* Date : Sep 11, 2008
*/
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -0,0 +1,68 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui.editors;
+
+import org.eclipse.jface.viewers.LabelProvider;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder;
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.model.ResourceType;
+import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+
+/**
+ * @author Dart
+ *
+ */
+public class ConfigurationViewerLabelProvider extends LabelProvider {
+ public String getText(Object element) {
+ if (element instanceof ResourceConfigType) {
+// if (SmooksModelUtils
+// .isBeanPopulatorResource((ResourceConfigType) element)) {
+// String selector = ((ResourceConfigType) element).getSelector();
+// if (selector == null)
+// selector = Messages
+// .getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$
+// return Messages
+// .getString("SmooksResourceConfigFormBlock.BeanPopulator") + selector; //$NON-NLS-1$
+// }
+ if (SmooksModelUtils
+ .isDateTypeSelector((ResourceConfigType) element)) {
+ String name = Messages
+ .getString("SmooksResourceConfigFormBlock.DateType"); //$NON-NLS-1$
+ String selector = ((ResourceConfigType) element).getSelector();
+ if (selector == null) {
+ return name;
+ }
+ selector = selector.trim();
+ if (selector.indexOf(":") != -1) {
+ selector = selector.substring(selector.indexOf(":") + 1,
+ selector.length());
+ }
+ return name + "(" + selector + ")";
+ }
+ if (SmooksModelUtils
+ .isFilePathResourceConfig((ResourceConfigType) element)) {
+ String selector = ((ResourceConfigType) element).getSelector();
+ if (selector == null)
+ selector = Messages
+ .getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$
+ return Messages
+ .getString("SmooksResourceConfigFormBlock.TemplateFile") + selector; //$NON-NLS-1$
+ }
+ if (SmooksModelUtils
+ .isInnerFileContents((ResourceConfigType) element)) {
+ ResourceType re = ((ResourceConfigType) element).getResource();
+ String type = re.getType();
+ String label = Messages
+ .getString("SmooksResourceConfigFormBlock.TemplateFile") + "(" + type + ")";
+ return label;
+ }
+ String s = ((ResourceConfigType) element).getSelector();
+ if (s == null)
+ s = Messages
+ .getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$
+ return "ResourceConfig (" + s + ")"; //$NON-NLS-1$
+ }
+ return super.getText(element);
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ConfigurationViewerLabelProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DocumentResourceTypeDetailPage.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -3,14 +3,19 @@
*/
package org.jboss.tools.smooks.ui.editors;
+import java.util.Collection;
import java.util.Collections;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.ui.dialogs.WorkspaceResourceDialog;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -19,19 +24,27 @@
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.Text;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.smooks.model.ParamType;
import org.jboss.tools.smooks.model.ResourceType;
import org.jboss.tools.smooks.model.SmooksPackage;
import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.ui.SmooksUIActivator;
+import org.jboss.tools.smooks.utils.UIUtils;
/**
* @author dart
*
*/
public class DocumentResourceTypeDetailPage extends
- AbstractSmooksModelDetailPage {
+ AbstractSmooksModelDetailPage implements ParamaterChangeLitener {
private static final int INNER = 0;
private static final int EXTERNAL = 1;
@@ -42,16 +55,58 @@
private Text innerContentText;
private Button browseButton;
private boolean isInit = true;
+ private Combo typeCombo;
+ //
+ // private static final String PARAM_NAME_PRO = "__param_name_pro";
+ //
+ // private static final String PARAM_VALUE_PRO = "__param_value_pro";
+ private ParamaterTableViewerCreator creator;
+
public DocumentResourceTypeDetailPage(SmooksFormEditor parentEditor,
EditingDomain domain) {
super(parentEditor, domain);
}
protected void createExternlaSelectionGUI(Composite parent) {
+ Hyperlink link = formToolKit.createHyperlink(parent, Messages
+ .getString("DocumentResourceTypeDetailPage.DocPath"), SWT.NONE);
+ link.addHyperlinkListener(new IHyperlinkListener() {
- this.formToolKit.createLabel(parent, Messages
- .getString("DocumentResourceTypeDetailPage.DocPath")); //$NON-NLS-1$
+ public void linkActivated(HyperlinkEvent e) {
+ if (!externalCheckButton.getSelection())
+ return;
+ String path = text.getText();
+ if (path == null)
+ return;
+ Path p = new Path(path);
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ IResource resource = root.findMember(p);
+ if (resource != null && resource.exists()
+ && resource instanceof IFile) {
+ try {
+ IDE.openEditor(SmooksUIActivator.getDefault()
+ .getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage(), (IFile) resource);
+ } catch (PartInitException e1) {
+ UIUtils.showErrorDialog(parentEditor.getSite()
+ .getShell(), UIUtils.createErrorStatus(e1));
+ }
+ } else {
+ MessageDialog.openError(parentEditor.getSite().getShell(),
+ "Error", "Can't open the editor , because the \""
+ + path + "\" dosen't exist or isn't file.");
+ }
+ }
+
+ public void linkEntered(HyperlinkEvent e) {
+
+ }
+
+ public void linkExited(HyperlinkEvent e) {
+ }
+ });
+
Composite fileCom = formToolKit.createComposite(parent);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
fileCom.setLayoutData(gd);
@@ -81,12 +136,18 @@
super.widgetSelected(e);
browseFileSystem();
}
-
});
formToolKit.paintBordersFor(fileCom);
}
+ private void initTypeCombo() {
+ for (int i = 0; i < SmooksModelUtils.TEMPLATE_TYPES.length; i++) {
+ String type = SmooksModelUtils.TEMPLATE_TYPES[i];
+ typeCombo.add(type);
+ }
+ }
+
protected void handleRadioButtons() {
externalCheckButton.addSelectionListener(new SelectionAdapter() {
@Override
@@ -127,7 +188,20 @@
});
selectorText.setLayoutData(gd);
+ formToolKit.createLabel(parent, "Type :");
+ typeCombo = new Combo(parent, SWT.FLAT);
+ initTypeCombo();
gd = new GridData(GridData.FILL_HORIZONTAL);
+ typeCombo.setLayoutData(gd);
+ typeCombo.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ resetResourceType();
+ }
+
+ });
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
externalCheckButton = formToolKit.createButton(parent,
"External File Selection", SWT.RADIO);
@@ -146,25 +220,69 @@
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
- formToolKit.createSeparator(parent, SWT.HORIZONTAL).setLayoutData(gd);
+ // formToolKit.createSeparator(parent,
+ // SWT.HORIZONTAL).setLayoutData(gd);
+ createParamerTable(parent);
+
formToolKit.paintBordersFor(parent);
handleRadioButtons();
}
+ protected void resetResourceType() {
+ String type = typeCombo.getText();
+ if (type == null)
+ return;
+ if (type != null) {
+ type = type.trim();
+ }
+
+ ResourceType resource = resourceConfig.getResource();
+ if (resource != null) {
+ resource.setType(type);
+ parentEditor.fireEditorDirty(true);
+ }
+ }
+
+ protected void createParamerTable(Composite parent) {
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ formToolKit.createLabel(parent, "Paramater List : ").setLayoutData(gd);
+ creator = new ParamaterTableViewerCreator(
+ parent, formToolKit, SWT.NONE);
+ creator.addParamaterListener(this);
+ }
+
+
protected void createInnerContentsGUI(Composite parent) {
GridData gd = new GridData(GridData.BEGINNING);
gd.verticalAlignment = GridData.BEGINNING;
- formToolKit.createLabel(parent, "File Contents").setLayoutData(gd);
+ // formToolKit.createLabel(parent, "File Contents :").setLayoutData(gd);
innerContentText = formToolKit.createText(parent, "", SWT.MULTI
| SWT.V_SCROLL | SWT.H_SCROLL);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.heightHint = 200;
+ gd.horizontalSpan = 2;
innerContentText.setLayoutData(gd);
+ innerContentText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ resetCDATA();
+ }
+
+ });
}
+ private void resetCDATA() {
+ String text = innerContentText.getText();
+ if (text == null)
+ text = "";
+ SmooksModelUtils.setCDATAToAnyType(this.resourceConfig.getResource(),
+ text);
+ parentEditor.fireEditorDirty(true);
+ }
+
protected void resetSelector(String selector) {
Command command = SetCommand.create(domain, resourceConfig,
SmooksPackage.eINSTANCE.getResourceConfigType_Selector(),
@@ -227,8 +345,13 @@
selectorText.setText(selector);
ResourceType resource = resourceConfig.getResource();
if (resource != null) {
+ String type = resource.getType();
+ if (type != null) {
+ typeCombo.setText(type);
+ }
if (isInit) {
-
+ creator.setInput(resourceConfig);
+ creator.setResourceConfig(resourceConfig);
if (SmooksModelUtils.isInnerFileContents(resourceConfig)) {
String cdata = resource.getCDATAValue();
if (cdata == null)
@@ -281,4 +404,15 @@
return -1;
}
+ public void paramaterAdded(ParamType param) {
+ parentEditor.fireEditorDirty(true);
+ }
+
+ public void paramaterChanged(ParamType param) {
+ parentEditor.fireEditorDirty(true);
+ }
+
+ public void paramaterRemoved(Collection<ParamType> params) {
+ parentEditor.fireEditorDirty(true);
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/MappingGraphCompositeCreator.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -40,6 +40,7 @@
/**
+ * @deprecated
* @author Dart Peng
* @Date Aug 5, 2008
*/
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -0,0 +1,172 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui.editors;
+
+import java.util.Collection;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.smooks.model.ParamType;
+import org.jboss.tools.smooks.model.ResourceType;
+import org.jboss.tools.smooks.model.SmooksFactory;
+import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+
+/**
+ * @author Dart
+ *
+ */
+public class NormalResourceConfigDetailPage extends
+ AbstractSmooksModelDetailPage {
+
+ private boolean init = true;
+ private ParamaterTableViewerCreator paramTable;
+ private Text resourceValueText;
+ private Text resourceTypeText;
+ private Text selectorText;
+
+ public NormalResourceConfigDetailPage(SmooksFormEditor parentEditor,
+ EditingDomain domain) {
+ super(parentEditor, domain);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#
+ * createSectionContents(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected void createSectionContents(Composite parent) {
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ parent.setLayout(layout);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ formToolKit.createLabel(parent, "Selector : ");
+ selectorText = formToolKit.createText(parent, "");
+ selectorText.setLayoutData(gd);
+
+ formToolKit.createLabel(parent, "Resource Type : ");
+ resourceTypeText = formToolKit.createText(parent, "");
+ resourceTypeText.setLayoutData(gd);
+
+ formToolKit.createLabel(parent, "Resource Value : ");
+ resourceValueText = formToolKit.createText(parent, "");
+ resourceValueText.setLayoutData(gd);
+
+ formToolKit.paintBordersFor(parent);
+
+ paramTable = new ParamaterTableViewerCreator(parent, formToolKit,
+ SWT.NONE);
+ paramTable.addParamaterListener(new ParamaterChangeLitener() {
+
+ public void paramaterAdded(ParamType param) {
+ parentEditor.fireEditorDirty(true);
+ }
+
+ public void paramaterChanged(ParamType param) {
+ parentEditor.fireEditorDirty(true);
+ }
+
+ public void paramaterRemoved(Collection<ParamType> params) {
+ parentEditor.fireEditorDirty(true);
+ }
+
+ });
+
+ hookText();
+ }
+
+ protected void hookText() {
+ selectorText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ resourceConfig.setSelector(selectorText.getText());
+ parentEditor.fireEditorDirty(true);
+ }
+
+ });
+
+ resourceTypeText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ ResourceType resource = resourceConfig.getResource();
+ if (resource == null) {
+ resource = SmooksFactory.eINSTANCE.createResourceType();
+ resourceConfig.setResource(resource);
+ }
+ if (resource != null) {
+ resource.setType(resourceTypeText.getText());
+ parentEditor.fireEditorDirty(true);
+ }
+ }
+
+ });
+
+ resourceValueText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ ResourceType resource = resourceConfig.getResource();
+ if (resource == null) {
+ resource = SmooksFactory.eINSTANCE.createResourceType();
+ resourceConfig.setResource(resource);
+ }
+ if (resource != null) {
+ SmooksModelUtils.setTextToAnyType(resource,
+ resourceValueText.getText());
+ parentEditor.fireEditorDirty(true);
+ }
+ }
+
+ });
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#initSectionUI
+ * ()
+ */
+ @Override
+ protected void initSectionUI() {
+ paramTable.setInput(resourceConfig);
+ paramTable.setResourceConfig(resourceConfig);
+ ResourceType resource = resourceConfig.getResource();
+ String type = "";
+ String value = "";
+ if (resource != null) {
+ type = resource.getType();
+ if (type != null) {
+ type = type.trim();
+
+ } else {
+ type = "";
+ }
+ value = SmooksModelUtils.getAnyTypeText(resource);
+ if (value != null) {
+ value = value.trim();
+ } else {
+ value = "";
+ }
+ }
+ resourceTypeText.setText(type);
+ resourceValueText.setText(value);
+ String selector = resourceConfig.getSelector();
+ if (selector != null) {
+ selector = selector.trim();
+ }else{
+ selector = "";
+ }
+ selectorText.setText(selector);
+
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigDetailPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -0,0 +1,25 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui.editors;
+
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.ui.ResourceConfigWarrper;
+
+/**
+ * @author Dart
+ *
+ */
+public class NormalResourceConfigWarpper extends ResourceConfigWarrper {
+
+ public NormalResourceConfigWarpper() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public NormalResourceConfigWarpper(ResourceConfigType type) {
+ super(type);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/NormalResourceConfigWarpper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui.editors;
+
+import java.util.Collection;
+
+import org.jboss.tools.smooks.model.ParamType;
+
+/**
+ * @author Dart
+ *
+ */
+public interface ParamaterChangeLitener {
+ public void paramaterAdded(ParamType param);
+
+ public void paramaterRemoved(Collection<ParamType> params);
+
+ public void paramaterChanged(ParamType param);
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterChangeLitener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -0,0 +1,309 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui.editors;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ICellModifier;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Item;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.jboss.tools.smooks.model.ParamType;
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.model.SmooksFactory;
+import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants;
+
+/**
+ * @author Dart
+ *
+ */
+public class ParamaterTableViewerCreator extends Composite {
+ private TableViewer viewer;
+ private FormToolkit formToolKit;
+
+ private List<ParamaterChangeLitener> listenerList = new ArrayList<ParamaterChangeLitener>();
+
+ public static final String PARAM_NAME_PRO = "__param_name_pro";
+
+ public static final String PARAM_VALUE_PRO = "__param_value_pro";
+
+ private ResourceConfigType resourceConfig;
+
+ public ResourceConfigType getResourceConfig() {
+ return resourceConfig;
+ }
+
+ public void setResourceConfig(ResourceConfigType resourceConfig) {
+ this.resourceConfig = resourceConfig;
+ }
+
+ public void setInput(Object input) {
+ viewer.setInput(input);
+ }
+
+ public ParamaterTableViewerCreator(Composite parent,
+ FormToolkit formToolKit, int style) {
+ super(parent, style);
+ this.formToolKit = formToolKit;
+ createParamaterTableViewer(this.formToolKit, parent);
+ }
+
+ private Button createButtonForParamerTable(Composite parent, String label) {
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ Button button = formToolKit.createButton(parent, label, SWT.NONE);
+ button.setLayoutData(gd);
+ return button;
+ }
+
+ public void addParamaterListener(ParamaterChangeLitener listener) {
+ this.listenerList.add(listener);
+ }
+
+ public void removeParamaterListener(ParamaterChangeLitener listener) {
+ this.listenerList.remove(listener);
+ }
+
+ protected void createParamaterTableViewer(FormToolkit formToolKit,
+ Composite parent) {
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.horizontalSpan = 2;
+ this.setLayoutData(gd);
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+
+ GridLayout layout = new GridLayout();
+ layout.marginWidth = 0;
+ layout.marginHeight = 0;
+ layout.numColumns = 2;
+ this.setLayout(layout);
+
+ Composite tableContainer = formToolKit.createComposite(this);
+
+ FillLayout filllayout = new FillLayout();
+ filllayout.marginHeight = 1;
+ filllayout.marginWidth = 1;
+ tableContainer.setLayout(filllayout);
+ viewer = new TableViewer(tableContainer, SWT.NONE | SWT.MULTI);
+
+ TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE);
+ nameColumn.setText("Paramer Name");
+ nameColumn.setWidth(150);
+
+ TableColumn valueColumn = new TableColumn(viewer.getTable(), SWT.NONE);
+ valueColumn.setText("Paramer Value");
+ valueColumn.setWidth(100);
+ viewer.getTable().setHeaderVisible(true);
+ viewer.getTable().setLinesVisible(true);
+ viewer.setContentProvider(new ParamaterContentProvider());
+ viewer.setLabelProvider(new ParamaterLabelProvider());
+ viewer.setColumnProperties(new String[] { PARAM_NAME_PRO,
+ PARAM_VALUE_PRO });
+ viewer.setCellEditors(new CellEditor[] {
+ new TextCellEditor(viewer.getTable()),
+ new TextCellEditor(viewer.getTable()) });
+ viewer.setCellModifier(new ICellModifier() {
+
+ public boolean canModify(Object element, String property) {
+ if (element instanceof ParamType) {
+ if (property.equals(PARAM_NAME_PRO)
+ || property.equals(PARAM_VALUE_PRO))
+ return true;
+ }
+ return false;
+ }
+
+ public Object getValue(Object element, String property) {
+ Object data = element;
+ if (data instanceof ParamType) {
+ if (property.equals(PARAM_NAME_PRO)) {
+ String name = ((ParamType) data).getName();
+ if (name == null)
+ name = "";
+ return name;
+ }
+ if (property.equals(PARAM_VALUE_PRO)) {
+ String value = SmooksModelUtils
+ .getAnyTypeText((ParamType) data);
+ if (value == null)
+ value = "";
+ return value;
+ }
+ }
+ return null;
+ }
+
+ public void modify(Object element, String property, Object value) {
+ if (element instanceof Item) {
+ Object data = ((Item) element).getData();
+ if (data instanceof ParamType) {
+ if (property.equals(PARAM_NAME_PRO)) {
+ if (value.equals(((ParamType) data).getName()))
+ return;
+ ((ParamType) data).setName((String) value);
+ viewer.refresh(data);
+ }
+ if (property.equals(PARAM_VALUE_PRO)) {
+ if (value.equals(SmooksModelUtils
+ .getAnyTypeText((ParamType) data)))
+ return;
+ SmooksModelUtils.setTextToAnyType((ParamType) data,
+ (String) value);
+ viewer.refresh(data);
+ }
+ notifyParamChanged((ParamType) data);
+ }
+ }
+ }
+ });
+
+ tableContainer.setBackground(GraphicsConstants.groupBorderColor);
+ gd = new GridData(GridData.FILL_BOTH);
+ tableContainer.setLayoutData(gd);
+
+ Composite buttonComposite = formToolKit.createComposite(this);
+ gd = new GridData(GridData.FILL_VERTICAL);
+ buttonComposite.setLayoutData(gd);
+ GridLayout bgl = new GridLayout();
+ buttonComposite.setLayout(bgl);
+
+ Button newButton = createButtonForParamerTable(buttonComposite, "New");
+ newButton.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ super.widgetSelected(e);
+ if(resourceConfig == null) return;
+ ParamType param = SmooksFactory.eINSTANCE.createParamType();
+ param.setName("param");
+ SmooksModelUtils.setTextToAnyType(param, "value");
+ resourceConfig.getParam().add(param);
+ viewer.refresh();
+ notifyParamaterAdded(param);
+ }
+
+ });
+
+ Button deleteButton = createButtonForParamerTable(buttonComposite,
+ "Delete");
+ deleteButton.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ super.widgetSelected(e);
+ IStructuredSelection selection = (IStructuredSelection) viewer
+ .getSelection();
+ try {
+ if(resourceConfig == null) return;
+ resourceConfig.getParam().removeAll(selection.toList());
+ viewer.refresh();
+ notifyParamaterRemoved(selection.toList());
+ } catch (Throwable t) {
+ // ignore;
+ }
+ }
+
+ });
+ }
+
+ protected void notifyParamChanged(ParamType data) {
+ for (Iterator iterator = this.listenerList.iterator(); iterator
+ .hasNext();) {
+ ParamaterChangeLitener listener = (ParamaterChangeLitener) iterator
+ .next();
+ listener.paramaterChanged(data);
+ }
+ }
+
+ public void notifyParamaterRemoved(List params) {
+ for (Iterator iterator = this.listenerList.iterator(); iterator
+ .hasNext();) {
+ ParamaterChangeLitener listener = (ParamaterChangeLitener) iterator
+ .next();
+ listener.paramaterRemoved(params);
+ }
+ }
+
+ public void notifyParamaterAdded(ParamType param) {
+ for (Iterator iterator = this.listenerList.iterator(); iterator
+ .hasNext();) {
+ ParamaterChangeLitener listener = (ParamaterChangeLitener) iterator
+ .next();
+ listener.paramaterAdded(param);
+ }
+ }
+
+ private class ParamaterLabelProvider extends LabelProvider implements
+ ITableLabelProvider {
+
+ public Image getColumnImage(Object element, int columnIndex) {
+ if (element instanceof ParamType) {
+ if (columnIndex == 0) {
+
+ }
+ }
+ return null;
+ }
+
+ public String getColumnText(Object element, int columnIndex) {
+ if (element instanceof ParamType) {
+ if (columnIndex == 0) {
+ return ((ParamType) element).getName();
+ }
+ if (columnIndex == 1) {
+ String value = SmooksModelUtils
+ .getAnyTypeText((ParamType) element);
+ if (value == null)
+ value = "";
+ value = value.trim();
+ return value;
+ }
+ }
+ return "";
+ }
+
+ }
+
+ private class ParamaterContentProvider implements
+ IStructuredContentProvider {
+
+ public Object[] getElements(Object inputElement) {
+ if (inputElement instanceof ResourceConfigType) {
+ List<ParamType> paramList = ((ResourceConfigType) inputElement)
+ .getParam();
+ return paramList.toArray();
+ }
+ return new Object[] {};
+ }
+
+ public void dispose() {
+
+ }
+
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+ }
+
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ParamaterTableViewerCreator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -11,8 +11,6 @@
package org.jboss.tools.smooks.ui.editors;
import org.jboss.tools.smooks.model.ResourceConfigType;
-import org.jboss.tools.smooks.model.ResourceType;
-import org.jboss.tools.smooks.model.util.SmooksModelConstants;
import org.jboss.tools.smooks.model.util.SmooksModelUtils;
import org.jboss.tools.smooks.ui.BeanPopulatorWarrper;
import org.jboss.tools.smooks.ui.DateTypeWarrper;
@@ -28,10 +26,10 @@
public static ResourceConfigWarrper createResourceConfigWarrper(
ResourceConfigType type) {
- if (SmooksModelUtils.isBeanPopulatorResource(type)) {
- BeanPopulatorWarrper p = new BeanPopulatorWarrper(type);
- return p;
- }
+// if (SmooksModelUtils.isBeanPopulatorResource(type)) {
+// BeanPopulatorWarrper p = new BeanPopulatorWarrper(type);
+// return p;
+// }
if(SmooksModelUtils.isDateTypeSelector(type)){
DateTypeWarrper warrper = new DateTypeWarrper(type);
return warrper;
@@ -40,7 +38,7 @@
DocumentSelectionWarrper warrper = new DocumentSelectionWarrper(type);
return warrper;
}
- return null;
+ return new NormalResourceConfigWarpper(type);
}
}
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-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -97,7 +97,6 @@
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.ScrolledForm;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -152,11 +152,10 @@
*/
@Override
protected void registerPages(DetailsPart detailsPart) {
- detailsPart.registerPage(BeanPopulatorWarrper.class,
- new BeanPopulatorDetailPage(getParentEditor(), getDomain()));
+ detailsPart.registerPage(NormalResourceConfigWarpper.class,
+ new NormalResourceConfigDetailPage(getParentEditor(), getDomain()));
detailsPart.registerPage(DateTypeWarrper.class, new DateTypeDetailPage(
getParentEditor(), getDomain()));
-
detailsPart.registerPage(DocumentSelectionWarrper.class,
new DocumentResourceTypeDetailPage(getParentEditor(),
getDomain()));
@@ -164,48 +163,7 @@
protected void configDateTypeViewer() {
dateTypeViewer.setContentProvider(new DateTypeContentProvider());
- dateTypeViewer.setLabelProvider(new LabelProvider() {
-
- public String getText(Object element) {
- if (element instanceof ResourceConfigType) {
- if (NormalSmooksModelBuilder
- .isBeanPopulator((ResourceConfigType) element)) {
- String selector = ((ResourceConfigType) element)
- .getSelector();
- if (selector == null)
- selector = Messages.getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$
- return Messages.getString("SmooksResourceConfigFormBlock.BeanPopulator") + selector; //$NON-NLS-1$
- }
- if (NormalSmooksModelBuilder
- .isDateConfig((ResourceConfigType) element)) {
- String name = Messages.getString("SmooksResourceConfigFormBlock.DateType"); //$NON-NLS-1$
- String selector = ((ResourceConfigType) element).getSelector();
- if(selector == null){
- return name;
- }
- selector = selector.trim();
- if(selector.indexOf(":") != -1){
- selector = selector.substring(selector.indexOf(":") + 1, selector.length());
- }
- return name + "(" + selector + ")";
- }
- if (SmooksModelUtils
- .isFilePathResourceConfig((ResourceConfigType) element)) {
- String selector = ((ResourceConfigType) element)
- .getSelector();
- if (selector == null)
- selector = Messages.getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$
- return Messages.getString("SmooksResourceConfigFormBlock.TemplateFile") + selector; //$NON-NLS-1$
- }
- String s = ((ResourceConfigType) element).getSelector();
- if (s == null)
- s = Messages.getString("SmooksResourceConfigFormBlock.NULLString"); //$NON-NLS-1$
- return Messages.getString("SmooksResourceConfigFormBlock.UnknownResourceConfig") + s; //$NON-NLS-1$
- }
- return super.getText(element);
- }
-
- });
+ dateTypeViewer.setLabelProvider(new ConfigurationViewerLabelProvider());
// don't display the first ResourceConfig element;because it will be
// "show" with Smooks TransformData Type GUI
dateTypeViewer.setFilters(new ViewerFilter[] { new ViewerFilter() {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java 2008-12-08 01:37:53 UTC (rev 12465)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigFactory.java 2008-12-08 09:00:41 UTC (rev 12466)
@@ -46,18 +46,18 @@
ResourceType resource = SmooksFactory.eINSTANCE
.createResourceType();
config.setResource(resource);
- resource.setStringValue(SmooksModelConstants.BEAN_POPULATOR);
-
- ParamType idParmType = SmooksFactory.eINSTANCE.createParamType();
- ParamType classParmType = SmooksFactory.eINSTANCE.createParamType();
- ParamType bindingParmType = SmooksFactory.eINSTANCE
- .createParamType();
- idParmType.setName(SmooksModelConstants.BEAN_ID);
- classParmType.setName(SmooksModelConstants.BEAN_CLASS);
-
- config.getParam().add(idParmType);
- config.getParam().add(classParmType);
- config.getParam().add(bindingParmType);
+// resource.setStringValue(SmooksModelConstants.BEAN_POPULATOR);
+//
+// ParamType idParmType = SmooksFactory.eINSTANCE.createParamType();
+// ParamType classParmType = SmooksFactory.eINSTANCE.createParamType();
+// ParamType bindingParmType = SmooksFactory.eINSTANCE
+// .createParamType();
+// idParmType.setName(SmooksModelConstants.BEAN_ID);
+// classParmType.setName(SmooksModelConstants.BEAN_CLASS);
+//
+// config.getParam().add(idParmType);
+// config.getParam().add(classParmType);
+// config.getParam().add(bindingParmType);
return config;
}
if (SmooksModelConstants.DATE_DECODER.equals(key.getId())) {
@@ -100,7 +100,7 @@
public NewResourceConfigKey[] getAllIDs() {
NewResourceConfigKey bean = new NewResourceConfigKey();
bean.setId(SmooksModelConstants.BEAN_POPULATOR);
- bean.setName("BeanPopulator"); //$NON-NLS-1$
+ bean.setName("ResourceConfig Type"); //$NON-NLS-1$
NewResourceConfigKey date = new NewResourceConfigKey();
date.setId(SmooksModelConstants.DATE_DECODER);
17 years, 4 months
JBoss Tools SVN: r12465 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2008-12-07 20:37:53 -0500 (Sun, 07 Dec 2008)
New Revision: 12465
Added:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/build.properties
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
JBIDE-3321 Bad metadata for various features - branding the XULRunner feature
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/build.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/build.properties 2008-12-08 01:37:35 UTC (rev 12464)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/build.properties 2008-12-08 01:37:53 UTC (rev 12465)
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
Added: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties (rev 0)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2008-12-08 01:37:53 UTC (rev 12465)
@@ -0,0 +1,42 @@
+###############################################################################
+# Copyright (c) 2008 JBoss, a division of Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss, a division of Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=XULRunner
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss, a division of Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+discoverySiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=A feature that provides Mozilla's XULRunner as various platform-dependent plug-ins for Eclipse.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=Copyright (c) 2008 JBoss, a division of Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
+are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss, a division of Red Hat - Initial implementation.\n
+ ############### end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\nMarch 17, 2005\n\nUsage Of Content\n\nTHE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\nOTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\nUSE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\nAGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\nNOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\nAGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\nAND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\nOR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\nTERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\nOF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\nBELOW, THEN YOU MAY NOT USE THE CONTENT.\n\nApplicable Licenses\n\nUnless otherwise indicated, all Content made available by the Eclipse Foundation\nis provided to you under the terms and conditio!
ns of the Eclipse Public\nLicense Version 1.0 ("EPL"). A copy of the EPL is provided with this\nContent and is also available at http\://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.\n\nContent includes, but is not limited to, source code, object code,\ndocumentation and other files maintained in the Eclipse.org CVS\nrepository ("Repository") in CVS modules ("Modules") and made available\nas downloadable archives ("Downloads").\n\n- Content may be structured and packaged into modules to facilitate delivering,\nextending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\nplug-in fragments ("Fragments"), and features ("Features").\n- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\nin a directory named "plugins".\n- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\nEach Feature may be packaged as a sub-directory in a directory!
named "features".\nWithin a Feature, files named "feature.xml" may co
ntain a list of the names and version\nnumbers of the Plug-ins and/or Fragments associated with that Feature.\n- Features may also include other Features ("Included Features"). Within a Feature, files\nnamed "feature.xml" may contain a list of the names and version numbers of Included Features.\n\nFeatures may also include other Features ("Included Features"). Files named\n"feature.xml" may contain a list of the names and version numbers of\nIncluded Features.\n\nThe terms and conditions governing Plug-ins and Fragments should be\ncontained in files named "about.html" ("Abouts"). The terms and\nconditions governing Features and Included Features should be contained\nin files named "license.html" ("Feature Licenses"). Abouts and Feature\nLicenses may be located in any directory of a Download or Module\nincluding, but not limited to the following locations\:\n\n- The top-level (root) directory\n- Plug-in and Fragment directories\n- Inside Plug-ins and Fragments packaged as JAR!
s\n- Sub-directories of the directory named "src" of certain Plug-ins\n- Feature directories\n\nNote\: if a Feature made available by the Eclipse Foundation is installed using the\nEclipse Update Manager, you must agree to a license ("Feature Update\nLicense") during the installation process. If the Feature contains\nIncluded Features, the Feature Update License should either provide you\nwith the terms and conditions governing the Included Features or inform\nyou where you can locate them. Feature Update Licenses may be found in\nthe "license" property of files named "feature.properties". Such Abouts,\nFeature Licenses and Feature Update Licenses contain the terms and\nconditions (or references to such terms and conditions) that govern your\nuse of the associated Content in that directory.\n\nTHE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\nTO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\nSOME OF THESE OTHER LICENSE AGREEMENTS MA!
Y INCLUDE (BUT ARE NOT LIMITED TO)\:\n\n- Common Public License Versio
n 1.0 (available at http\://www.eclipse.org/legal/cpl-v10.html)\n- Apache Software License 1.1 (available at http\://www.apache.org/licenses/LICENSE)\n- Apache Software License 2.0 (available at http\://www.apache.org/licenses/LICENSE-2.0)\n- IBM Public License 1.0 (available at http\://oss.software.ibm.com/developerworks/opensource/license10.html)\n- Metro Link Public License 1.00 (available at http\://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n- Mozilla Public License Version 1.1 (available at http\://www.mozilla.org/MPL/MPL-1.1.html)\n\nIT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\nTO USE OF THE CONTENT. If no About, Feature License or Feature Update License\nis provided, please contact the Eclipse Foundation to determine what terms and conditions\ngovern that particular Content.\n\nCryptography\n\nContent may contain encryption software. The country in which you are\ncurrently may have restrictions on the import, posse!
ssion, and use,\nand/or re-export to another country, of encryption software. BEFORE\nusing any encryption software, please check the country's laws,\nregulations and policies concerning the import, possession, or use,\nand re-export of encryption software, to see if this is permitted.\n\nJava and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2008-12-08 01:37:35 UTC (rev 12464)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2008-12-08 01:37:53 UTC (rev 12465)
@@ -1,428 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jboss.tools.xulrunner.feature"
- label="XULRunner"
+ label="%featureName"
version="1.8.1.3-20070904"
- provider-name="JBoss, a division of Red Hat">
+ provider-name="%providerName"
+ plugin="org.jboss.tools.xulrunner.initializer">
- <description url="http://jboss.org/tools">
- A feature that provides Mozilla's XULRunner as various platform-dependent plug-ins for Eclipse.
+ <description>
+ %description
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright 2006, JBoss Inc., and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+ %copyright
</copyright>
- <license url="http://osdn.dl.sourceforge.net/sourceforge/jboss/LGPL.html">
- JBossTools is under the LGPL Licence
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-[This is the first released version of the Lesser GPL. It also
-counts
-as the successor of the GNU Library Public License, version 2,
-hence
-the version number 2.1.]
-Preamble
-The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General
-Public Licenses are intended to guarantee your freedom to share
-and change free software--to make sure the software is free for
-all its users.
-This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of
-the Free Software Foundation and other authors who decide to
-use it. You can use it too, but we suggest you first think carefully
-about whether this license or the ordinary General Public License
-is the better strategy to use in any particular case, based on
-the explanations below.
-When we speak of free software, we are referring to freedom of
-use, not price. Our General Public Licenses are designed to make
-sure that you have the freedom to distribute copies of free software
-(and charge for this service if you wish); that you receive source
-code or can get it if you want it; that you can change the software
-and use pieces of it in new free programs; and that you are informed
-that you can do these things.
-To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender
-these rights. These restrictions translate to certain responsibilities
-for you if you distribute copies of the library or if you modify
-it.
-For example, if you distribute copies of the library, whether
-gratis or for a fee, you must give the recipients all the rights
-that we gave you. You must make sure that they, too, receive
-or can get the source code. If you link other code with the library,
-you must provide complete object files to the recipients, so
-that they can relink them with the library after making changes
-to the library and recompiling it. And you must show them these
-terms so they know their rights.
-We protect your rights with a two-step method: (1) we copyright
-the library, and (2) we offer you this license, which gives you
-legal permission to copy, distribute and/or modify the library.
-To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library
-is modified by someone else and passed on, the recipients should
-know that what they have is not the original version, so that
-the original author's reputation will not be affected by problems
-that might be introduced by others.
-Finally, software patents pose a constant threat to the existence
-of any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining
-a restrictive license from a patent holder. Therefore, we insist
-that any patent license obtained for a version of the library
-must be consistent with the full freedom of use specified in
-this license.
-Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries,
-and is quite different from the ordinary General Public License.
-We use this license for certain libraries in order to permit
-linking those libraries into non-free programs.
-When a program is linked with a library, whether statically or
-using a shared library, the combination of the two is legally
-speaking a combined work, a derivative of the original library.
-The ordinary General Public License therefore permits such linking
-only if the entire combination fits its criteria of freedom.
-The Lesser General Public License permits more lax criteria for
-linking other code with the library.
-We call this license the "Lesser" General Public License because
-it does Less to protect the user's freedom than the ordinary
-General Public License. It also provides other free software
-developers Less of an advantage over competing non-free programs.
-These disadvantages are the reason we use the ordinary General
-Public License for many libraries. However, the Lesser license
-provides advantages in certain special circumstances.
-For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that
-it becomes a de-facto standard. To achieve this, non-free programs
-must be allowed to use the library. A more frequent case is that
-a free library does the same job as widely used non-free libraries.
-In this case, there is little to gain by limiting the free library
-to free software only, so we use the Lesser General Public License.
-In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body
-of free software. For example, permission to use the GNU C Library
-in non-free programs enables many more people to use the whole
-GNU operating system, as well as its variant, the GNU/Linux operating
-system.
-Although the Lesser General Public License is Less protective
-of the users' freedom, it does ensure that the user of a program
-that is linked with the Library has the freedom and the wherewithal
-to run that program using a modified version of the Library.
-The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between
-a "work based on the library" and a "work that uses the library".
-The former contains code derived from the library, whereas the
-latter must be combined with the library in order to run.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or
-other program which contains a notice placed by the copyright
-holder or other authorized party saying it may be distributed
-under the terms of this Lesser General Public License (also called
-"this License"). Each licensee is addressed as "you".
-A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-The "Library", below, refers to any such software library or
-work which has been distributed under these terms. A "work based
-on the Library" means either the Library or any derivative work
-under copyright law: that is to say, a work containing the Library
-or a portion of it, either verbatim or with modifications and/or
-translated straightforwardly into another language. (Hereinafter,
-translation is included without limitation in the term "modification".)
-"Source code" for a work means the preferred form of the work
-for making modifications to it. For a library, complete source
-code means all the source code for all modules it contains, plus
-any associated interface definition files, plus the scripts used
-to control compilation and installation of the library.
-Activities other than copying, distribution and modification
-are not covered by this License; they are outside its scope.
-The act of running a program using the Library is not restricted,
-and output from such a program is covered only if its contents
-constitute a work based on the Library (independent of the use
-of the Library in a tool for writing it). Whether that is true
-depends on what the Library does and what the program that uses
-the Library does.
-1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided
-that you conspicuously and appropriately publish on each copy
-an appropriate copyright notice and disclaimer of warranty; keep
-intact all the notices that refer to this License and to the
-absence of any warranty; and distribute a copy of this License
-along with the Library.
-You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange
-for a fee.
-2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section
-1 above, provided that you also meet all of these conditions:
-a) The modified work must itself be a software library.
-b) You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
-c) You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
-d) If a facility in the modified Library refers to a function
-or a table of data to be supplied by an application program that
-uses the facility, other than as an argument passed when the
-facility is invoked, then you must make a good faith effort to
-ensure that, in the event an application does not supply such
-function or table, the facility still operates, and performs
-whatever part of its purpose remains meaningful.
-(For example, a function in a library to compute square roots
-has a purpose that is entirely well-defined independent of the
-application. Therefore, Subsection 2d requires that any application-supplied
-function or table used by this function must be optional: if
-the application does not supply it, the square root function
-must still compute square roots.)
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works
-in themselves, then this License, and its terms, do not apply
-to those sections when you distribute them as separate works.
-But when you distribute the same sections as part of a whole
-which is a work based on the Library, the distribution of the
-whole must be on the terms of this License, whose permissions
-for other licensees extend to the entire whole, and thus to each
-and every part regardless of who wrote it.
-Thus, it is not the intent of this section to claim rights or
-contest your rights to work written entirely by you; rather,
-the intent is to exercise the right to control the distribution
-of derivative or collective works based on the Library.
-In addition, mere aggregation of another work not based on the
-Library with the Library (or with a work based on the Library)
-on a volume of a storage or distribution medium does not bring
-the other work under the scope of this License.
-3. You may opt to apply the terms of the ordinary GNU General
-Public License instead of this License to a given copy of the
-Library. To do this, you must alter all the notices that refer
-to this License, so that they refer to the ordinary GNU General
-Public License, version 2, instead of to this License. (If a
-newer version than version 2 of the ordinary GNU General Public
-License has appeared, then you can specify that version instead
-if you wish.) Do not make any other change in these notices.
-Once this change is made in a given copy, it is irreversible
-for that copy, so the ordinary GNU General Public License applies
-to all subsequent copies and derivative works made from that
-copy.
-This option is useful when you wish to copy part of the code
-of the Library into a program that is not a library.
-4. You may copy and distribute the Library (or a portion or derivative
-of it, under Section 2) in object code or executable form under
-the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code,
-which must be distributed under the terms of Sections 1 and 2
-above on a medium customarily used for software interchange.
-If distribution of object code is made by offering access to
-copy from a designated place, then offering equivalent access
-to copy the source code from the same place satisfies the requirement
-to distribute the source code, even though third parties are
-not compelled to copy the source along with the object code.
-5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled
-or linked with it, is called a "work that uses the Library".
-Such a work, in isolation, is not a derivative work of the Library,
-and therefore falls outside the scope of this License.
-However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because
-it contains portions of the Library), rather than a "work that
-uses the library". The executable is therefore covered by this
-License. Section 6 states terms for distribution of such executables.
-When a "work that uses the Library" uses material from a header
-file that is part of the Library, the object code for the work
-may be a derivative work of the Library even though the source
-code is not. Whether this is true is especially significant if
-the work can be linked without the Library, or if the work is
-itself a library. The threshold for this to be true is not precisely
-defined by law.
-If such an object file uses only numerical parameters, data structure
-layouts and accessors, and small macros and small inline functions
-(ten lines or less in length), then the use of the object file
-is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions
-of the Library will still fall under Section 6.)
-Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section
-6. Any executables containing that work also fall under Section
-6, whether or not they are linked directly with the Library itself.
-6. As an exception to the Sections above, you may also combine
-or link a "work that uses the Library" with the Library to produce
-a work containing portions of the Library, and distribute that
-work under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-You must give prominent notice with each copy of the work that
-the Library is used in it and that the Library and its use are
-covered by this License. You must supply a copy of this License.
-If the work during execution displays copyright notices, you
-must include the copyright notice for the Library among them,
-as well as a reference directing the user to the copy of this
-License. Also, you must do one of these things:
-a) Accompany the work with the complete corresponding machine-readable
-source code for the Library including whatever changes were used
-in the work (which must be distributed under Sections 1 and 2
-above); and, if the work is an executable linked with the Library,
-with the complete machine-readable "work that uses the Library",
-as object code and/or source code, so that the user can modify
-the Library and then relink to produce a modified executable
-containing the modified Library. (It is understood that the user
-who changes the contents of definitions files in the Library
-will not necessarily be able to recompile the application to
-use the modified definitions.)
-b) Use a suitable shared library mechanism for linking with the
-Library. A suitable mechanism is one that (1) uses at run time
-a copy of the library already present on the user's computer
-system, rather than copying library functions into the executable,
-and (2) will operate properly with a modified version of the
-library, if the user installs one, as long as the modified version
-is interface-compatible with the version that the work was made
-with.
-c) Accompany the work with a written offer, valid for at least
-three years, to give the same user the materials specified in
-Subsection 6a, above, for a charge no more than the cost of performing
-this distribution.
-d) If distribution of the work is made by offering access to
-copy from a designated place, offer equivalent access to copy
-the above specified materials from the same place.
-e) Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
-For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that
-is normally distributed (in either source or binary form) with
-the major components (compiler, kernel, and so on) of the operating
-system on which the executable runs, unless that component itself
-accompanies the executable.
-It may happen that this requirement contradicts the license restrictions
-of other proprietary libraries that do not normally accompany
-the operating system. Such a contradiction means you cannot use
-both them and the Library together in an executable that you
-distribute.
-7. You may place library facilities that are a work based on
-the Library side-by-side in a single library together with other
-library facilities not covered by this License, and distribute
-such a combined library, provided that the separate distribution
-of the work based on the Library and of the other library facilities
-is otherwise permitted, and provided that you do these two things:
-a) Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library facilities.
-This must be distributed under the terms of the Sections above.
-b) Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
-8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.
-Any attempt otherwise to copy, modify, sublicense, link with,
-or distribute the Library is void, and will automatically terminate
-your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have
-their licenses terminated so long as such parties remain in full
-compliance.
-9. You are not required to accept this License, since you have
-not signed it. However, nothing else grants you permission to
-modify or distribute the Library or its derivative works. These
-actions are prohibited by law if you do not accept this License.
-Therefore, by modifying or distributing the Library (or any work
-based on the Library), you indicate your acceptance of this License
-to do so, and all its terms and conditions for copying, distributing
-or modifying the Library or works based on it.
-10. Each time you redistribute the Library (or any work based
-on the Library), the recipient automatically receives a license
-from the original licensor to copy, distribute, link with or
-modify the Library subject to these terms and conditions. You
-may not impose any further restrictions on the recipients' exercise
-of the rights granted herein. You are not responsible for enforcing
-compliance by third parties with this License.
-11. If, as a consequence of a court judgment or allegation of
-patent infringement or for any other reason (not limited to patent
-issues), conditions are imposed on you (whether by court order,
-agreement or otherwise) that contradict the conditions of this
-License, they do not excuse you from the conditions of this License.
-If you cannot distribute so as to satisfy simultaneously your
-obligations under this License and any other pertinent obligations,
-then as a consequence you may not distribute the Library at all.
-For example, if a patent license would not permit royalty-free
-redistribution of the Library by all those who receive copies
-directly or indirectly through you, then the only way you could
-satisfy both it and this License would be to refrain entirely
-from distribution of the Library.
-If any portion of this section is held invalid or unenforceable
-under any particular circumstance, the balance of the section
-is intended to apply, and the section as a whole is intended
-to apply in other circumstances.
-It is not the purpose of this section to induce you to infringe
-any patents or other property right claims or to contest validity
-of any such claims; this section has the sole purpose of protecting
-the integrity of the free software distribution system which
-is implemented by public license practices. Many people have
-made generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of
-that system; it is up to the author/donor to decide if he or
-she is willing to distribute software through any other system
-and a licensee cannot impose that choice.
-This section is intended to make thoroughly clear what is believed
-to be a consequence of the rest of this License.
-12. If the distribution and/or use of the Library is restricted
-in certain countries either by patents or by copyrighted interfaces,
-the original copyright holder who places the Library under this
-License may add an explicit geographical distribution limitation
-excluding those countries, so that distribution is permitted
-only in or among countries not thus excluded. In such case, this
-License incorporates the limitation as if written in the body
-of this License.
-13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-Each version is given a distinguishing version number. If the
-Library specifies a version number of this License which applies
-to it and "any later version", you have the option of following
-the terms and conditions either of that version or of any later
-version published by the Free Software Foundation. If the Library
-does not specify a license version number, you may choose any
-version ever published by the Free Software Foundation.
-14. If you wish to incorporate parts of the Library into other
-free programs whose distribution conditions are incompatible
-with these, write to the author to ask for permission. For software
-which is copyrighted by the Free Software Foundation, write to
-the Free Software Foundation; we sometimes make exceptions for
-this. Our decision will be guided by the two goals of preserving
-the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-NO WARRANTY
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS
-NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
-OR CORRECTION.
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
-IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
-MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE,
-BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS
-OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED
-BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE
-WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
+ <license url="%licenseURL">
+ %license
</license>
<url>
- <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
- <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="%discoverySiteName" url="http://download.jboss.org/updates/development"/>
</url>
<plugin
Added: trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html (rev 0)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/license.html 2008-12-08 01:37:53 UTC (rev 12465)
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
+ modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
+</body>
+</html>
17 years, 4 months
JBoss Tools SVN: r12464 - trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2008-12-07 20:37:35 -0500 (Sun, 07 Dec 2008)
New Revision: 12464
Added:
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.html
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.ini
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.mappings
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.properties
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/jboss_about.png
Modified:
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/fragment.properties
Log:
JBIDE-3321 Bad metadata for various features - branding the XULRunner feature
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.html
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.html (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.html 2008-12-08 01:37:35 UTC (rev 12464)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>XULRunner</title>
+<style type="text/css" media="screen">
+<!--
+ body {
+ font-family: Sans-serif, Arial, Helvetica;
+ }
+
+-->
+</style>
+</head>
+<body>
+<h1>XULRunner</h1>
+
+<p>
+This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
+</p>
+
+<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
+
+<p>
+This software is distributed under the terms of the Eclipse Public License - v 1.0
+(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
+</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.ini
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.ini (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.ini 2008-12-08 01:37:35 UTC (rev 12464)
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+# test
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=jboss_about.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+
+
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.mappings
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.mappings (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.mappings 2008-12-08 01:37:35 UTC (rev 12464)
@@ -0,0 +1,5 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.properties (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/about.properties 2008-12-08 01:37:35 UTC (rev 12464)
@@ -0,0 +1,7 @@
+blurb=XULRunner\n\
+\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright JBoss Inc. contributors and others 2004 - 2008. All rights reserved.\n\
+Visit http://jboss.org/tools
+
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties 2008-12-08 01:22:28 UTC (rev 12463)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties 2008-12-08 01:37:35 UTC (rev 12464)
@@ -2,4 +2,9 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- fragment.properties
+ fragment.properties,\
+ about.properties,\
+ about.mappings,\
+ about.ini,\
+ about.html,\
+ jboss_about.png
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/fragment.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/fragment.properties 2008-12-08 01:22:28 UTC (rev 12463)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/fragment.properties 2008-12-08 01:37:35 UTC (rev 12464)
@@ -1,3 +1,3 @@
#Properties file for org.jboss.tools.xulrunner.initializer
BundleVendor=JBoss, a division of Red Hat
-BundleName=XULRunner Initializer
\ No newline at end of file
+BundleName=XULRunner
\ No newline at end of file
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/jboss_about.png
===================================================================
(Binary files differ)
Property changes on: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/jboss_about.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 4 months
JBoss Tools SVN: r12463 - trunk/portlet/plugins/org.jboss.tools.portlet.ui.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2008-12-07 20:22:28 -0500 (Sun, 07 Dec 2008)
New Revision: 12463
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties
Log:
JBIDE-3321 Bad metadata for various features - branding the JBoss WebServices Tools feature
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties 2008-12-08 01:22:11 UTC (rev 12462)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties 2008-12-08 01:22:28 UTC (rev 12463)
@@ -5,7 +5,6 @@
plugin.xml,\
icons/,\
resources/,\
- rhds_wiz.png,\
templates/,\
about.html,\
about.ini,\
17 years, 4 months
JBoss Tools SVN: r12462 - trunk/ws/features/org.jboss.tools.ws.feature.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2008-12-07 20:22:11 -0500 (Sun, 07 Dec 2008)
New Revision: 12462
Added:
trunk/ws/features/org.jboss.tools.ws.feature/feature.properties
trunk/ws/features/org.jboss.tools.ws.feature/license.html
Modified:
trunk/ws/features/org.jboss.tools.ws.feature/build.properties
trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
Log:
JBIDE-3321 Bad metadata for various features - branding the JBoss WebServices Tools feature
Modified: trunk/ws/features/org.jboss.tools.ws.feature/build.properties
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/build.properties 2008-12-08 01:21:32 UTC (rev 12461)
+++ trunk/ws/features/org.jboss.tools.ws.feature/build.properties 2008-12-08 01:22:11 UTC (rev 12462)
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
Added: trunk/ws/features/org.jboss.tools.ws.feature/feature.properties
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/feature.properties (rev 0)
+++ trunk/ws/features/org.jboss.tools.ws.feature/feature.properties 2008-12-08 01:22:11 UTC (rev 12462)
@@ -0,0 +1,42 @@
+###############################################################################
+# Copyright (c) 2008 JBoss, a division of Red Hat and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss, a division of Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss WebServices Tools
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss, a division of Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+discoverySiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=JBoss WebServices Tools
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=Copyright (c) 2008 JBoss, a division of Red Hat and others.\nAll rights reserved. This program and the accompanying materials\n
+are made available under the terms of the Eclipse Public License v1.0\nwhich accompanies this distribution, and is available at\nhttp\://www.eclipse.org/legal/epl-v10.html\n\nContributors\:\nJBoss, a division of Red Hat - Initial implementation.\n
+ ############### end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\nMarch 17, 2005\n\nUsage Of Content\n\nTHE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\nOTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\nUSE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\nAGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\nNOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\nAGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\nAND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\nOR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\nTERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\nOF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\nBELOW, THEN YOU MAY NOT USE THE CONTENT.\n\nApplicable Licenses\n\nUnless otherwise indicated, all Content made available by the Eclipse Foundation\nis provided to you under the terms and conditio!
ns of the Eclipse Public\nLicense Version 1.0 ("EPL"). A copy of the EPL is provided with this\nContent and is also available at http\://www.eclipse.org/legal/epl-v10.html.\nFor purposes of the EPL, "Program" will mean the Content.\n\nContent includes, but is not limited to, source code, object code,\ndocumentation and other files maintained in the Eclipse.org CVS\nrepository ("Repository") in CVS modules ("Modules") and made available\nas downloadable archives ("Downloads").\n\n- Content may be structured and packaged into modules to facilitate delivering,\nextending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\nplug-in fragments ("Fragments"), and features ("Features").\n- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\nin a directory named "plugins".\n- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\nEach Feature may be packaged as a sub-directory in a directory!
named "features".\nWithin a Feature, files named "feature.xml" may co
ntain a list of the names and version\nnumbers of the Plug-ins and/or Fragments associated with that Feature.\n- Features may also include other Features ("Included Features"). Within a Feature, files\nnamed "feature.xml" may contain a list of the names and version numbers of Included Features.\n\nFeatures may also include other Features ("Included Features"). Files named\n"feature.xml" may contain a list of the names and version numbers of\nIncluded Features.\n\nThe terms and conditions governing Plug-ins and Fragments should be\ncontained in files named "about.html" ("Abouts"). The terms and\nconditions governing Features and Included Features should be contained\nin files named "license.html" ("Feature Licenses"). Abouts and Feature\nLicenses may be located in any directory of a Download or Module\nincluding, but not limited to the following locations\:\n\n- The top-level (root) directory\n- Plug-in and Fragment directories\n- Inside Plug-ins and Fragments packaged as JAR!
s\n- Sub-directories of the directory named "src" of certain Plug-ins\n- Feature directories\n\nNote\: if a Feature made available by the Eclipse Foundation is installed using the\nEclipse Update Manager, you must agree to a license ("Feature Update\nLicense") during the installation process. If the Feature contains\nIncluded Features, the Feature Update License should either provide you\nwith the terms and conditions governing the Included Features or inform\nyou where you can locate them. Feature Update Licenses may be found in\nthe "license" property of files named "feature.properties". Such Abouts,\nFeature Licenses and Feature Update Licenses contain the terms and\nconditions (or references to such terms and conditions) that govern your\nuse of the associated Content in that directory.\n\nTHE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\nTO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\nSOME OF THESE OTHER LICENSE AGREEMENTS MA!
Y INCLUDE (BUT ARE NOT LIMITED TO)\:\n\n- Common Public License Versio
n 1.0 (available at http\://www.eclipse.org/legal/cpl-v10.html)\n- Apache Software License 1.1 (available at http\://www.apache.org/licenses/LICENSE)\n- Apache Software License 2.0 (available at http\://www.apache.org/licenses/LICENSE-2.0)\n- IBM Public License 1.0 (available at http\://oss.software.ibm.com/developerworks/opensource/license10.html)\n- Metro Link Public License 1.00 (available at http\://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n- Mozilla Public License Version 1.1 (available at http\://www.mozilla.org/MPL/MPL-1.1.html)\n\nIT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\nTO USE OF THE CONTENT. If no About, Feature License or Feature Update License\nis provided, please contact the Eclipse Foundation to determine what terms and conditions\ngovern that particular Content.\n\nCryptography\n\nContent may contain encryption software. The country in which you are\ncurrently may have restrictions on the import, posse!
ssion, and use,\nand/or re-export to another country, of encryption software. BEFORE\nusing any encryption software, please check the country's laws,\nregulations and policies concerning the import, possession, or use,\nand re-export of encryption software, to see if this is permitted.\n\nJava and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
Modified: trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2008-12-08 01:21:32 UTC (rev 12461)
+++ trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2008-12-08 01:22:11 UTC (rev 12462)
@@ -1,428 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jboss.tools.ws.feature"
- label="JBoss WebServices Tools"
+ label="%featureName"
version="1.0.0"
- provider-name="JBoss, a division of Red Hat">
+ provider-name="%providerName"
+ plugin="org.jboss.tools.ws.ui">
- <description url="http://www.jboss.org/tools">
- JBoss WebServices Tools
+ <description>
+ %description
</description>
<copyright>
- JBoss, Home of Professional Open Source
-Copyright 2006, JBoss Inc., and individual contributors as indicated
-by the @authors tag. See the copyright.txt in the distribution
-for a full listing of individual contributors.
+ %copyright
</copyright>
- <license url="http://osdn.dl.sourceforge.net/sourceforge/jboss/LGPL.html">
- JBossTools is under the LGPL Licence
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-[This is the first released version of the Lesser GPL. It also
-counts
-as the successor of the GNU Library Public License, version 2,
-hence
-the version number 2.1.]
-Preamble
-The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General
-Public Licenses are intended to guarantee your freedom to share
-and change free software--to make sure the software is free for
-all its users.
-This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of
-the Free Software Foundation and other authors who decide to
-use it. You can use it too, but we suggest you first think carefully
-about whether this license or the ordinary General Public License
-is the better strategy to use in any particular case, based on
-the explanations below.
-When we speak of free software, we are referring to freedom of
-use, not price. Our General Public Licenses are designed to make
-sure that you have the freedom to distribute copies of free software
-(and charge for this service if you wish); that you receive source
-code or can get it if you want it; that you can change the software
-and use pieces of it in new free programs; and that you are informed
-that you can do these things.
-To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender
-these rights. These restrictions translate to certain responsibilities
-for you if you distribute copies of the library or if you modify
-it.
-For example, if you distribute copies of the library, whether
-gratis or for a fee, you must give the recipients all the rights
-that we gave you. You must make sure that they, too, receive
-or can get the source code. If you link other code with the library,
-you must provide complete object files to the recipients, so
-that they can relink them with the library after making changes
-to the library and recompiling it. And you must show them these
-terms so they know their rights.
-We protect your rights with a two-step method: (1) we copyright
-the library, and (2) we offer you this license, which gives you
-legal permission to copy, distribute and/or modify the library.
-To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library
-is modified by someone else and passed on, the recipients should
-know that what they have is not the original version, so that
-the original author's reputation will not be affected by problems
-that might be introduced by others.
-Finally, software patents pose a constant threat to the existence
-of any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining
-a restrictive license from a patent holder. Therefore, we insist
-that any patent license obtained for a version of the library
-must be consistent with the full freedom of use specified in
-this license.
-Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries,
-and is quite different from the ordinary General Public License.
-We use this license for certain libraries in order to permit
-linking those libraries into non-free programs.
-When a program is linked with a library, whether statically or
-using a shared library, the combination of the two is legally
-speaking a combined work, a derivative of the original library.
-The ordinary General Public License therefore permits such linking
-only if the entire combination fits its criteria of freedom.
-The Lesser General Public License permits more lax criteria for
-linking other code with the library.
-We call this license the "Lesser" General Public License because
-it does Less to protect the user's freedom than the ordinary
-General Public License. It also provides other free software
-developers Less of an advantage over competing non-free programs.
-These disadvantages are the reason we use the ordinary General
-Public License for many libraries. However, the Lesser license
-provides advantages in certain special circumstances.
-For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that
-it becomes a de-facto standard. To achieve this, non-free programs
-must be allowed to use the library. A more frequent case is that
-a free library does the same job as widely used non-free libraries.
-In this case, there is little to gain by limiting the free library
-to free software only, so we use the Lesser General Public License.
-In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body
-of free software. For example, permission to use the GNU C Library
-in non-free programs enables many more people to use the whole
-GNU operating system, as well as its variant, the GNU/Linux operating
-system.
-Although the Lesser General Public License is Less protective
-of the users' freedom, it does ensure that the user of a program
-that is linked with the Library has the freedom and the wherewithal
-to run that program using a modified version of the Library.
-The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between
-a "work based on the library" and a "work that uses the library".
-The former contains code derived from the library, whereas the
-latter must be combined with the library in order to run.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or
-other program which contains a notice placed by the copyright
-holder or other authorized party saying it may be distributed
-under the terms of this Lesser General Public License (also called
-"this License"). Each licensee is addressed as "you".
-A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-The "Library", below, refers to any such software library or
-work which has been distributed under these terms. A "work based
-on the Library" means either the Library or any derivative work
-under copyright law: that is to say, a work containing the Library
-or a portion of it, either verbatim or with modifications and/or
-translated straightforwardly into another language. (Hereinafter,
-translation is included without limitation in the term "modification".)
-"Source code" for a work means the preferred form of the work
-for making modifications to it. For a library, complete source
-code means all the source code for all modules it contains, plus
-any associated interface definition files, plus the scripts used
-to control compilation and installation of the library.
-Activities other than copying, distribution and modification
-are not covered by this License; they are outside its scope.
-The act of running a program using the Library is not restricted,
-and output from such a program is covered only if its contents
-constitute a work based on the Library (independent of the use
-of the Library in a tool for writing it). Whether that is true
-depends on what the Library does and what the program that uses
-the Library does.
-1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided
-that you conspicuously and appropriately publish on each copy
-an appropriate copyright notice and disclaimer of warranty; keep
-intact all the notices that refer to this License and to the
-absence of any warranty; and distribute a copy of this License
-along with the Library.
-You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange
-for a fee.
-2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section
-1 above, provided that you also meet all of these conditions:
-a) The modified work must itself be a software library.
-b) You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
-c) You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
-d) If a facility in the modified Library refers to a function
-or a table of data to be supplied by an application program that
-uses the facility, other than as an argument passed when the
-facility is invoked, then you must make a good faith effort to
-ensure that, in the event an application does not supply such
-function or table, the facility still operates, and performs
-whatever part of its purpose remains meaningful.
-(For example, a function in a library to compute square roots
-has a purpose that is entirely well-defined independent of the
-application. Therefore, Subsection 2d requires that any application-supplied
-function or table used by this function must be optional: if
-the application does not supply it, the square root function
-must still compute square roots.)
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works
-in themselves, then this License, and its terms, do not apply
-to those sections when you distribute them as separate works.
-But when you distribute the same sections as part of a whole
-which is a work based on the Library, the distribution of the
-whole must be on the terms of this License, whose permissions
-for other licensees extend to the entire whole, and thus to each
-and every part regardless of who wrote it.
-Thus, it is not the intent of this section to claim rights or
-contest your rights to work written entirely by you; rather,
-the intent is to exercise the right to control the distribution
-of derivative or collective works based on the Library.
-In addition, mere aggregation of another work not based on the
-Library with the Library (or with a work based on the Library)
-on a volume of a storage or distribution medium does not bring
-the other work under the scope of this License.
-3. You may opt to apply the terms of the ordinary GNU General
-Public License instead of this License to a given copy of the
-Library. To do this, you must alter all the notices that refer
-to this License, so that they refer to the ordinary GNU General
-Public License, version 2, instead of to this License. (If a
-newer version than version 2 of the ordinary GNU General Public
-License has appeared, then you can specify that version instead
-if you wish.) Do not make any other change in these notices.
-Once this change is made in a given copy, it is irreversible
-for that copy, so the ordinary GNU General Public License applies
-to all subsequent copies and derivative works made from that
-copy.
-This option is useful when you wish to copy part of the code
-of the Library into a program that is not a library.
-4. You may copy and distribute the Library (or a portion or derivative
-of it, under Section 2) in object code or executable form under
-the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code,
-which must be distributed under the terms of Sections 1 and 2
-above on a medium customarily used for software interchange.
-If distribution of object code is made by offering access to
-copy from a designated place, then offering equivalent access
-to copy the source code from the same place satisfies the requirement
-to distribute the source code, even though third parties are
-not compelled to copy the source along with the object code.
-5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled
-or linked with it, is called a "work that uses the Library".
-Such a work, in isolation, is not a derivative work of the Library,
-and therefore falls outside the scope of this License.
-However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because
-it contains portions of the Library), rather than a "work that
-uses the library". The executable is therefore covered by this
-License. Section 6 states terms for distribution of such executables.
-When a "work that uses the Library" uses material from a header
-file that is part of the Library, the object code for the work
-may be a derivative work of the Library even though the source
-code is not. Whether this is true is especially significant if
-the work can be linked without the Library, or if the work is
-itself a library. The threshold for this to be true is not precisely
-defined by law.
-If such an object file uses only numerical parameters, data structure
-layouts and accessors, and small macros and small inline functions
-(ten lines or less in length), then the use of the object file
-is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions
-of the Library will still fall under Section 6.)
-Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section
-6. Any executables containing that work also fall under Section
-6, whether or not they are linked directly with the Library itself.
-6. As an exception to the Sections above, you may also combine
-or link a "work that uses the Library" with the Library to produce
-a work containing portions of the Library, and distribute that
-work under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-You must give prominent notice with each copy of the work that
-the Library is used in it and that the Library and its use are
-covered by this License. You must supply a copy of this License.
-If the work during execution displays copyright notices, you
-must include the copyright notice for the Library among them,
-as well as a reference directing the user to the copy of this
-License. Also, you must do one of these things:
-a) Accompany the work with the complete corresponding machine-readable
-source code for the Library including whatever changes were used
-in the work (which must be distributed under Sections 1 and 2
-above); and, if the work is an executable linked with the Library,
-with the complete machine-readable "work that uses the Library",
-as object code and/or source code, so that the user can modify
-the Library and then relink to produce a modified executable
-containing the modified Library. (It is understood that the user
-who changes the contents of definitions files in the Library
-will not necessarily be able to recompile the application to
-use the modified definitions.)
-b) Use a suitable shared library mechanism for linking with the
-Library. A suitable mechanism is one that (1) uses at run time
-a copy of the library already present on the user's computer
-system, rather than copying library functions into the executable,
-and (2) will operate properly with a modified version of the
-library, if the user installs one, as long as the modified version
-is interface-compatible with the version that the work was made
-with.
-c) Accompany the work with a written offer, valid for at least
-three years, to give the same user the materials specified in
-Subsection 6a, above, for a charge no more than the cost of performing
-this distribution.
-d) If distribution of the work is made by offering access to
-copy from a designated place, offer equivalent access to copy
-the above specified materials from the same place.
-e) Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
-For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that
-is normally distributed (in either source or binary form) with
-the major components (compiler, kernel, and so on) of the operating
-system on which the executable runs, unless that component itself
-accompanies the executable.
-It may happen that this requirement contradicts the license restrictions
-of other proprietary libraries that do not normally accompany
-the operating system. Such a contradiction means you cannot use
-both them and the Library together in an executable that you
-distribute.
-7. You may place library facilities that are a work based on
-the Library side-by-side in a single library together with other
-library facilities not covered by this License, and distribute
-such a combined library, provided that the separate distribution
-of the work based on the Library and of the other library facilities
-is otherwise permitted, and provided that you do these two things:
-a) Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library facilities.
-This must be distributed under the terms of the Sections above.
-b) Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
-8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.
-Any attempt otherwise to copy, modify, sublicense, link with,
-or distribute the Library is void, and will automatically terminate
-your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have
-their licenses terminated so long as such parties remain in full
-compliance.
-9. You are not required to accept this License, since you have
-not signed it. However, nothing else grants you permission to
-modify or distribute the Library or its derivative works. These
-actions are prohibited by law if you do not accept this License.
-Therefore, by modifying or distributing the Library (or any work
-based on the Library), you indicate your acceptance of this License
-to do so, and all its terms and conditions for copying, distributing
-or modifying the Library or works based on it.
-10. Each time you redistribute the Library (or any work based
-on the Library), the recipient automatically receives a license
-from the original licensor to copy, distribute, link with or
-modify the Library subject to these terms and conditions. You
-may not impose any further restrictions on the recipients' exercise
-of the rights granted herein. You are not responsible for enforcing
-compliance by third parties with this License.
-11. If, as a consequence of a court judgment or allegation of
-patent infringement or for any other reason (not limited to patent
-issues), conditions are imposed on you (whether by court order,
-agreement or otherwise) that contradict the conditions of this
-License, they do not excuse you from the conditions of this License.
-If you cannot distribute so as to satisfy simultaneously your
-obligations under this License and any other pertinent obligations,
-then as a consequence you may not distribute the Library at all.
-For example, if a patent license would not permit royalty-free
-redistribution of the Library by all those who receive copies
-directly or indirectly through you, then the only way you could
-satisfy both it and this License would be to refrain entirely
-from distribution of the Library.
-If any portion of this section is held invalid or unenforceable
-under any particular circumstance, the balance of the section
-is intended to apply, and the section as a whole is intended
-to apply in other circumstances.
-It is not the purpose of this section to induce you to infringe
-any patents or other property right claims or to contest validity
-of any such claims; this section has the sole purpose of protecting
-the integrity of the free software distribution system which
-is implemented by public license practices. Many people have
-made generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of
-that system; it is up to the author/donor to decide if he or
-she is willing to distribute software through any other system
-and a licensee cannot impose that choice.
-This section is intended to make thoroughly clear what is believed
-to be a consequence of the rest of this License.
-12. If the distribution and/or use of the Library is restricted
-in certain countries either by patents or by copyrighted interfaces,
-the original copyright holder who places the Library under this
-License may add an explicit geographical distribution limitation
-excluding those countries, so that distribution is permitted
-only in or among countries not thus excluded. In such case, this
-License incorporates the limitation as if written in the body
-of this License.
-13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-Each version is given a distinguishing version number. If the
-Library specifies a version number of this License which applies
-to it and "any later version", you have the option of following
-the terms and conditions either of that version or of any later
-version published by the Free Software Foundation. If the Library
-does not specify a license version number, you may choose any
-version ever published by the Free Software Foundation.
-14. If you wish to incorporate parts of the Library into other
-free programs whose distribution conditions are incompatible
-with these, write to the author to ask for permission. For software
-which is copyrighted by the Free Software Foundation, write to
-the Free Software Foundation; we sometimes make exceptions for
-this. Our decision will be guided by the two goals of preserving
-the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
-NO WARRANTY
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS
-NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
-OR CORRECTION.
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
-IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO
-MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE,
-BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS
-OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED
-BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE
-WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY
-HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
+ <license url="%licenseURL">
+ %license
</license>
-
<url>
- <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/>
- <discovery label="JBossTools Development Update Site" url="http://download.jboss.org/updates/development"/>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="%discoverySiteName" url="http://download.jboss.org/updates/development"/>
</url>
<plugin
Added: trunk/ws/features/org.jboss.tools.ws.feature/license.html
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/license.html (rev 0)
+++ trunk/ws/features/org.jboss.tools.ws.feature/license.html 2008-12-08 01:22:11 UTC (rev 12462)
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
+ modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
+</body>
+</html>
17 years, 4 months
JBoss Tools SVN: r12461 - trunk/ws/plugins/org.jboss.tools.ws.ui.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2008-12-07 20:21:32 -0500 (Sun, 07 Dec 2008)
New Revision: 12461
Added:
trunk/ws/plugins/org.jboss.tools.ws.ui/about.html
trunk/ws/plugins/org.jboss.tools.ws.ui/about.ini
trunk/ws/plugins/org.jboss.tools.ws.ui/about.mappings
trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/jboss_about.png
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/build.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties
Log:
JBIDE-3321 Bad metadata for various features - branding the JBoss WebServices Tools feature
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/about.html
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/about.html (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/about.html 2008-12-08 01:21:32 UTC (rev 12461)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>JBoss WebServices Tools</title>
+<style type="text/css" media="screen">
+<!--
+ body {
+ font-family: Sans-serif, Arial, Helvetica;
+ }
+
+-->
+</style>
+</head>
+<body>
+<h1>JBoss WebServices Tools</h1>
+
+<p>
+This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
+</p>
+
+<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
+
+<p>
+This software is distributed under the terms of the Eclipse Public License - v 1.0
+(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
+</p>
+</body>
+</html>
\ No newline at end of file
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/about.ini
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/about.ini (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/about.ini 2008-12-08 01:21:32 UTC (rev 12461)
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+# test
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=jboss_about.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+
+
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/about.mappings
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/about.mappings (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/about.mappings 2008-12-08 01:21:32 UTC (rev 12461)
@@ -0,0 +1,5 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties 2008-12-08 01:21:32 UTC (rev 12461)
@@ -0,0 +1,7 @@
+blurb=JBoss WebServices Tools\n\
+\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright JBoss Inc. contributors and others 2004 - 2008. All rights reserved.\n\
+Visit http://jboss.org/tools
+
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/build.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/build.properties 2008-12-08 01:11:40 UTC (rev 12460)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/build.properties 2008-12-08 01:21:32 UTC (rev 12461)
@@ -3,4 +3,10 @@
bin.includes = META-INF/,\
.,\
plugin.properties,\
- plugin.xml
+ plugin.xml,\
+ about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ icons/,\
+ jboss_about.png
Added: trunk/ws/plugins/org.jboss.tools.ws.ui/jboss_about.png
===================================================================
(Binary files differ)
Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/jboss_about.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2008-12-08 01:11:40 UTC (rev 12460)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2008-12-08 01:21:32 UTC (rev 12461)
@@ -1,3 +1,3 @@
JBOSSWS_PREFERENCE_PAGE=JBossWS Preferences
-PLUGIN_NAME=JBossWS UI
+PLUGIN_NAME=JBoss WebServices Tools
PLUGIN_PROVIDER=JBoss, a division of Red Hat
\ No newline at end of file
17 years, 4 months