JBoss Tools SVN: r15891 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-11 14:00:02 -0400 (Thu, 11 Jun 2009)
New Revision: 15891
Added:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psfs/
Removed:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/
Log:
Copied: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psfs (from rev 15890, trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf)
15 years, 6 months
JBoss Tools SVN: r15890 - in trunk/jbpm/releng/org.jboss.tools.jbpm4.releng: psf and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-11 13:59:14 -0400 (Thu, 11 Jun 2009)
New Revision: 15890
Added:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/athena.psf
Log:
athena.psf
Added: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/athena.psf
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/athena.psf (rev 0)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/athena.psf 2009-06-11 17:59:14 UTC (rev 15890)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.eclipse.team.cvs.core.cvsnature">
+<project reference="1.0,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.dash.commonbuilder.releng,org.eclipse.dash.common.releng"/>
+<project reference="1.0,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,org.eclipse.releng.basebuilder,org.eclipse.releng.basebuilder,R35_M6"/>
+</provider>
+</psf>
\ No newline at end of file
Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/psf/athena.psf
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
JBoss Tools SVN: r15889 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 13:46:35 -0400 (Thu, 11 Jun 2009)
New Revision: 15889
Added:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map
Log:
split the jbpm common feature into another map file
Added: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map (rev 0)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/common.map 2009-06-11 17:46:35 UTC (rev 15889)
@@ -0,0 +1,5 @@
+feature@org.jboss.tools.jbpm.common.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm.common.feature
+
+plugin@org.jboss.tools.jbpm.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common
+plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common.test
+
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map 2009-06-11 17:05:12 UTC (rev 15888)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map 2009-06-11 17:46:35 UTC (rev 15889)
@@ -1,10 +1,8 @@
feature@org.jboss.tools.jbpm4.all=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.all
feature@org.jboss.tools.jbpm4.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.jbpm4.tests
-plugin@org.jboss.tools.jbpm.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common
plugin@org.jboss.tools.flow.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.common
plugin@org.jboss.tools.flow.jpdl4=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4
-plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common.test
plugin@org.jboss.tools.flow.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.common.test
plugin@org.jboss.tools.flow.jpdl4.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.test
15 years, 6 months
JBoss Tools SVN: r15888 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-06-11 13:05:12 -0400 (Thu, 11 Jun 2009)
New Revision: 15888
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css
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/template/RichFacesLayoutPanelTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4439, rich:layout was corrected, junits were fixed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfFacet.java 2009-06-11 17:05:12 UTC (rev 15888)
@@ -18,6 +18,7 @@
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.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.XmlUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -30,12 +31,6 @@
*/
public class JsfFacet extends VpeAbstractTemplate {
- private static String JSF_CORE_URI = "http://java.sun.com/jsf/core"; //$NON-NLS-1$
- private static String JSF_HTML_URI = "http://java.sun.com/jsf/html"; //$NON-NLS-1$
- private static String RICH_FACES_URI = "http://richfaces.org/rich"; //$NON-NLS-1$
- private static String A4J_URI = "http://richfaces.org/a4j"; //$NON-NLS-1$
- private static String FACELETS_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
-
/*
* (non-Javadoc)
*
@@ -65,11 +60,11 @@
if (null != sourceNodeTaglib) {
String sourceNodeUri = sourceNodeTaglib.getUri();
if ((child.getNodeType() == Node.ELEMENT_NODE)
- && (JSF_CORE_URI.equalsIgnoreCase(sourceNodeUri)
- || JSF_HTML_URI.equalsIgnoreCase(sourceNodeUri)
- || RICH_FACES_URI.equalsIgnoreCase(sourceNodeUri)
- || A4J_URI.equalsIgnoreCase(sourceNodeUri)
- || FACELETS_URI.equalsIgnoreCase(sourceNodeUri))) {
+ && (VisualDomUtil.JSF_CORE_URI.equalsIgnoreCase(sourceNodeUri)
+ || VisualDomUtil.JSF_HTML_URI.equalsIgnoreCase(sourceNodeUri)
+ || VisualDomUtil.RICH_FACES_URI.equalsIgnoreCase(sourceNodeUri)
+ || VisualDomUtil.A4J_URI.equalsIgnoreCase(sourceNodeUri)
+ || VisualDomUtil.FACELETS_URI.equalsIgnoreCase(sourceNodeUri))) {
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(div);
childrenInfo.addSourceChild(child);
creationData.addChildrenInfo(childrenInfo);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css 2009-06-11 17:05:12 UTC (rev 15888)
@@ -34,7 +34,7 @@
.rich-page-body {
float: none;
width: auto;
- position: static;
+ /*position: static;*/
}
.rich-page-footer {
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 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2009-06-11 17:05:12 UTC (rev 15888)
@@ -13,6 +13,7 @@
import java.io.File;
+import java.math.BigDecimal;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -938,4 +939,34 @@
}
return columnsWithFacet;
}
+
+ /**
+ * Parses string width value from 'px' into 'em'.
+ *
+ * @param widthAttribute width attribute value.
+ * @return width value in 'em' or -1 if the value wasn't parsed.
+ */
+ public static double parseWidth(String widthAttribute) {
+ double widthDouble = -1;
+ if (ComponentUtil.isNotBlank(widthAttribute)) {
+ try {
+ int widthInt = Integer.parseInt(widthAttribute);
+ /*
+ * Parse 'px' to 'em'.
+ */
+ widthDouble = widthInt / 13.33333;
+ /*
+ * Set Double fraction precision to 5 numbers.
+ */
+ BigDecimal b = new BigDecimal(widthDouble).setScale(5,
+ BigDecimal.ROUND_HALF_UP);
+ widthDouble = b.doubleValue();
+ } catch (NumberFormatException e) {
+ /*
+ * Do nothing, default width will be applied.
+ */
+ }
+ }
+ return widthDouble;
+ }
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java 2009-06-11 17:05:12 UTC (rev 15888)
@@ -13,9 +13,6 @@
public class RichFacesLayoutPanelTemplate extends VpeAbstractTemplate {
- private static final String FLOAT_LEFT_STYLE = ";float: left;"; //$NON-NLS-1$
- private static final String FLOAT_RIGHT_STYLE = ";float: right;"; //$NON-NLS-1$
-
/**
* Constructor
*/
@@ -29,23 +26,6 @@
Element sourceElement = (Element)sourceNode;
nsIDOMElement mainDiv = visualDocument.createElement(HTML.TAG_DIV);
String style = sourceElement.getAttribute(HTML.ATTR_STYLE);
- String width = sourceElement.getAttribute(HTML.ATTR_WIDTH);
- String position = sourceElement.getAttribute(RichFaces.ATTR_POSITION);
- if (ComponentUtil.isNotBlank(width)) {
- mainDiv.setAttribute(HTML.ATTR_WIDTH, width);
- style += ";width: " + width + ";"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (RichFaces.VALUE_LEFT.equalsIgnoreCase(position)
- || RichFaces.VALUE_CENTER.equalsIgnoreCase(position)) {
- style += FLOAT_LEFT_STYLE;
- } else if (RichFaces.VALUE_RIGHT.equalsIgnoreCase(position)) {
- style += FLOAT_RIGHT_STYLE;
- } else if (RichFaces.VALUE_BOTTOM.equalsIgnoreCase(position)) {
- nsIDOMElement bottomDiv = visualDocument.createElement(HTML.TAG_DIV);
- bottomDiv.setAttribute(HTML.ATTR_STYLE, "display: block; height: 0; clear: both; visibility: hidden;"); //$NON-NLS-1$
- bottomDiv.appendChild(visualDocument.createTextNode(".")); //$NON-NLS-1$
- mainDiv.appendChild(bottomDiv);
- }
if (ComponentUtil.isNotBlank(style)) {
mainDiv.setAttribute(HTML.ATTR_STYLE, style);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java 2009-06-11 17:05:12 UTC (rev 15888)
@@ -1,17 +1,30 @@
package org.jboss.tools.jsf.vpe.richfaces.template;
+import java.util.HashMap;
+import java.util.Map;
+
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class RichFacesLayoutTemplate extends VpeAbstractTemplate {
+ private static final String FLOAT_LEFT_STYLE = ";float: left;"; //$NON-NLS-1$
+ private static final String FLOAT_RIGHT_STYLE = ";float: right;"; //$NON-NLS-1$
+ private static final String BOTTOM_SECONDARY_DIV_STYLE = ";display: block; height: 0; clear: both; visibility: hidden;"; //$NON-NLS-1$
+ private static final String BOTTOM_SECONDARY_DIV_TEXT = "."; //$NON-NLS-1$
+ private static final String LAYOUT_PANEL_NAME = ":layoutPanel"; //$NON-NLS-1$
+
/**
* Constructor
*/
@@ -21,6 +34,7 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
+
VpeCreationData creationData = null;
Element sourceElement = (Element)sourceNode;
nsIDOMElement mainDiv = visualDocument.createElement(HTML.TAG_DIV);
@@ -28,8 +42,116 @@
if (ComponentUtil.isNotBlank(style)) {
mainDiv.setAttribute(HTML.ATTR_STYLE, style);
}
+ nsIDOMElement topDiv = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement centerDiv = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement leftDiv = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement rightDiv = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement bottomDiv = visualDocument.createElement(HTML.TAG_DIV);
+ nsIDOMElement bottomSecondaryDiv = visualDocument.createElement(HTML.TAG_DIV);
creationData = new VpeCreationData(mainDiv);
+
+ bottomSecondaryDiv.setAttribute(HTML.ATTR_STYLE,
+ BOTTOM_SECONDARY_DIV_STYLE);
+ bottomSecondaryDiv.appendChild(visualDocument
+ .createTextNode(BOTTOM_SECONDARY_DIV_TEXT));
+ bottomDiv.appendChild(bottomSecondaryDiv);
+
+ NodeList children = sourceNode.getChildNodes();
+ Map<String, Element> panels = new HashMap<String, Element>();
+ for (int i = 0; i < children.getLength(); i++) {
+ Node node = children.item(i);
+ if (node instanceof Element && node.getNodeName() != null
+ && node.getNodeName().indexOf(LAYOUT_PANEL_NAME) > 0) {
+ Element element = (Element) node;
+ String position = element.getAttribute(RichFaces.ATTR_POSITION);
+ /*
+ * Adding several panel with the same position is forbidden.
+ * During adding to the map only the last panel
+ * with repeating position name will be displayed.
+ */
+ if (ComponentUtil.isNotBlank(position)) {
+ if (RichFaces.VALUE_TOP.equalsIgnoreCase(position)) {
+ panels.put(RichFaces.VALUE_TOP, element);
+ } else if (RichFaces.VALUE_LEFT.equalsIgnoreCase(position)) {
+ panels.put(RichFaces.VALUE_LEFT, element);
+ } else if (RichFaces.VALUE_CENTER.equalsIgnoreCase(position)) {
+ panels.put(RichFaces.VALUE_CENTER, element);
+ } else if (RichFaces.VALUE_RIGHT.equalsIgnoreCase(position)) {
+ panels.put(RichFaces.VALUE_RIGHT, element);
+ } else if (RichFaces.VALUE_BOTTOM.equalsIgnoreCase(position)) {
+ panels.put(RichFaces.VALUE_BOTTOM, element);
+ }
+ }
+ }
+ }
+
+ /*
+ * Adding panels' divs.
+ * Order is important!
+ */
+ int columsCount = 0;
+ if (null != panels.get(RichFaces.VALUE_LEFT)) {
+ columsCount++;
+ }
+ if (null != panels.get(RichFaces.VALUE_CENTER)) {
+ columsCount++;
+ }
+ if (null != panels.get(RichFaces.VALUE_RIGHT)) {
+ columsCount++;
+ }
+ addPanelFromMap(RichFaces.VALUE_TOP, panels, mainDiv, topDiv,
+ Constants.EMPTY, columsCount, creationData);
+ addPanelFromMap(RichFaces.VALUE_LEFT, panels, mainDiv, leftDiv,
+ FLOAT_LEFT_STYLE, columsCount, creationData);
+ addPanelFromMap(RichFaces.VALUE_CENTER, panels, mainDiv, centerDiv,
+ FLOAT_LEFT_STYLE, columsCount, creationData);
+ addPanelFromMap(RichFaces.VALUE_RIGHT, panels, mainDiv, rightDiv,
+ FLOAT_RIGHT_STYLE, columsCount, creationData);
+ addPanelFromMap(RichFaces.VALUE_BOTTOM, panels, mainDiv, bottomDiv,
+ Constants.EMPTY, columsCount, creationData);
return creationData;
}
+
+ private void addPanelFromMap(String panelPositionMapName, Map<String, Element> panelsMap,
+ nsIDOMElement mainDiv, nsIDOMElement panelDiv, String style, int columsCount, VpeCreationData creationData) {
+ Element panel = panelsMap.get(panelPositionMapName);
+ if (null != panel) {
+ String widthStr = panel.getAttribute(HTML.ATTR_WIDTH);
+ double width = 100;
+ switch (columsCount) {
+ case 0:
+ width = 100;
+ break;
+ case 1:
+ width = 100;
+ break;
+ case 2:
+ width = 50;
+ break;
+ case 3:
+ width = 32.34;
+ break;
+ default:
+ break;
+ }
+ /*
+ * Apply column width for left, center and right panels only.
+ * Top and bottom panels should always be 100% width.
+ */
+ if (!RichFaces.VALUE_TOP.equalsIgnoreCase(panelPositionMapName)
+ && !RichFaces.VALUE_BOTTOM.equalsIgnoreCase(panelPositionMapName)) {
+ style += "; width: " + width + "%;"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (ComponentUtil.isNotBlank(widthStr)) {
+ panelDiv.setAttribute(HTML.ATTR_WIDTH, widthStr);
+ }
+ panelDiv.setAttribute(HTML.ATTR_STYLE, style);
+ mainDiv.appendChild(panelDiv);
+ VpeChildrenInfo panelInfo = new VpeChildrenInfo(panelDiv);
+ panelInfo.addSourceChild(panel);
+ creationData.addChildrenInfo(panelInfo);
+ }
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-06-11 17:05:12 UTC (rev 15888)
@@ -1,7 +1,5 @@
package org.jboss.tools.jsf.vpe.richfaces.template;
-import java.math.BigDecimal;
-
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -183,7 +181,7 @@
String sidebarStyle = Constants.EMPTY;
String pageMainDivStyle = Constants.EMPTY;
String pageBodyStyle = Constants.EMPTY;
- double widthDouble = parseWidth(attrs.getSidebarWidth());
+ double widthDouble = ComponentUtil.parseWidth(attrs.getSidebarWidth());
if (widthDouble != -1) {
sidebarStyle += Constants.WHITE_SPACE + "; width: " + widthDouble + "em;"; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -258,36 +256,6 @@
return creationData;
}
- /**
- * Parses string width value from 'px' into 'em'.
- *
- * @param widthAttribute width attribute value.
- * @return width value in 'em' or -1 if the value wasn't parsed.
- */
- private double parseWidth(String widthAttribute) {
- double widthDouble = -1;
- if (ComponentUtil.isNotBlank(widthAttribute)) {
- try {
- int widthInt = Integer.parseInt(widthAttribute);
- /*
- * Parse 'px' to 'em'.
- */
- widthDouble = widthInt / 13.33333;
- /*
- * Set Double fraction precision to 5 numbers.
- */
- BigDecimal b = new BigDecimal(widthDouble).setScale(5,
- BigDecimal.ROUND_HALF_UP);
- widthDouble = b.doubleValue();
- } catch (NumberFormatException e) {
- /*
- * Do nothing, default width will be applied.
- */
- }
- }
- return widthDouble;
- }
-
class Attributes {
/*
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-11 17:05:12 UTC (rev 15888)
@@ -2,7 +2,7 @@
<test id="id1">
- <DIV CLASS="rich-page styleClass" STYLE="width: 800px; background-color: white;">
+ <DIV CLASS="rich-page styleClass" STYLE="width: 1000px; background-color: white;">
<DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
@@ -29,86 +29,193 @@
</SPAN>
</H1>
<DIV STYLE="border: 1px solid black;">
- <DIV WIDTH="100%" STYLE="width: 100%;">
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
+ <DIV WIDTH="15%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN STYLE="font-size: 2em;">
- CENTER PANEL
- </SPAN>
+ <DIV WIDTH="75%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN STYLE="font-size: 2em;" >
+ CENTER PANEL
+ </SPAN>
+ </DIV>
</DIV>
- <DIV>
+ <DIV WIDTH="10%" STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV STYLE="">
<DIV
STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
.
</DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
</DIV>
</DIV>
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ SECOND PART
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="25%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="35%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ THIRD PART
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="65%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
</DIV>
</DIV>
</DIV>
<DIV CLASS="rich-page-footer footerClass">
<DIV CLASS="rich-page-footer-content">
- <SPAN STYLE="font-size: 2em;">
+ <SPAN STYLE="font-size: 2em;" >
FOOTER
</SPAN>
</DIV>
</DIV>
</DIV>
+
</test>
-
+
<test id="id2">
<DIV STYLE="border: 1px solid black;" >
- <DIV WIDTH="100%" STYLE="width: 100%;">
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
+ <DIV WIDTH="15%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN STYLE="font-size: 2em;">
- CENTER PANEL
- </SPAN>
+ <DIV WIDTH="75%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN STYLE="font-size: 2em;" >
+ CENTER PANEL
+ </SPAN>
+ </DIV>
</DIV>
- <DIV>
+ <DIV WIDTH="10%" STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV STYLE="">
<DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
.
+ </DIV>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
</DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
</DIV>
</DIV>
</test>
-
- <test id="id3">
- <DIV WIDTH="100%" STYLE="width: 100%;" >
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
- </DIV>
- </test>
-
- <test id="id4">
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;" >
- <SPAN STYLE="font-size: 2em;">
- CENTER PANEL
- </SPAN>
- </DIV>
- </test>
-
+
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-06-11 17:04:10 UTC (rev 15887)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-06-11 17:05:12 UTC (rev 15888)
@@ -1,6 +1,7 @@
<tests>
<test id="id1">
- <DIV STYLE="width: 600px; background-color: white;" CLASS="rich-page someClass">
+
+ <DIV CLASS="rich-page someClass" STYLE="width: 800px; background-color: white;">
<DIV CLASS="rich-page-header">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
@@ -14,99 +15,143 @@
</SPAN>
</DIV>
<DIV CLASS="rich-page-content">
- <DIV CLASS="rich-page-sidebar">
+ <DIV CLASS="rich-page-sidebar" STYLE="width: 15em; float: right;">
<SPAN STYLE="font-size: 2em;">
SIDEBAR
</SPAN>
</DIV>
- <DIV CLASS="rich-page-main">
- <DIV CLASS="rich-page-body">
+ <DIV CLASS="rich-page-main" STYLE="float: left; margin-right: -30em;">
+ <DIV CLASS="rich-page-body" STYLE="margin-right: 15em;">
<H1 STYLE="-moz-user-modify: read-write;">
<SPAN CLASS="vpe-text">
BODY START
</SPAN>
</H1>
- <DIV STYLE="border: 1px solid black; background-color: white;"
- >
- <DIV WIDTH="100%" STYLE="width: 100%;">
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
+ <DIV STYLE="border: 1px solid black; background-color: lime;">
+ <DIV WIDTH="80em" STYLE="">
+ <DIV >
+ <SPAN CLASS="vpe-text">
+ TOP PANEL 11111
+ </SPAN>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <H1 STYLE="-moz-user-modify: read-write;">
+ <DIV WIDTH="40%" STYLE="float: left; width: 32.34%;">
+ <DIV>
<SPAN CLASS="vpe-text">
- CENTER PANEL 1
+ LEFT PANEL 11111
</SPAN>
- </H1>
- <DIV STYLE="border: 1px solid black;">
- <DIV WIDTH="100%" STYLE="width: 100%;">
+ </DIV>
+ </DIV>
+ <DIV WIDTH="30%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <H1 STYLE="-moz-user-modify: read-write;">
<SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="25%" STYLE="width: 25%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="75%" STYLE="width: 75%; float: left;">
- <H1 STYLE="-moz-user-modify: read-write;">
- <SPAN CLASS="vpe-text">
- CENTER PANEL 2
- </SPAN>
- </H1>
- <DIV STYLE="border: 1px solid black;">
- <DIV WIDTH="100%" STYLE="width: 100%;">
+ CENTER PANEL 11111
+ </SPAN>
+ </H1>
+ <!-- FIRST NESTED LAYOUT -->
+ <DIV STYLE="border: 1px solid black; background-color: green;" >
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
<SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
+ TOP PANEL 222222
+ </SPAN>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ </DIV>
+ <DIV WIDTH="15%" STYLE="float: left; width: 32.34%;">
+ <DIV >
<SPAN CLASS="vpe-text">
- LEFT PANEL
+ LEFT PANEL 222222
</SPAN>
+ <!-- SECOND NESTED LAYOUT -->
+ <DIV STYLE="border: 1px solid black; background-color: aqua;">
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="15%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="75%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="10%" STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN STYLE="font-size: 2em;">
- CENTER PANEL 3
+ </DIV>
+ <DIV WIDTH="75%" STYLE="float: left; width: 32.34%;">
+ <DIV >
+ <SPAN STYLE="font-size: 2em;" >
+ CENTER PANEL 222222
</SPAN>
</DIV>
+ </DIV>
+ <DIV WIDTH="10%" STYLE="float: right; width: 32.34%;">
<DIV>
- <DIV
- STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
- .
- </DIV>
<SPAN CLASS="vpe-text">
- BOTTOM PANEL
+ RIGHT PANEL 222222
</SPAN>
</DIV>
</DIV>
- </DIV>
- <DIV>
- <DIV
- STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
- .
+ <DIV WIDTH="100%" STYLE="">
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL 222222
+ </SPAN>
+ </DIV>
</DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
</DIV>
</DIV>
</DIV>
- <DIV>
+ <DIV WIDTH="40%" STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL 11111
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="300" STYLE="">
<DIV
STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
.
</DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL 11111
+ </SPAN>
+ </DIV>
</DIV>
</DIV>
</DIV>
@@ -122,121 +167,98 @@
</DIV>
</test>
<test id="id2">
- <DIV STYLE="border: 1px solid black;">
- <DIV WIDTH="100%" STYLE="width: 100%;">
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="25%" STYLE="width: 25%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="75%" STYLE="width: 75%; float: left;">
+
+ <DIV >
<H1 STYLE="-moz-user-modify: read-write;">
<SPAN CLASS="vpe-text">
- CENTER PANEL 2
- </SPAN>
+ CENTER PANEL 11111
+ </SPAN>
</H1>
- <DIV STYLE="border: 1px solid black;">
- <DIV WIDTH="100%" STYLE="width: 100%;">
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN STYLE="font-size: 2em;">
- CENTER PANEL 3
- </SPAN>
- </DIV>
- <DIV>
- <DIV
- STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
- .
+ <!-- FIRST NESTED LAYOUT -->
+ <DIV STYLE="border: 1px solid black; background-color: green;" >
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL 222222
+ </SPAN>
</DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
</DIV>
- </DIV>
- </DIV>
- <DIV>
- <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
- .
- </DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
- </DIV>
- </DIV>
-</test>
- <test id="id3">
-
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;" >
- <H1 STYLE="-moz-user-modify: read-write;">
- <SPAN CLASS="vpe-text">
- CENTER PANEL 1
- </SPAN>
- </H1>
- <DIV STYLE="border: 1px solid black;" >
- <DIV WIDTH="100%" STYLE="width: 100%;">
- <SPAN CLASS="vpe-text">
- TOP PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="25%" STYLE="width: 25%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
- </SPAN>
- </DIV>
- <DIV WIDTH="75%" STYLE="width: 75%; float: left;">
- <H1 STYLE="-moz-user-modify: read-write;">
- <SPAN CLASS="vpe-text">
- CENTER PANEL 2
- </SPAN>
- </H1>
- <DIV STYLE="border: 1px solid black;">
- <DIV WIDTH="100%" STYLE="width: 100%;">
+ <DIV WIDTH="15%" STYLE="float: left; width: 32.34%;">
+ <DIV >
<SPAN CLASS="vpe-text">
- TOP PANEL
+ LEFT PANEL 222222
</SPAN>
+ <!-- SECOND NESTED LAYOUT -->
+ <DIV STYLE="border: 1px solid black; background-color: aqua;">
+ <DIV WIDTH="100%" STYLE="">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ TOP PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="15%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="75%" STYLE="float: left; width: 32.34%;">
+ <DIV>
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="10%" STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL 33333
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN CLASS="vpe-text">
- LEFT PANEL
+ </DIV>
+ <DIV WIDTH="75%" STYLE="float: left; width: 32.34%;">
+ <DIV >
+ <SPAN STYLE="font-size: 2em;" >
+ CENTER PANEL 222222
</SPAN>
</DIV>
- <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
- <SPAN STYLE="font-size: 2em;">
- CENTER PANEL 3
+ </DIV>
+ <DIV WIDTH="10%" STYLE="float: right; width: 32.34%;">
+ <DIV>
+ <SPAN CLASS="vpe-text">
+ RIGHT PANEL 222222
</SPAN>
</DIV>
+ </DIV>
+ <DIV WIDTH="100%" STYLE="">
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
<DIV>
- <DIV
- STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
- .
- </DIV>
<SPAN CLASS="vpe-text">
- BOTTOM PANEL
+ BOTTOM PANEL 222222
</SPAN>
</DIV>
</DIV>
</DIV>
- <DIV>
- <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
- .
- </DIV>
- <SPAN CLASS="vpe-text">
- BOTTOM PANEL
- </SPAN>
- </DIV>
</DIV>
- </DIV>
-</test>
+ </test>
+
</tests>
\ No newline at end of file
15 years, 6 months
JBoss Tools SVN: r15887 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-06-11 13:04:10 -0400 (Thu, 11 Jun 2009)
New Revision: 15887
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4398, check for facelet page was added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-06-11 17:03:56 UTC (rev 15886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-06-11 17:04:10 UTC (rev 15887)
@@ -38,6 +38,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
+import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.vpe.VpeDebug;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.dnd.VpeDnD;
@@ -66,6 +67,7 @@
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeDebugUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.jboss.tools.vpe.editor.util.XmlUtil;
import org.jboss.tools.vpe.resref.core.CSSReferenceList;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils;
@@ -213,8 +215,13 @@
refreshExternalLinks();
// if (isFacelet()) {
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4398
+ * Additional check for facelet's taglibs should be added
+ * to distinguish it from custom tags and pages without facelets support.
+ */
Element root = FaceletUtil.findComponentElement(sourceDocument.getDocumentElement());
- if (root != null) {
+ if ((root != null) && (isFacelet(root))){
addNode(root, null, getContentArea());
} else {
addChildren(null, sourceDocument, getContentArea());
@@ -415,7 +422,7 @@
*/
protected nsIDOMNode createNode(Node sourceNode,
nsIDOMNode visualOldContainer) {
-
+
boolean registerFlag = isCurrentMainDocument();
//it's check for initialization visualController,
@@ -2222,14 +2229,22 @@
return visualEditor.getDomDocument();
}
-// /**
-// * Check this file is facelet
-// *
-// * @return this if file is facelet, otherwize false
-// */
-// private boolean isFacelet() {
-// boolean isFacelet = false;
-//
+ /**
+ * Check this file is facelet
+ *
+ * @return this if file is facelet, otherwize false
+ */
+ private boolean isFacelet(Node sourceNode) {
+ boolean isFacelet = false;
+ String sourcePrefix = sourceNode.getPrefix();
+ List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode, pageContext);
+ TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourcePrefix, taglibs);
+ if (null != sourceNodeTaglib) {
+ String sourceNodeUri = sourceNodeTaglib.getUri();
+ if (VisualDomUtil.FACELETS_URI.equalsIgnoreCase(sourceNodeUri)) {
+ isFacelet = true;
+ }
+ }
// IEditorInput iEditorInput = pageContext.getEditPart().getEditorInput();
// if (iEditorInput instanceof IFileEditorInput) {
// IFileEditorInput iFileEditorInput = (IFileEditorInput) iEditorInput;
@@ -2252,10 +2267,10 @@
// }
// }
// }
-//
-// return isFacelet;
-// }
+ return isFacelet;
+ }
+
/**
* @return the xulRunnerEditor
*/
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2009-06-11 17:03:56 UTC (rev 15886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2009-06-11 17:04:10 UTC (rev 15887)
@@ -39,6 +39,13 @@
public class VisualDomUtil {
+
+ public static String JSF_CORE_URI = "http://java.sun.com/jsf/core"; //$NON-NLS-1$
+ public static String JSF_HTML_URI = "http://java.sun.com/jsf/html"; //$NON-NLS-1$
+ public static String RICH_FACES_URI = "http://richfaces.org/rich"; //$NON-NLS-1$
+ public static String A4J_URI = "http://richfaces.org/a4j"; //$NON-NLS-1$
+ public static String FACELETS_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
+
private static final String ACCESSIBILITY_SERVICE_CONTRACT_ID = "@mozilla.org/accessibilityService;1";
private static Reference<nsIAccessibilityService> accessibilityServiceCache = null;
15 years, 6 months
JBoss Tools SVN: r15886 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 13:03:56 -0400 (Thu, 11 Jun 2009)
New Revision: 15886
Added:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/.project
Log:
include .project file
Added: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/.project
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/.project (rev 0)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/.project 2009-06-11 17:03:56 UTC (rev 15886)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jbpm4.releng</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
JBoss Tools SVN: r15885 - trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 13:02:01 -0400 (Thu, 11 Jun 2009)
New Revision: 15885
Modified:
trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map
Log:
include plugins and test plugins of the jbpm4 distributable
Modified: trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map
===================================================================
--- trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map 2009-06-11 16:52:57 UTC (rev 15884)
+++ trunk/jbpm/releng/org.jboss.tools.jbpm4.releng/maps/elements.map 2009-06-11 17:02:01 UTC (rev 15885)
@@ -1,6 +1,10 @@
feature@org.jboss.tools.jbpm4.all=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/features/org.jboss.tools.jbpm4.all
feature@org.jboss.tools.jbpm4.tests.feature=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/tests/org.jboss.tools.jbpm4.tests
-!**** TODO: add more features...
plugin@org.jboss.tools.jbpm.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common
-!**** TODO: add more plugins...
+plugin@org.jboss.tools.flow.common=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.common
+plugin@org.jboss.tools.flow.jpdl4=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4
+plugin@org.jboss.tools.jbpm.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.jbpm.common.test
+plugin@org.jboss.tools.flow.common.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.common.test
+plugin@org.jboss.tools.flow.jpdl4.test=SVN,,http://anonsvn.jboss.org/repos,,jbosstools/trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.test
+
15 years, 6 months
JBoss Tools SVN: r15884 - trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 12:52:57 -0400 (Thu, 11 Jun 2009)
New Revision: 15884
Added:
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/.project
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml
Log:
initial upload
Added: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/.project
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/.project (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/.project 2009-06-11 16:52:57 UTC (rev 15884)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jbpm4.tests.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/build.properties (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/build.properties 2009-06-11 16:52:57 UTC (rev 15884)
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties 2009-06-11 16:52:57 UTC (rev 15884)
@@ -0,0 +1,18 @@
+# properties file for org.jboss.tools.jmx.*.test*
+featureName=jBPM 4 Tests
+featureProvider=JBoss, a division of Red Hat
+
+# "description" property - description of the feature
+description="This feature provides the tests for the tools that are provided for the jBPM 4 runtime."
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "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 NON-TRANSLATABLE
+########### end of license property ##########################################
+
\ No newline at end of file
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml 2009-06-11 16:52:57 UTC (rev 15884)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.jbpm4.tests.feature"
+ label="%featureName"
+ version="1.0.0"
+ provider-name="%featureProvider">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.jboss.tools.flow.common.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.flow.jpdl4.multipage.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.flow.jpdl4.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jbpm.common.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
JBoss Tools SVN: r15883 - trunk/jbpm/features.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 12:52:45 -0400 (Thu, 11 Jun 2009)
New Revision: 15883
Added:
trunk/jbpm/features/org.jboss.tools.jbpm4.tests.feature/
Log:
initial upload
15 years, 6 months
JBoss Tools SVN: r15882 - trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-06-11 12:50:30 -0400 (Thu, 11 Jun 2009)
New Revision: 15882
Added:
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/.project
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/build.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties
trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml
Log:
initial upload
Added: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/.project
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/.project (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/.project 2009-06-11 16:50:30 UTC (rev 15882)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jbpm3.tests.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/build.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/build.properties (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/build.properties 2009-06-11 16:50:30 UTC (rev 15882)
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties 2009-06-11 16:50:30 UTC (rev 15882)
@@ -0,0 +1,18 @@
+# properties file for org.jboss.tools.jmx.*.test*
+featureName=jBPM 3 Tests
+featureProvider=JBoss, a division of Red Hat
+
+# "description" property - description of the feature
+description="This feature provides the tests for the tools that are provided for the jBPM 3 runtime."
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "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 NON-TRANSLATABLE
+########### end of license property ##########################################
+
\ No newline at end of file
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml (rev 0)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml 2009-06-11 16:50:30 UTC (rev 15882)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.jbpm3.tests.feature"
+ label="%featureName"
+ version="3.2.0"
+ provider-name="%featureProvider">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.jboss.tools.jbpm.common.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.jbpm.convert.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jbpm.gd.jpdl.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/jbpm/features/org.jboss.tools.jbpm3.tests.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months